k0.7.0

BruceHuang · Nov 4, 2016 · 559b6af · 559b6af
1 parent fb24440
commit 559b6af
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -21,17 +21,17 @@ allprojects {
 
 dependencies {
     # required, enough for most devices.
-    compile 'tv.danmaku.ijk.media:ijkplayer-java:0.6.3'
-    compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.6.3'
+    compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.0'
+    compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.0'
 
     # Other ABIs: optional
-    compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.6.3'
-    compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.6.3'
-    compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.6.3'
-    compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.6.3'
+    compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.0'
+    compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.0'
+    compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.0'
+    compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.0'
 
     # ExoPlayer as IMediaPlayer: optional, experimental
-    compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.6.3'
+    compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.0'
 }
 ```
 - iOS
@@ -137,7 +137,7 @@ sudo dpkg-reconfigure dash
 ```
 git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-android
 cd ijkplayer-android
-git checkout -B latest k0.6.3
+git checkout -B latest k0.7.0
 
 ./init-android.sh
 
@@ -191,7 +191,7 @@ cd ..
 ```
 git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-ios
 cd ijkplayer-ios
-git checkout -B latest k0.6.3
+git checkout -B latest k0.7.0
 
 ./init-ios.sh
 

diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle
@@ -26,8 +26,8 @@ ext {
 
     targetSdkVersion = 23
 
-    versionCode = 603000
-    versionName = "0.6.3"
+    versionCode = 700000
+    versionName = "0.7.0"
 }
 
 wrapper {

diff --git 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.6.3
-VERSION_CODE=603000
+VERSION_NAME=0.7.0
+VERSION_CODE=700000
 GROUP=tv.danmaku.ijk.media
 
 # http://central.sonatype.org/pages/requirements.html

diff --git a/android/ijkplayer/ijkplayer-example/build.gradle b/android/ijkplayer/ijkplayer-example/build.gradle
@@ -54,18 +54,18 @@ dependencies {
     all64Compile project(':ijkplayer-x86')
     all64Compile project(':ijkplayer-x86_64')
 
-    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.6.3'
-    // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.6.3'
+    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.0'
+    // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.0'
 
-    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.6.3'
-    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.6.3'
-    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.6.3'
+    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.0'
+    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.0'
+    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.0'
 
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.6.3'
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.6.3'
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.6.3'
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.6.3'
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.6.3'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.0'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.0'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.0'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.0'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.0'
 
     // armv5Compile project(':player-armv5')
     // armv7aCompile project(':player-armv7a')

diff --git a/android/ijkplayer/ijkplayer-exo/build.gradle b/android/ijkplayer/ijkplayer-exo/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     compile 'com.google.android.exoplayer:exoplayer:r1.5.11'
 
     compile project(':ijkplayer-java')
-    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.6.3'
+    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.0'
 }
 
 gradle.startParameter.taskNames.each { task ->

diff --git a/init-android.sh b/init-android.sh
@@ -18,7 +18,7 @@
 # IJK_FFMPEG_UPSTREAM=git://git.videolan.org/ffmpeg.git
 IJK_FFMPEG_UPSTREAM=https://github.com/Bilibili/FFmpeg.git
 IJK_FFMPEG_FORK=https://github.com/Bilibili/FFmpeg.git
-IJK_FFMPEG_COMMIT=ff3.1--ijk0.6.2--20160926--001
+IJK_FFMPEG_COMMIT=ff3.2--ijk0.7.0--20161102--001
 IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg
 
 set -e

diff --git a/init-ios.sh b/init-ios.sh
@@ -18,7 +18,7 @@
 # IJK_FFMPEG_UPSTREAM=git://git.videolan.org/ffmpeg.git
 IJK_FFMPEG_UPSTREAM=https://github.com/Bilibili/FFmpeg.git
 IJK_FFMPEG_FORK=https://github.com/Bilibili/FFmpeg.git
-IJK_FFMPEG_COMMIT=ff3.1--ijk0.6.2--20160926--001
+IJK_FFMPEG_COMMIT=ff3.2--ijk0.7.0--20161102--001
 IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg
 
 IJK_GASP_UPSTREAM=https://github.com/Bilibili/gas-preprocessor.git

diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
@@ -32,7 +32,7 @@
 
 #include "string.h"
 
-static const char *kIJKFFRequiredFFmpegVersion = "ff3.1--ijk0.6.2--20160926--001";
+static const char *kIJKFFRequiredFFmpegVersion = "ff3.2--ijk0.7.0--20161102--001"
 
 // It means you didn't call shutdown if you found this object leaked.
 @interface IJKWeakHolder : NSObject

diff --git a/version.sh b/version.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-VERSION_CODE=603000
-VERSION_NAME=0.6.3
+VERSION_CODE=700000
+VERSION_NAME=0.7.0
 VERSION_TARGET=$1
 
 do_version_readme() {