Merge branch 'release/v0.3.2'

cropsly · Apr 21, 2016 · 6fd8356 · 6fd8356 · hjqcoder · Aug 9, 2016
2 parents 0eae163 + 05af1a4
commit 6fd8356
Show file tree

Hide file tree

Showing 5 changed files with 114 additions and 20 deletions.
diff --git a/FFmpegAndroid/build.gradle b/FFmpegAndroid/build.gradle
@@ -1,4 +1,9 @@
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: "com.jfrog.bintray"
+
+// This is the library version used when deploying the artifact
+version = VERSION_NAME
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion as Integer
@@ -31,4 +36,92 @@ dependencies {
     androidTestCompile 'com.squareup.assertj:assertj-android:1.0.0'
 }
 
-apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
+group = GROUP
+
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+            project {
+                packaging POM_PACKAGING
+
+                // Add your description here
+                name 'FFmpeg Android'
+                description = POM_DESCRIPTION
+                url POM_URL
+
+                // Set your license
+                licenses {
+                    license {
+                        name POM_LICENCE_NAME
+                        url POM_LICENCE_URL
+                    }
+                }
+                developers {
+                    developer {
+                        id POM_DEVELOPER_ID
+                        name POM_DEVELOPER_NAME
+                        email 'hitesh@writingminds.com'
+                    }
+                }
+                scm {
+                    connection POM_SCM_URL
+                    developerConnection POM_SCM_URL
+                    url POM_URL
+
+                }
+            }
+        }
+    }
+}
+
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+// https://github.com/bintray/gradle-bintray-plugin
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+
+    configurations = ['archives']
+    pkg {
+        repo = "maven"
+        // it is the name that appears in bintray when logged
+        name = "ffmpeg-android"
+        websiteUrl = POM_URL
+        vcsUrl = POM_SCM_URL
+        licenses = ["GPL-3.0"]
+        publish = true
+        version {
+            gpg {
+                sign = true
+                passphrase = properties.getProperty("bintray.gpg.password")
+            }
+            mavenCentralSync {
+                sync = true
+                user = properties.getProperty("bintray.oss.user") //OSS user token
+                password = properties.getProperty("bintray.oss.password") //OSS user password
+                close = '1'
+            }
+        }
+    }
+}
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
-[FFmpeg-Android-Java](http://writingminds.github.io/ffmpeg-android-java/) [![Build Status](https://travis-ci.org/hiteshsondhi88/ffmpeg-android-java.svg?branch=master)](https://travis-ci.org/hiteshsondhi88/ffmpeg-android-java) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FFmpeg--Android--Java-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/931) 
+[FFmpeg-Android-Java](http://writingminds.github.io/ffmpeg-android-java/) [![Build Status](https://travis-ci.org/hiteshsondhi88/ffmpeg-android-java.svg?branch=master)](https://travis-ci.org/hiteshsondhi88/ffmpeg-android-java) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FFmpeg--Android--Java-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/931)
 ==============
 
 [![Join the chat at https://gitter.im/hiteshsondhi88/ffmpeg-android-java](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hiteshsondhi88/ffmpeg-android-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-## About 
+## About
 [FFmpeg Android java](http://writingminds.github.io/ffmpeg-android-java/) is a java library that simplifies your task of using ffmpeg in Android project which I've compiled using [FFmpeg-Android](http://writingminds.github.io/ffmpeg-android/)
 
 These are two basic methods of this library:
@@ -12,7 +12,7 @@ These are two basic methods of this library:
 * `execute(String cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException`
 
 For examples and usage instructions head over to:
-* [writingminds.github.io/ffmpeg-android-java] (http://writingminds.github.io/ffmpeg-android-java/) 
+* [writingminds.github.io/ffmpeg-android-java] (http://writingminds.github.io/ffmpeg-android-java/)
 
 ## Supported Architecture
 * armv7
@@ -21,7 +21,7 @@ For examples and usage instructions head over to:
 
 ## Sample
 ![http://i.imgur.com/cP4WhLn.gif](http://i.imgur.com/cP4WhLn.gif)
-* [Download APK](https://github.com/writingminds/ffmpeg-android-java/releases/download/v0.3/app-debug.apk)
+* [Download APK](https://github.com/writingminds/ffmpeg-android-java/releases/download/v0.3.2/app-debug.apk)
 
 ## JavaDoc
 * [Javadoc](http://writingminds.github.io/ffmpeg-android-java/docs/)
@@ -34,4 +34,3 @@ For examples and usage instructions head over to:
 
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/hiteshsondhi88/ffmpeg-android-java/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.2'
+        classpath 'com.android.tools.build:gradle:2.1.0-beta3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -20,9 +22,9 @@ allprojects {
 
 ext {
     compileSdkVersion = 22
-    buildToolsVersion = '21.1.2'
+    buildToolsVersion = '22.0.1'
     targetSdkVersion = 22
     minSdkVersion = 16
-    versionCode = 25
-    versionName = "0.2.6"
+    versionCode = 28
+    versionName = "0.3.2"
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,14 +1,14 @@
-VERSION_NAME=0.2.5
-VERSION_CODE=25
-GROUP=com.github.hiteshsondhi88.libffmpeg
+VERSION_NAME=0.3.2
+VERSION_CODE=28
+GROUP=com.writingminds
 
 POM_DESCRIPTION=Java implementation of ffmpeg for Android
-POM_URL=https://github.com/hiteshsondhi88/ffmpeg-android-java
-POM_SCM_URL=https://github.com/hiteshsondhi88/ffmpeg-android-java
-POM_SCM_CONNECTION=scm:https://github.com/hiteshsondhi88/ffmpeg-android-java.git
-POM_SCM_DEV_CONNECTION=scm:https://github.com/hiteshsondhi88/ffmpeg-android-java.git
+POM_URL=https://github.com/writingminds/ffmpeg-android-java
+POM_SCM_URL=https://github.com/writingminds/ffmpeg-android-java.git
+POM_SCM_CONNECTION=scm:https://github.com/writingminds/ffmpeg-android-java.git
+POM_SCM_DEV_CONNECTION=scm:https://github.com/writingminds/ffmpeg-android-java.git
 POM_LICENCE_NAME=GNU GPLv3
-POM_LICENCE_URL=https://github.com/hiteshsondhi88/ffmpeg-android-java/blob/master/LICENSE.GPLv3
+POM_LICENCE_URL=https://github.com/writingminds/ffmpeg-android-java/blob/master/LICENSE.GPLv3
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=hiteshsondhi88
 POM_DEVELOPER_NAME=Hitesh Sondhi
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 19 16:06:40 GMT+05:30 2016
+#Wed Apr 20 11:52:28 GMT+05:30 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip