From 234e1579955cd308e36ee58ff144a01bb318e28d Mon Sep 17 00:00:00 2001 From: guoshuyu Date: Tue, 15 Jan 2019 11:07:39 +0800 Subject: [PATCH] 6.0.3 --- .travis.yml | 4 +-- README.md | 33 ++++++++++++++++--------- build.gradle | 4 +-- dependencies.gradle | 2 +- doc/DEPENDENCIES.md | 22 ++++++++--------- doc/UPDATE_VERSION.md | 12 ++++++++- gradle.properties | 2 +- gsyVideoPlayer-base/build.gradle | 4 --- gsyVideoPlayer-exo_player2/build.gradle | 4 +-- gsyVideoPlayer-proxy_cache/build.gradle | 1 - gsyVideoPlayer/build.gradle | 19 +++----------- 11 files changed, 55 insertions(+), 52 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b0350263..519248b75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ android: components: - platform-tools - tools - - build-tools-27.0.2 - - android-27 + - build-tools-28.0.3 + - android-28 - extra-android-support - extra-android-m2repository before_install: diff --git a/README.md b/README.md index c49391a5b..e58357794 100644 --- a/README.md +++ b/README.md @@ -45,24 +45,24 @@ #### A、直接引入 ``` //完整版引入 -implementation 'com.shuyu:GSYVideoPlayer:6.0.2' +implementation 'com.shuyu:GSYVideoPlayer:6.0.3' ``` #### B、添加java和你想要的so支持： ``` -implementation 'com.shuyu:gsyVideoPlayer-java:6.0.2' +implementation 'com.shuyu:gsyVideoPlayer-java:6.0.3' //是否需要ExoPlayer模式 -implementation 'com.shuyu:GSYVideoPlayer-exo2:6.0.2' +implementation 'com.shuyu:GSYVideoPlayer-exo2:6.0.3' //根据你的需求ijk模式的so -implementation 'com.shuyu:gsyVideoPlayer-armv5:6.0.2' -implementation 'com.shuyu:gsyVideoPlayer-armv7a:6.0.2' -implementation 'com.shuyu:gsyVideoPlayer-arm64:6.0.2' -implementation 'com.shuyu:gsyVideoPlayer-x64:6.0.2' -implementation 'com.shuyu:gsyVideoPlayer-x86:6.0.2' +implementation 'com.shuyu:gsyVideoPlayer-armv5:6.0.3' +implementation 'com.shuyu:gsyVideoPlayer-armv7a:6.0.3' +implementation 'com.shuyu:gsyVideoPlayer-arm64:6.0.3' +implementation 'com.shuyu:gsyVideoPlayer-x64:6.0.3' +implementation 'com.shuyu:gsyVideoPlayer-x86:6.0.3' ``` @@ -72,13 +72,13 @@ A、B普通版本支持263/264/265等，对于mpeg编码会有声音无画面情 C 引入的so支持mpeg编码和其他补充协议，但是so包相对变大。 ``` -implementation 'com.shuyu:gsyVideoPlayer-java:6.0.2' +implementation 'com.shuyu:gsyVideoPlayer-java:6.0.3' //是否需要ExoPlayer模式 -implementation 'com.shuyu:GSYVideoPlayer-exo2:6.0.2' +implementation 'com.shuyu:GSYVideoPlayer-exo2:6.0.3' //更多ijk的编码支持 -implementation 'com.shuyu:gsyVideoPlayer-ex_so:6.0.2' +implementation 'com.shuyu:gsyVideoPlayer-ex_so:6.0.3' ``` @@ -134,7 +134,16 @@ implementation 'com.shuyu:gsyVideoPlayer-ex_so:6.0.2' ## 五、近期版本 -### 6.0.1(2018-12-21) +### 6.0.3(2019-01-15) + +* update exoPlayer to 2.9.3 +* update gradle 3.3.0 +* update build sdk 28 +* update support sdk 27.1.1 +* 修復exoplayer内核的一些问题。 + + +### 6.0.2(2018-12-21) * update exoPlayer to 2.9.1 * Deprecated setupLazy diff --git a/build.gradle b/build.gradle index d56863401..4baa6e21c 100644 --- a/build.gradle +++ b/build.gradle @@ -11,8 +11,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.3.0' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' } } diff --git a/dependencies.gradle b/dependencies.gradle index b7e29ad10..e28415fec 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -29,7 +29,7 @@ ext { imageLoader = '4.0.0' - gsyVideoVersion = '6.0.2' + gsyVideoVersion = '6.0.3' exo_player2 = '2.9.3' diff --git a/doc/DEPENDENCIES.md b/doc/DEPENDENCIES.md index 3c49f014f..38db305c6 100644 --- a/doc/DEPENDENCIES.md +++ b/doc/DEPENDENCIES.md @@ -7,24 +7,24 @@ #### A、直接引入 ``` //完整版引入 -implementation 'com.shuyu:GSYVideoPlayer:6.0.2' +implementation 'com.shuyu:GSYVideoPlayer:6.0.3' ``` #### B、添加java和你想要的so支持： ``` -implementation 'com.shuyu:gsyVideoPlayer-java:6.0.2' +implementation 'com.shuyu:gsyVideoPlayer-java:6.0.3' //是否需要ExoPlayer模式 -implementation 'com.shuyu:GSYVideoPlayer-exo2:6.0.2' +implementation 'com.shuyu:GSYVideoPlayer-exo2:6.0.3' //根据你的需求ijk模式的so -implementation 'com.shuyu:gsyVideoPlayer-armv5:6.0.2' -implementation 'com.shuyu:gsyVideoPlayer-armv7a:6.0.2' -implementation 'com.shuyu:gsyVideoPlayer-arm64:6.0.2' -implementation 'com.shuyu:gsyVideoPlayer-x64:6.0.2' -implementation 'com.shuyu:gsyVideoPlayer-x86:6.0.2' +implementation 'com.shuyu:gsyVideoPlayer-armv5:6.0.3' +implementation 'com.shuyu:gsyVideoPlayer-armv7a:6.0.3' +implementation 'com.shuyu:gsyVideoPlayer-arm64:6.0.3' +implementation 'com.shuyu:gsyVideoPlayer-x64:6.0.3' +implementation 'com.shuyu:gsyVideoPlayer-x86:6.0.3' ``` @@ -34,13 +34,13 @@ A、B普通版本支持263/264/265等，对于mpeg编码会有声音无画面情 C 引入的so支持mpeg编码和其他补充协议，但是so包相对变大。 ``` -implementation 'com.shuyu:gsyVideoPlayer-java:6.0.2' +implementation 'com.shuyu:gsyVideoPlayer-java:6.0.3' //是否需要ExoPlayer模式 -implementation 'com.shuyu:GSYVideoPlayer-exo2:6.0.2' +implementation 'com.shuyu:GSYVideoPlayer-exo2:6.0.3' //更多ijk的编码支持 -implementation 'com.shuyu:gsyVideoPlayer-ex_so:6.0.2' +implementation 'com.shuyu:gsyVideoPlayer-ex_so:6.0.3' ``` diff --git a/doc/UPDATE_VERSION.md b/doc/UPDATE_VERSION.md index f585a2c15..6149f034e 100644 --- a/doc/UPDATE_VERSION.md +++ b/doc/UPDATE_VERSION.md @@ -1,6 +1,16 @@ ## 下方个版本说明，可以当做简单的wiki使用~，效果可参考DEMO。 -### 6.0.1(2018-12-21) +### 6.0.3(2019-01-15) + +* update exoPlayer to 2.9.3 +* update gradle 3.3.0 +* update build sdk 28 +* update support sdk 27.1.1 +* 修復exoplayer内核的一些问题。 + + + +### 6.0.2(2018-12-21) * update exoPlayer to 2.9.1 * Deprecated setupLazy diff --git a/gradle.properties b/gradle.properties index f34560b97..52c50f4dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ org.gradle.jvmargs=-Xmx2048m BINTRAY_USER=carguo BINTRAY_KEY= PROJ_GROUP=com.shuyu -PROJ_VERSION=6.0.2 +PROJ_VERSION=6.0.3 PROJ_WEBSITEURL=https://github.com/CarGuo/GSYVideoPlayer PROJ_ISSUETRACKERURL= PROJ_VCSURL=git@github.com:CarGuo/GSYVideoPlayer.git diff --git a/gsyVideoPlayer-base/build.gradle b/gsyVideoPlayer-base/build.gradle index ab0abdb50..719b4445c 100644 --- a/gsyVideoPlayer-base/build.gradle +++ b/gsyVideoPlayer-base/build.gradle @@ -33,10 +33,6 @@ dependencies { def viewDependencies = rootProject.ext.viewDependencies api viewDependencies.ijkplayer_java - //compile fileTree(dir: 'libs', include: ['*.jar']) - //def viewDependencies = rootProject.ext.viewDependencies - //compile viewDependencies.ijkplayer_java - } apply from: './bintray.gradle' diff --git a/gsyVideoPlayer-exo_player2/build.gradle b/gsyVideoPlayer-exo_player2/build.gradle index 3e47d69b9..5b7961f16 100644 --- a/gsyVideoPlayer-exo_player2/build.gradle +++ b/gsyVideoPlayer-exo_player2/build.gradle @@ -33,8 +33,8 @@ dependencies { def viewDependencies = rootProject.ext.viewDependencies api viewDependencies.exo_player2 api viewDependencies.exo_player2_rtmp - api project(':gsyVideoPlayer-base') - //api "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion" + //api project(':gsyVideoPlayer-base') + api "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion" // compile fileTree(dir: 'libs', include: ['*.jar']) // def viewDependencies = rootProject.ext.viewDependencies diff --git a/gsyVideoPlayer-proxy_cache/build.gradle b/gsyVideoPlayer-proxy_cache/build.gradle index 14c125060..60067cdf4 100644 --- a/gsyVideoPlayer-proxy_cache/build.gradle +++ b/gsyVideoPlayer-proxy_cache/build.gradle @@ -30,7 +30,6 @@ android { dependencies { implementation 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 47db0636e..9da0cab07 100644 --- a/gsyVideoPlayer/build.gradle +++ b/gsyVideoPlayer/build.gradle @@ -35,8 +35,8 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - api project(':gsyVideoPlayer-java') - api project(':gsyVideoPlayer-exo_player2') + //api project(':gsyVideoPlayer-java') + //api project(':gsyVideoPlayer-exo_player2') //api project(':gsyVideoPlayer-armv5') //api project(':gsyVideoPlayer-armv7a') //api project(':gsyVideoPlayer-armv64') @@ -48,8 +48,8 @@ dependencies { //api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion" - //api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion" - //api "com.shuyu:GSYVideoPlayer-exo2:$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" @@ -59,17 +59,6 @@ dependencies { //更多配置版so，增加了concat,rtsp,mpeg，crypto //api "com.shuyu:gsyVideoPlayer-ex_so:$gsyVideoVersion" - - //compile fileTree(dir: 'libs', include: ['*.jar']) - //compile "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion" - //compile "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion" - //compile "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion" - //compile "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion" - //compile "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion" - //compile "com.shuyu:gsyVideoPlayer-x64:$gsyVideoVersion" - //compile "com.shuyu:gsyVideoPlayer-x86:$gsyVideoVersion" - - } apply from: './bintray.gradle'