Merge branch 'release/v0.2.2'

cropsly · Sep 15, 2014 · bcac007 · bcac007
2 parents 6e2849c + d7fee70
commit bcac007
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg b/FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg
diff --git a/FFmpegAndroid/assets/armeabi-v7a/ffmpeg b/FFmpegAndroid/assets/armeabi-v7a/ffmpeg
diff --git a/FFmpegAndroid/assets/x86/ffmpeg b/FFmpegAndroid/assets/x86/ffmpeg
diff --git a/FFmpegAndroid/build.gradle b/FFmpegAndroid/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.github.hiteshsondhi88.libffmpeg"
         minSdkVersion 16
         targetSdkVersion 16
-        versionCode 21
-        versionName "0.2.1"
+        versionCode 22
+        versionName "0.2.2"
     }
 
     sourceSets.main {
@@ -29,3 +29,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 }
+
+apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
diff --git a/FFmpegAndroid/src/main/res/values/strings.xml b/FFmpegAndroid/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
     <string name="app_name">FFmpegAndroid</string>
-    <string name="shipped_ffmpeg_version">n2.3.3</string>
+    <string name="shipped_ffmpeg_version">n2.4</string>
 </resources>
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.github.hiteshsondhi88.sampleffmpeg"
         minSdkVersion 16
         targetSdkVersion 20
-        versionCode 21
-        versionName "0.2.1"
+        versionCode 22
+        versionName "0.2.2"
     }
 
     sourceSets.main {

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=0.2.1
-VERSION_CODE=21
+VERSION_NAME=0.2.2
+VERSION_CODE=22
 GROUP=com.github.hiteshsondhi88.libffmpeg
 
 POM_DESCRIPTION=Java implementation of ffmpeg for Android