Fix Bintray deployment

Binary deployment now includes the POM file and the jars

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.0
+current_version = 0.4.1
 commit = True
 tag = True
 
@@ -13,5 +13,4 @@ replace = {new_version}
 
 [bumpversion:file:gradle.properties]
 search = {current_version}
-replace = {new_version}
-
+replace = {new_version}

.gitignore

@@ -30,3 +30,5 @@ proguard/
 
 # generated javadoc
 library/javaDoc
+
+.vscode/settings.json

.travis.yml

@@ -33,6 +33,11 @@ env:
 install: true
 
 script:
+- cd library
+- gradle generateJavadocsJar
+- gradle generateSourcesJar
+- gradle generatePomFileForAarPublication
+- cd ..
 - ./gradlew build jacocoTestReport
 - ./gradlew generateReleaseJavadoc
 - echo no | android create avd --force -n test -t $API --abi $ABI

README.md

@@ -22,7 +22,7 @@ APIs and SDKs that use cognitive computing to solve complex problems.
 ##### Gradle
 
 ```gradle
-'com.ibm.watson.developer_cloud:android-sdk:0.5.0'
+'com.ibm.watson.developer_cloud:android-sdk:0.4.1'
 ```
 
 ##### AAR
@@ -222,4 +222,4 @@ See [CONTRIBUTING.md](.github/CONTRIBUTING.md).
 [releases]: https://github.com/watson-developer-cloud/android-sdk/releases
 [wiki]: https://github.com/watson-developer-cloud/android-sdk/wiki
 
-[aar]: https://github.com/watson-developer-cloud/android-sdk/releases/download/v0.5.0/library-release.aar
+[aar]: https://github.com/watson-developer-cloud/android-sdk/releases/download/v0.4.1/library-release.aar

descriptor.json

@@ -9,13 +9,25 @@
   },
 
   "version": {
-    "name": "0.5.0"
+    "name": "0.4.1"
   },
 
   "files": [
     {
-      "uploadPattern": "com/ibm/watson/developer-cloud/android-sdk/0.5.0",
+      "uploadPattern": "com/ibm/watson/developer_cloud/android-sdk/0.4.1/android-sdk-0.4.1-javadoc.jar",
+      "includePattern": "library/build/libs/library-javadoc.jar"
+    },
+    {
+      "uploadPattern": "com/ibm/watson/developer_cloud/android-sdk/0.4.1/android-sdk-0.4.1-sources.jar",
+      "includePattern": "library/build/libs/library-sources.jar"
+    },
+    {
+      "uploadPattern": "com/ibm/watson/developer_cloud/android-sdk/0.4.1/android-sdk-0.4.1.aar",
       "includePattern": "library/build/outputs/aar/library-release.aar"
+    },
+    {
+      "uploadPattern": "com/ibm/watson/developer_cloud/android-sdk/0.4.1/android-sdk-0.4.1.pom",
+      "includePattern": "library/build/android-sdk.pom"
     }
   ],
 

gradle.properties

@@ -14,4 +14,4 @@
 # org.gradle.parallel=true
 #Thu Sep 15 15:08:29 CDT 2016
 android.useDeprecatedNdk=true
-projectVersion=0.5.0
+projectVersion=0.4.1

library/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
 
 buildscript {
   repositories {
@@ -45,4 +46,49 @@ dependencies {
   compile ('net.java.dev.jna:jna:4.2.2') {
     transitive=true
   }
-}
+}
+
+publishing {
+  publications {
+    aar(MavenPublication) {
+      groupId 'com.ibm.watson.developer_cloud'
+      version projectVersion
+      artifactId 'android-sdk'
+      artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
+
+      pom.withXml {
+        def dependencies = asNode().appendNode('dependencies')
+        configurations.getByName("_releaseCompile").getResolvedConfiguration().getFirstLevelModuleDependencies().each {
+          def dependency = dependencies.appendNode('dependency')
+          dependency.appendNode('groupId', it.moduleGroup)
+          dependency.appendNode('artifactId', it.moduleName)
+          dependency.appendNode('version', it.moduleVersion)
+        }
+      }
+    }
+  }
+}
+
+model {
+  tasks.generatePomFileForAarPublication {
+    destination = file("$buildDir/android-sdk.pom")
+  }
+}
+
+task generateSourcesJar(type: Jar) {
+  from android.sourceSets.main.java.srcDirs
+  classifier 'sources'
+}
+
+task generateJavadocs(type: Javadoc) {
+  source = android.sourceSets.main.java.srcDirs
+  classpath += project.files(android.getBootClasspath()
+          .join(File.pathSeparator))
+}
+
+task generateJavadocsJar(type: Jar) {
+  from generateJavadocs.destinationDir
+  classifier 'javadoc'
+}
+
+generateJavadocsJar.dependsOn generateJavadocs