k0.4.2

bbcallen · bbcallen · commit 645858d7ff99 · 2015-10-22T14:30:57.000+08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.1</string>
+	<string>0.4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>301</string>
+	<string>402</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIFileSharingEnabled</key>

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ ext {`
`26`	`26`
`27`	`27`	`targetSdkVersion = 23`
`28`	`28`
`29`		`- versionCode = 401001`
`30`		`- versionName = "0.4.1.1"`
	`29`	`+ versionCode = 402000`
	`30`	`+ versionName = "0.4.2"`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`wrapper {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ dependencies {`
`25`	`25`	`compile 'com.google.android.exoplayer:exoplayer:r1.5.1'`
`26`	`26`
`27`	`27`	`compile project(':ijkplayer-java')`
`28`		`- // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.1'`
	`28`	`+ // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.2'`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// apply from: '../tools/gradle-mvn-push.gradle'`