diff --git a/NEWS.md b/NEWS.md index a80713b873b3c80af94c919b1d05a85ec3113d01..3ad162ce1f464ab93226e37652f2c9969b55d6e6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,8 @@ tag next -------------------------------- + +tag k0.4.2 +-------------------------------- - ios: support Xcode 7 - ios: drop support of iOS 5.x - ffmpeg: enable libavfilter diff --git a/README.md b/README.md index a83115850187ecee343d911b1a7bde1610956e6a..eccd5c56e7e30e9a7743cbfdeda584e52fb256d5 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,13 @@ allprojects { } dependencies { - compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.1' - compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.4.1' + compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.2' + compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.4.2' # optional - compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.4.1' - compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.4.1' - compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.4.1' + compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.4.2' + compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.4.2' + compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.4.2' } ``` - iOS @@ -119,7 +119,7 @@ sudo dpkg-reconfigure dash ``` git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-android cd ijkplayer-android -git checkout -B latest k0.4.1 +git checkout -B latest k0.4.2 ./init-android.sh @@ -159,7 +159,7 @@ cd .. ``` git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-ios cd ijkplayer-ios -git checkout -B latest k0.4.1 +git checkout -B latest k0.4.2 ./init-ios.sh diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle index 1749a2fd9be366708e88a7e8b5c5871d293fe11d..36b3cddda58b234639da8064d0d83380b73198bc 100644 --- a/android/ijkplayer/build.gradle +++ b/android/ijkplayer/build.gradle @@ -26,8 +26,8 @@ ext { targetSdkVersion = 23 - versionCode = 401001 - versionName = "0.4.1.1" + versionCode = 402000 + versionName = "0.4.2" } wrapper { diff --git a/android/ijkplayer/gradle.properties b/android/ijkplayer/gradle.properties index 7aac5efe0bab0679a8aea4cb75fb66154d701076..71d44aecf266dec9720344308dd5c505b5a80859 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.1.1 -VERSION_CODE=401001 +VERSION_NAME=0.4.2 +VERSION_CODE=402000 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 599d02f9f6370921b0a3ed742d83c22caa1644bc..e17bcc777bb999f1bb65faeeef0b61251ca6132c 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.1' compile project(':ijkplayer-java') - // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.1' + // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.2' } // apply from: '../tools/gradle-mvn-push.gradle' diff --git a/ios/IJKMediaDemo/IJKMediaDemo/IJKMediaDemo-Info.plist b/ios/IJKMediaDemo/IJKMediaDemo/IJKMediaDemo-Info.plist index f3299225f541455f7a1d1a544f32325bb0a90de8..dcc8282088ee3d9e9e071c7bd66a081f9c67fcff 100644 --- a/ios/IJKMediaDemo/IJKMediaDemo/IJKMediaDemo-Info.plist +++ b/ios/IJKMediaDemo/IJKMediaDemo/IJKMediaDemo-Info.plist @@ -21,11 +21,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.3.1 + 0.4.2 CFBundleSignature ???? CFBundleVersion - 301 + 402 LSRequiresIPhoneOS UIFileSharingEnabled