From 8fa24b23ae7546d0d9347aa7d2f8558ef54d3dc2 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Fri, 27 Nov 2015 10:50:53 +0800 Subject: [PATCH] k0.4.4 --- NEWS.md | 3 +++ README.md | 16 ++++++++-------- android/ijkplayer/build.gradle | 4 ++-- android/ijkplayer/gradle.properties | 4 ++-- android/ijkplayer/ijkplayer-exo/build.gradle | 2 +- version.sh | 4 ++-- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/NEWS.md b/NEWS.md index a87be01d..5bab7a61 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,8 @@ tag next -------------------------------- + +tag k0.4.4 +-------------------------------- - ios: replace MPMoviePlayerXXX with IJKMPMoviePlayerXXX - ios: remove target 'IjkMediaPlayer'. 'IjkMediaFramework' should be used instead. - android: switch ExoPlayer to r1.5.2 diff --git a/README.md b/README.md index 1a240241..deecaf46 100644 --- a/README.md +++ b/README.md @@ -16,16 +16,16 @@ allprojects { dependencies { # required, enough for most devices. - compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.3.12' - compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.4.3.12' + compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.4' + compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.4.4' # Other ABIs: optional - compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.4.3.12' - compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.4.3.12' - compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.4.3.12' + compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.4.4' + compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.4.4' + compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.4.4' # ExoPlayer as IMediaPlayer: optional, experimental - compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.4.3.12' + compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.4.4' } ``` - iOS @@ -135,7 +135,7 @@ sudo dpkg-reconfigure dash ``` git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-android cd ijkplayer-android -git checkout -B latest k0.4.3.12 +git checkout -B latest k0.4.4 ./init-android.sh @@ -175,7 +175,7 @@ cd .. ``` git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-ios cd ijkplayer-ios -git checkout -B latest k0.4.3.12 +git checkout -B latest k0.4.4 ./init-ios.sh diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle index 340866ee..bc8a0b74 100644 --- a/android/ijkplayer/build.gradle +++ b/android/ijkplayer/build.gradle @@ -26,8 +26,8 @@ ext { targetSdkVersion = 23 - versionCode = 403012 - versionName = "0.4.3.12" + versionCode = 404000 + versionName = "0.4.4" } wrapper { diff --git a/android/ijkplayer/gradle.properties b/android/ijkplayer/gradle.properties index 4c296038..fc4e872c 100644 --- a/android/ijkplayer/gradle.properties +++ b/android/ijkplayer/gradle.properties @@ -17,8 +17,8 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -VERSION_NAME=0.4.3.12 -VERSION_CODE=403012 +VERSION_NAME=0.4.4 +VERSION_CODE=404000 GROUP=tv.danmaku.ijk.media # http://central.sonatype.org/pages/requirements.html diff --git a/android/ijkplayer/ijkplayer-exo/build.gradle b/android/ijkplayer/ijkplayer-exo/build.gradle index 9ad33f2c..aee2bd52 100644 --- a/android/ijkplayer/ijkplayer-exo/build.gradle +++ b/android/ijkplayer/ijkplayer-exo/build.gradle @@ -25,7 +25,7 @@ dependencies { compile 'com.google.android.exoplayer:exoplayer:r1.5.2' compile project(':ijkplayer-java') - // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.3.12' + // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.4' } ext { diff --git a/version.sh b/version.sh index cd8a4d99..ac2d61eb 100755 --- a/version.sh +++ b/version.sh @@ -2,8 +2,8 @@ set -e -VERSION_CODE=403012 -VERSION_NAME=0.4.3.12 +VERSION_CODE=404000 +VERSION_NAME=0.4.4 echo_usage() { echo "" -- GitLab