From 9ec523bf945485ab73bdc7aa02e7a0e04537f3cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa?= <adrian.garcia@bq.com>
Date: Sat, 29 Feb 2020 15:15:05 +0100
Subject: [PATCH] Fix export sources and javadoc for all modules

---
 CHANGELOG.md                     |  3 ++-
 build.gradle                     |  2 +-
 jitpack-android.gradle           | 21 +++++++++++++++++++++
 mini-android/build.gradle        | 20 +-------------------
 mini-kodein-android/build.gradle | 20 +-------------------
 mini-rx2-android/build.gradle    | 20 +-------------------
 6 files changed, 27 insertions(+), 59 deletions(-)
 create mode 100644 jitpack-android.gradle

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65912db..1fb25b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-- No new features yet
+### Fixed
+- Fix sources not getting attached to some packages, now they should be visible from Android Studio.
 
 ## [1.2.0] - 2020-02-19
 ### Added
diff --git a/build.gradle b/build.gradle
index ff9115a..0c72a33 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:3.5.3"
+        classpath "com.android.tools.build:gradle:3.6.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.junit.platform:junit-platform-gradle-plugin:1.0.0"
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
diff --git a/jitpack-android.gradle b/jitpack-android.gradle
new file mode 100644
index 0000000..7a63b1a
--- /dev/null
+++ b/jitpack-android.gradle
@@ -0,0 +1,21 @@
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from android.sourceSets.main.java.srcDirs
+}
+
+task javadoc(type: Javadoc) {
+    options.charSet = 'UTF-8'
+    failOnError  false
+    source = android.sourceSets.main.java.sourceFiles
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
\ No newline at end of file
diff --git a/mini-android/build.gradle b/mini-android/build.gradle
index 17ac81f..1beb212 100644
--- a/mini-android/build.gradle
+++ b/mini-android/build.gradle
@@ -33,22 +33,4 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
 }
 
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.sourceFiles
-}
-
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-}
\ No newline at end of file
+apply from: "../jitpack-android.gradle"
\ No newline at end of file
diff --git a/mini-kodein-android/build.gradle b/mini-kodein-android/build.gradle
index 4a31b01..1d67d65 100644
--- a/mini-kodein-android/build.gradle
+++ b/mini-kodein-android/build.gradle
@@ -40,22 +40,4 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
 }
 
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.sourceFiles
-}
-
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-}
\ No newline at end of file
+apply from: "../jitpack-android.gradle"
diff --git a/mini-rx2-android/build.gradle b/mini-rx2-android/build.gradle
index 9c0a226..7c0a99d 100644
--- a/mini-rx2-android/build.gradle
+++ b/mini-rx2-android/build.gradle
@@ -41,22 +41,4 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
 
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.sourceFiles
-}
-
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-}
+apply from: "../jitpack-android.gradle"
\ No newline at end of file