diff --git a/dependencies.gradle b/dependencies.gradle index 72b6bb3370e25d9ce352d366a06f71fcda6f0e35..ae130dd75d1cd7c369fee1cce4bd33b7760b51c2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -29,7 +29,7 @@ ext { imageLoader = '4.0.0' - gsyVideoVersion = '6.0.0-beta' + gsyVideoVersion = '6.0.1' exo_player2 = '2.8.4' diff --git a/gsyVideoPlayer-exo_player2/build.gradle b/gsyVideoPlayer-exo_player2/build.gradle index ec6bc4d142434ff90a09a7760ebf46fc99dee657..2c8ba754f70d6e2a682b80ecfcf8995530704d8f 100644 --- a/gsyVideoPlayer-exo_player2/build.gradle +++ b/gsyVideoPlayer-exo_player2/build.gradle @@ -36,11 +36,11 @@ dependencies { //api project(':gsyVideoPlayer-base') api "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion" - //compile fileTree(dir: 'libs', include: ['*.jar']) - //def viewDependencies = rootProject.ext.viewDependencies - //compile viewDependencies.exo_player2 - //compile viewDependencies.exo_player2_rtmp - //compile "com.shuyu:gsyVideoPlayer-base:6.0.0-beta" +// compile fileTree(dir: 'libs', include: ['*.jar']) +// def viewDependencies = rootProject.ext.viewDependencies +// compile viewDependencies.exo_player2 +// compile viewDependencies.exo_player2_rtmp +// compile "com.shuyu:gsyVideoPlayer-base:6.0.1" } diff --git a/gsyVideoPlayer-java/build.gradle b/gsyVideoPlayer-java/build.gradle index 146067b8829e72e365beef879990dc198ded0d55..bc2adeb9b1e0bd0de247dcc25023d494f67699b9 100644 --- a/gsyVideoPlayer-java/build.gradle +++ b/gsyVideoPlayer-java/build.gradle @@ -36,10 +36,10 @@ dependencies { api viewDependencies.ijkplayer_java api viewDependencies.ijkplayer_exo api viewDependencies.transitionseverywhere - api project(':gsyVideoPlayer-proxy_cache') + //api project(':gsyVideoPlayer-proxy_cache') //api project(':gsyVideoPlayer-base') api "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion" - //api "com.shuyu:gsyvideoplayer-androidvideocache:$gsyVideoVersion" + api "com.shuyu:gsyvideoplayer-androidvideocache:$gsyVideoVersion" // compile fileTree(dir: 'libs', include: ['*.jar']) diff --git a/gsyVideoPlayer-proxy_cache/build.gradle b/gsyVideoPlayer-proxy_cache/build.gradle index af572899847d906a59560495f0630e9da85e8701..7551dc6a260b1c01576507be90ba9736c95a1b3f 100644 --- a/gsyVideoPlayer-proxy_cache/build.gradle +++ b/gsyVideoPlayer-proxy_cache/build.gradle @@ -29,10 +29,10 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + //implementation fileTree(dir: 'libs', include: ['*.jar']) - //compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(dir: 'libs', include: ['*.jar']) } apply from: './bintray.gradle' diff --git a/gsyVideoPlayer/build.gradle b/gsyVideoPlayer/build.gradle index e612320e6900bf9b74831acf873e64d65fb74313..c32ac6d23a0877f5a7c191ac0e746c038a9489a6 100644 --- a/gsyVideoPlayer/build.gradle +++ b/gsyVideoPlayer/build.gradle @@ -31,7 +31,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - api project(':gsyVideoPlayer-java') + //api project(':gsyVideoPlayer-java') //api project(':gsyVideoPlayer-exo_player2') //api project(':gsyVideoPlayer-armv5') //api project(':gsyVideoPlayer-armv7a') @@ -40,17 +40,17 @@ dependencies { //api project(':gsyVideoPlayer-x86_64') //更多配置版so,增加了concat,rtsp,mpeg,crypto - api project(':gsyVideoPlayer-ex_so') + //api project(':gsyVideoPlayer-ex_so') //api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion" - //api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion" + api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion" api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion" -// api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion" -// api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion" -// api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion" -// api "com.shuyu:gsyVideoPlayer-x64:$gsyVideoVersion" -// api "com.shuyu:gsyVideoPlayer-x86:$gsyVideoVersion" + api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion" + api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion" + api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion" + api "com.shuyu:gsyVideoPlayer-x64:$gsyVideoVersion" + api "com.shuyu:gsyVideoPlayer-x86:$gsyVideoVersion" //更多配置版so,增加了concat,rtsp,mpeg,crypto //api "com.shuyu:gsyVideoPlayer-ex_so:$gsyVideoVersion"