Skip to content

Commit

Permalink
k0.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
xinzhengzhang committed Nov 4, 2016
1 parent 1aea6ad commit a51cfe6
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 23 deletions.
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
tag next
--------------------------------
tag k0.7.2
- ios: fix a compile error

tag k0.7.1
-------------------------------
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ allprojects {
dependencies {
# required, enough for most devices.
compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.1'
compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.1'
compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.2'
compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.2'
# Other ABIs: optional
compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.1'
compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.1'
compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.1'
compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.1'
compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.2'
compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.2'
compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.2'
compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.2'
# ExoPlayer as IMediaPlayer: optional, experimental
compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.1'
compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.2'
}
```
- iOS
Expand Down Expand Up @@ -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.7.1
git checkout -B latest k0.7.2
./init-android.sh
Expand Down Expand Up @@ -191,7 +191,7 @@ cd ..
```
git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-ios
cd ijkplayer-ios
git checkout -B latest k0.7.1
git checkout -B latest k0.7.2
./init-ios.sh
Expand Down
2 changes: 1 addition & 1 deletion android/ijkplayer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ext {
targetSdkVersion = 23

versionCode = 700100
versionName = "0.7.1"
versionName = "0.7.2"
}

wrapper {
Expand Down
2 changes: 1 addition & 1 deletion android/ijkplayer/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

VERSION_NAME=0.7.1
VERSION_NAME=0.7.2
VERSION_CODE=700100
GROUP=tv.danmaku.ijk.media

Expand Down
20 changes: 10 additions & 10 deletions android/ijkplayer/ijkplayer-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,18 @@ dependencies {
all64Compile project(':ijkplayer-x86')
all64Compile project(':ijkplayer-x86_64')

// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.1'
// compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.1'
// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.2'
// compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.2'

// all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.1'
// all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.1'
// all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.1'
// all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.2'
// all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.2'
// all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.2'

// all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.1'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.1'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.1'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.1'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.1'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.2'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.2'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.2'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.2'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.2'

// armv5Compile project(':player-armv5')
// armv7aCompile project(':player-armv7a')
Expand Down
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-exo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.1'
// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.2'
}

gradle.startParameter.taskNames.each { task ->
Expand Down
2 changes: 1 addition & 1 deletion version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

VERSION_CODE=700100
VERSION_NAME=0.7.1
VERSION_NAME=0.7.2
VERSION_TARGET=$1

do_version_readme() {
Expand Down

0 comments on commit a51cfe6

Please sign in to comment.