Skip to content

Commit

Permalink
k0.4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
bbcallen committed Nov 27, 2015
1 parent b859f4d commit 8fa24b2
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 15 deletions.
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions android/ijkplayer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ ext {

targetSdkVersion = 23

versionCode = 403012
versionName = "0.4.3.12"
versionCode = 404000
versionName = "0.4.4"
}

wrapper {
Expand Down
4 changes: 2 additions & 2 deletions android/ijkplayer/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down

0 comments on commit 8fa24b2

Please sign in to comment.