From 91c877cf59b41cb6cba0405c7cd1e9f8c89bedc5 Mon Sep 17 00:00:00 2001
From: tobrun <tobrun.van.nuland@gmail.com>
Date: Wed, 10 Jul 2019 09:20:24 +0200
Subject: [PATCH] fixup bintray publish script, generate sources and javadoc
 jars

---
 build.gradle                 | 19 +++++++++++++++++--
 circle.yml                   |  1 -
 gradle/gradle-bintray.gradle | 10 ++++++----
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index afe582430..6b998e09e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,8 +91,8 @@ def RELEASE_MODULES = ["services",
 
 subprojects { subproject ->
 
-   tasks.withType(Jar) { jarTask ->
-    if (!jarTask.name.endsWith("SourcesJar")) {
+  tasks.withType(Jar) { jarTask ->
+    if (!jarTask.name.endsWith("sourcesJar")) {
       jarTask.exclude("**/*.java")
     }
   }
@@ -107,6 +107,21 @@ subprojects { subproject ->
     subproject.apply from: "${rootDir}/gradle/gradle-bintray.gradle"
     subproject.apply from: "${rootDir}/gradle/dependencies-graph.gradle"
   }
+
+  task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+  }
+
+  task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+  }
+
+  artifacts {
+    archives sourcesJar
+    archives javadocJar
+  }
 }
 
 task clean(type: Delete) {
diff --git a/circle.yml b/circle.yml
index 8b224ef93..ee9800ece 100644
--- a/circle.yml
+++ b/circle.yml
@@ -50,7 +50,6 @@ jobs:
     docker:
       - image: mbgl/android-ndk-r19:8e91a7ebab
     working_directory: ~/code
-    environment:
     environment:
       BUILDTYPE: Release
       IS_LOCAL_DEVELOPMENT: false
diff --git a/gradle/gradle-bintray.gradle b/gradle/gradle-bintray.gradle
index 81831ce55..e73cae382 100644
--- a/gradle/gradle-bintray.gradle
+++ b/gradle/gradle-bintray.gradle
@@ -13,10 +13,12 @@ publishing {
             artifactId project.ext.mapboxArtifactId
             version project.ext.versionName
 
-            afterEvaluate {
-                artifact("$buildDir/outputs/aar/${project.ext.mapboxArtifactId}-release.aar")
-                artifact sourcesJar
-                artifact javadocJar
+            artifact sourcesJar {
+                classifier "sources"
+            }
+
+            artifact javadocJar {
+                classifier "javadoc"
             }
 
             pom.withXml {