From 7565556849f9096743b8a7eaeb80c48da7bacf01 Mon Sep 17 00:00:00 2001
From: Vithorio Polten <reach@vithor.io>
Date: Fri, 26 May 2017 02:57:56 -0300
Subject: [PATCH] Fixes to publish

---
 .idea/runConfigurations/Publish_All.xml       |  1 -
 .idea/runConfigurations/Publish__Core_.xml    | 10 ++---
 .idea/runConfigurations/Publish__GSON_.xml    | 10 ++---
 .idea/runConfigurations/Publish__MVP_.xml     | 10 ++---
 .../runConfigurations/Publish__Migration_.xml | 10 ++---
 .../Publish__Permissions_.xml                 | 10 ++---
 .idea/runConfigurations/Publish__Rest_.xml    |  9 ++--
 .idea/runConfigurations/Publish__UI_.xml      | 10 ++---
 .../Publish__Validation_.xml                  | 10 ++---
 all/build.gradle                              | 14 +++---
 build.gradle                                  | 15 ++++---
 core/build.gradle                             | 11 +++--
 gson/build.gradle                             |  2 +-
 migration/build.gradle                        |  4 +-
 mvp/build.gradle                              |  5 +--
 permissions/build.gradle                      |  8 ++--
 publish.gradle                                | 45 +++++++++++++------
 rest/build.gradle                             | 15 +++----
 sqlite/build.gradle                           | 10 ++---
 ui/build.gradle                               | 16 +++----
 validation/build.gradle                       | 10 ++---
 21 files changed, 124 insertions(+), 111 deletions(-)

diff --git a/.idea/runConfigurations/Publish_All.xml b/.idea/runConfigurations/Publish_All.xml
index 1611c40..f6c6e9e 100644
--- a/.idea/runConfigurations/Publish_All.xml
+++ b/.idea/runConfigurations/Publish_All.xml
@@ -12,7 +12,6 @@
         <list>
           <option value="clean" />
           <option value="build" />
-          <option value="compileReleaseSources" />
           <option value="assembleRelease" />
           <option value="publish" />
         </list>
diff --git a/.idea/runConfigurations/Publish__Core_.xml b/.idea/runConfigurations/Publish__Core_.xml
index 1c0bf68..10dab79 100644
--- a/.idea/runConfigurations/Publish__Core_.xml
+++ b/.idea/runConfigurations/Publish__Core_.xml
@@ -10,11 +10,11 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="clean" />
-          <option value="build" />
-          <option value="compileReleaseSources" />
-          <option value="assembleRelease" />
-          <option value="publish" />
+          <option value=":core:clean" />
+          <option value=":core:build" />
+          <option value=":core:compileReleaseSources" />
+          <option value=":core:assembleRelease" />
+          <option value=":core:publish" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/.idea/runConfigurations/Publish__GSON_.xml b/.idea/runConfigurations/Publish__GSON_.xml
index bbdea7b..8234259 100644
--- a/.idea/runConfigurations/Publish__GSON_.xml
+++ b/.idea/runConfigurations/Publish__GSON_.xml
@@ -10,11 +10,11 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="clean" />
-          <option value="build" />
-          <option value="compileReleaseSources" />
-          <option value="assembleRelease" />
-          <option value="publish" />
+          <option value=":gson:clean" />
+          <option value=":gson:build" />
+          <option value=":gson:compileReleaseSources" />
+          <option value=":gson:assembleRelease" />
+          <option value=":gson:publish" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/.idea/runConfigurations/Publish__MVP_.xml b/.idea/runConfigurations/Publish__MVP_.xml
index 9ff8072..0060bb5 100644
--- a/.idea/runConfigurations/Publish__MVP_.xml
+++ b/.idea/runConfigurations/Publish__MVP_.xml
@@ -10,11 +10,11 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="clean" />
-          <option value="build" />
-          <option value="compileReleaseSources" />
-          <option value="assembleRelease" />
-          <option value="publish" />
+          <option value=":mvp:clean" />
+          <option value=":mvp:build" />
+          <option value=":mvp:compileReleaseSources" />
+          <option value=":mvp:assembleRelease" />
+          <option value=":mvp:publish" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/.idea/runConfigurations/Publish__Migration_.xml b/.idea/runConfigurations/Publish__Migration_.xml
index 0e2c965..7303354 100644
--- a/.idea/runConfigurations/Publish__Migration_.xml
+++ b/.idea/runConfigurations/Publish__Migration_.xml
@@ -10,11 +10,11 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="clean" />
-          <option value="build" />
-          <option value="compileReleaseSources" />
-          <option value="assembleRelease" />
-          <option value="publish" />
+          <option value=":migration:clean" />
+          <option value=":migration:build" />
+          <option value=":migration:compileReleaseSources" />
+          <option value=":migration:assembleRelease" />
+          <option value=":migration:publish" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/.idea/runConfigurations/Publish__Permissions_.xml b/.idea/runConfigurations/Publish__Permissions_.xml
index 49d31ca..983eb23 100644
--- a/.idea/runConfigurations/Publish__Permissions_.xml
+++ b/.idea/runConfigurations/Publish__Permissions_.xml
@@ -10,11 +10,11 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="clean" />
-          <option value="build" />
-          <option value="compileReleaseSources" />
-          <option value="assembleRelease" />
-          <option value="publish" />
+          <option value=":permissions:clean" />
+          <option value=":permissions:build" />
+          <option value=":permissions:compileReleaseSources" />
+          <option value=":permissions:assembleRelease" />
+          <option value=":permissions:publish" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/.idea/runConfigurations/Publish__Rest_.xml b/.idea/runConfigurations/Publish__Rest_.xml
index fe6bb1e..b3684f8 100644
--- a/.idea/runConfigurations/Publish__Rest_.xml
+++ b/.idea/runConfigurations/Publish__Rest_.xml
@@ -10,11 +10,10 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="clean" />
-          <option value="build" />
-          <option value="compileReleaseSources" />
-          <option value="assembleRelease" />
-          <option value="publish" />
+          <option value=":rest:clean" />
+          <option value=":rest:build" />
+          <option value=":rest:assembleRelease" />
+          <option value=":rest:publish" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/.idea/runConfigurations/Publish__UI_.xml b/.idea/runConfigurations/Publish__UI_.xml
index bd7679f..93e081f 100644
--- a/.idea/runConfigurations/Publish__UI_.xml
+++ b/.idea/runConfigurations/Publish__UI_.xml
@@ -10,11 +10,11 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="clean" />
-          <option value="build" />
-          <option value="compileReleaseSources" />
-          <option value="assembleRelease" />
-          <option value="publish" />
+          <option value=":ui:clean" />
+          <option value=":ui:build" />
+          <option value=":ui:compileReleaseSources" />
+          <option value=":ui:assembleRelease" />
+          <option value=":ui:publish" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/.idea/runConfigurations/Publish__Validation_.xml b/.idea/runConfigurations/Publish__Validation_.xml
index 25535ef..2eddb94 100644
--- a/.idea/runConfigurations/Publish__Validation_.xml
+++ b/.idea/runConfigurations/Publish__Validation_.xml
@@ -10,11 +10,11 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="clean" />
-          <option value="build" />
-          <option value="compileReleaseSources" />
-          <option value="assembleRelease" />
-          <option value="publish" />
+          <option value=":validation:clean" />
+          <option value=":validation:build" />
+          <option value=":validation:compileReleaseSources" />
+          <option value=":validation:assembleRelease" />
+          <option value=":validation:publish" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/all/build.gradle b/all/build.gradle
index bc8300c..b1749c2 100644
--- a/all/build.gradle
+++ b/all/build.gradle
@@ -1,13 +1,9 @@
 dependencies {
-    compile project(':core')
-    compile project(':ui')
-    compile project(':gson')
-    compile project(':mvp')
-    compile project(':permissions')
-    compile project(':validation')
-    compile project(':migration')
-    compile project(':sqlite')
-    compile project(':rest')
+    api project(':mvp')
+    api project(':validation')
+    api project(':migration')
+    api project(':sqlite')
+    api project(':rest')
 }
 
 apply from: new File("${rootProject.projectDir}/publish.gradle")
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 45c2ec3..fb59a73 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,7 +49,7 @@ subprojects {
     apply plugin: 'com.android.library'
     apply plugin: 'kotlin-android'
     // make sure this comes *after* you apply the Android plugin
-    apply plugin: 'com.getkeepsafe.dexcount'
+    // apply plugin: 'com.getkeepsafe.dexcount'
     apply plugin: 'org.jetbrains.dokka-android'
 
     apply plugin: 'maven-publish'
@@ -73,14 +73,19 @@ subprojects {
         sourceSets {
             main.java.srcDirs += 'src/main/kotlin'
         }
+
+        lintOptions {
+            warning 'InvalidPackage'
+            disable 'UnusedResources'
+        }
     }
 
     dependencies {
-        testCompile 'junit:junit:4.12'
-        testCompile "com.winterbe:expekt:0.5.0"
-        testCompile 'com.nhaarman:mockito-kotlin:1.4.0'
+        testImplementation 'junit:junit:4.12'
+        testImplementation "com.winterbe:expekt:0.5.0"
+        testImplementation 'com.nhaarman:mockito-kotlin:1.4.0'
 
-        compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+        implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     }
 }
 
diff --git a/core/build.gradle b/core/build.gradle
index 705ff1f..ecdff4f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,10 +1,13 @@
 dependencies {
-    compile 'de.halfbit:tinybus:3.0.2'
-    compile 'de.halfbit:tinybus-extensions:3.0.2'
-    compile 'com.android.support:multidex:1.0.1'
+    api 'de.halfbit:tinybus:3.0.2'
+    api 'de.halfbit:tinybus-extensions:3.0.2'
+    api 'com.android.support:multidex:1.0.1'
 
-    compile "com.android.support:support-v4:${libraries.supportVersion}"
+    api "com.android.support:support-v4:${libraries.supportVersion}"
     javadocDeps "com.android.support:support-v4:${libraries.supportVersion}"
+
+    api "com.android.support:support-annotations:${libraries.supportVersion}"
+    javadocDeps "com.android.support:support-annotations:${libraries.supportVersion}"
 }
 
 apply from: new File("${rootProject.projectDir}/publish.gradle")
\ No newline at end of file
diff --git a/gson/build.gradle b/gson/build.gradle
index a712a23..849875a 100644
--- a/gson/build.gradle
+++ b/gson/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compile "com.google.code.gson:gson:2.8.0"
+    api "com.google.code.gson:gson:2.8.0"
 }
 
 apply from: new File("${rootProject.projectDir}/publish.gradle")
\ No newline at end of file
diff --git a/migration/build.gradle b/migration/build.gradle
index 4f3b27b..f4a3d2b 100644
--- a/migration/build.gradle
+++ b/migration/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
-    compile "com.android.support:support-v4:${libraries.supportVersion}"
-    compile 'com.j256.ormlite:ormlite-android:5.0'
+    api "com.android.support:support-v4:${libraries.supportVersion}"
+    api 'com.j256.ormlite:ormlite-android:5.0'
 }
 
 apply from: new File("${rootProject.projectDir}/publish.gradle")
\ No newline at end of file
diff --git a/mvp/build.gradle b/mvp/build.gradle
index 0aa7450..5b198e3 100644
--- a/mvp/build.gradle
+++ b/mvp/build.gradle
@@ -1,10 +1,9 @@
 apply plugin: 'kotlin-android-extensions'
 
 dependencies {
-    compile project(':core')
-    compile project(':ui')
+    api project(':ui')
 
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 }
 
 apply from: new File("${rootProject.projectDir}/publish.gradle")
\ No newline at end of file
diff --git a/permissions/build.gradle b/permissions/build.gradle
index 77bb487..6434796 100644
--- a/permissions/build.gradle
+++ b/permissions/build.gradle
@@ -1,12 +1,12 @@
 dependencies {
-    compile "com.android.support:appcompat-v7:${libraries.supportVersion}"
+    api "com.android.support:appcompat-v7:${libraries.supportVersion}"
     javadocDeps "com.android.support:appcompat-v7:${libraries.supportVersion}"
-    compile "com.android.support:support-v13:${libraries.supportVersion}"
+    api "com.android.support:support-v13:${libraries.supportVersion}"
     javadocDeps "com.android.support:support-v13:${libraries.supportVersion}"
-    compile "com.android.support:support-v4:${libraries.supportVersion}"
+    api "com.android.support:support-v4:${libraries.supportVersion}"
     javadocDeps "com.android.support:support-v4:${libraries.supportVersion}"
 
-    compile('com.afollestad:assent:0.2.5') {
+    api('com.afollestad:assent:0.2.5') {
         transitive = false
     }
 }
diff --git a/publish.gradle b/publish.gradle
index d813719..671bfc4 100644
--- a/publish.gradle
+++ b/publish.gradle
@@ -1,3 +1,4 @@
+import groovy.xml.QName
 
 def VERSION_NAME = rootProject.ext.VERSION_NAME
 def GROUP = rootProject.ext.GROUP
@@ -25,6 +26,25 @@ artifacts {
     archives javadocJar
 }
 
+def configureDependencies(Dependency dep, Node dependenciesNode) {
+    if (dep.group != null && dep.name != null) {
+        def depGroup = dep.group
+        def depVersion = dep.version
+
+        if (depGroup.equalsIgnoreCase(rootProject.name)) {
+            depGroup = GROUP
+            depVersion = VERSION_NAME
+        }
+
+        println "Appending to POM -> $depGroup:${dep.name}:$depVersion"
+
+        def dependencyNode = dependenciesNode.appendNode('dependency')
+        dependencyNode.appendNode('groupId', depGroup)
+        dependencyNode.appendNode('artifactId', dep.name)
+        dependencyNode.appendNode('version', depVersion)
+    }
+}
+
 afterEvaluate {
     publishing.repositories {
         mavenLocal()
@@ -42,23 +62,20 @@ afterEvaluate {
         "${POM_ARTIFACT_ID}"(MavenPublication) {
             //The publication doesn't know about our dependencies, so we have to manually add them to the pom
             pom.withXml {
-                def dependenciesNode = asNode().appendNode('dependencies')
+                logging.captureStandardOutput LogLevel.INFO
+                println "Configuring POM file"
+                Node dependenciesNode = asNode().appendNode('dependencies')
 
                 //Iterate over the compile dependencies (we don't want the test ones), adding a <dependency> node for each
-                configurations.compile.allDependencies.each {
-                    if (it.group != null && it.name != null) {
-                        def depGroup = it.group
-                        def depVersion = it.version
-                        if (depGroup.equalsIgnoreCase(rootProject.name)) {
-                            depGroup = GROUP
-                            depVersion = VERSION_NAME
-                        }
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', depGroup)
-                        dependencyNode.appendNode('artifactId', it.name)
-                        dependencyNode.appendNode('version', depVersion)
-                    }
+                Set<Dependency> dependencySet = new LinkedHashSet<>()
+                dependencySet += configurations.api.allDependencies
+                dependencySet += configurations.implementation.allDependencies
+                dependencySet += configurations.compile.allDependencies
+
+                dependencySet.each {
+                    configureDependencies(it, dependenciesNode)
                 }
+                println "Done configuring POM file"
             }
 
             artifactId = POM_ARTIFACT_ID
diff --git a/rest/build.gradle b/rest/build.gradle
index ea9b8e7..8be7ee9 100644
--- a/rest/build.gradle
+++ b/rest/build.gradle
@@ -1,14 +1,11 @@
-android.lintOptions {
-    warning 'InvalidPackage'
-}
-
 dependencies {
-    compile project(':core')
-    compile project(':gson')
-    compile 'com.squareup.retrofit2:retrofit:2.2.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.2.0'
+    api project(':gson')
+    api project(':core')
+
+    api 'com.squareup.retrofit2:retrofit:2.2.0'
+    api 'com.squareup.retrofit2:converter-gson:2.2.0'
 
-    compile 'com.github.mrmike:ok2curl:0.3.1'
+    api 'com.github.mrmike:ok2curl:0.3.1'
 }
 
 apply from: new File("${rootProject.projectDir}/publish.gradle")
diff --git a/sqlite/build.gradle b/sqlite/build.gradle
index fa1b553..ea4d2c4 100644
--- a/sqlite/build.gradle
+++ b/sqlite/build.gradle
@@ -1,12 +1,12 @@
 dependencies {
-    compile "org.jetbrains.anko:anko-sdk23:${libraries.ankoVersion}"
-    compile "org.jetbrains.anko:anko-support-v4:${libraries.ankoVersion}"
-    compile "org.jetbrains.anko:anko-appcompat-v7:${libraries.ankoVersion}"
+    api "org.jetbrains.anko:anko-sdk23:${libraries.ankoVersion}"
+    api "org.jetbrains.anko:anko-support-v4:${libraries.ankoVersion}"
+    api "org.jetbrains.anko:anko-appcompat-v7:${libraries.ankoVersion}"
 
     // Core library
-    compile 'com.nivabit.kuery:core:0.3'
+    api 'com.nivabit.kuery:core:0.3'
     // SQLite dialect
-    compile 'com.nivabit.kuery:sqlite:0.3'
+    api 'com.nivabit.kuery:sqlite:0.3'
 }
 
 apply from: new File("${rootProject.projectDir}/publish.gradle")
\ No newline at end of file
diff --git a/ui/build.gradle b/ui/build.gradle
index 2a665c9..091a296 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -1,16 +1,14 @@
 dependencies {
-    compile project(':core')
-    compile project(':permissions')
+    api project(':core')
+    api project(':permissions')
 
-    compile "com.android.support:percent:${libraries.supportVersion}"
-    compile "com.android.support:support-annotations:${libraries.supportVersion}"
-    javadocDeps "com.android.support:support-annotations:${libraries.supportVersion}"
+    api "com.android.support:percent:${libraries.supportVersion}"
 
-    compile "org.jetbrains.anko:anko-sdk23:${libraries.ankoVersion}"
-    compile "org.jetbrains.anko:anko-support-v4:${libraries.ankoVersion}"
-    compile "org.jetbrains.anko:anko-appcompat-v7:${libraries.ankoVersion}"
+    api "org.jetbrains.anko:anko-sdk23:${libraries.ankoVersion}"
+    api "org.jetbrains.anko:anko-support-v4:${libraries.ankoVersion}"
+    api "org.jetbrains.anko:anko-appcompat-v7:${libraries.ankoVersion}"
 
-    compile 'com.github.bumptech.glide:glide:3.8.0'
+    api 'com.github.bumptech.glide:glide:3.8.0'
 }
 
 apply from: new File("${rootProject.projectDir}/publish.gradle")
\ No newline at end of file
diff --git a/validation/build.gradle b/validation/build.gradle
index 3b5ea80..5fee5b6 100644
--- a/validation/build.gradle
+++ b/validation/build.gradle
@@ -1,9 +1,9 @@
 dependencies {
-    compile project(':core')
-    compile "org.jetbrains.anko:anko-sdk23:${libraries.ankoVersion}"
-    compile "org.jetbrains.anko:anko-support-v4:${libraries.ankoVersion}"
-    compile "org.jetbrains.anko:anko-appcompat-v7:${libraries.ankoVersion}"
-    compile "com.android.support:support-annotations:${libraries.supportVersion}"
+    api project(':core')
+    api "org.jetbrains.anko:anko-sdk23:${libraries.ankoVersion}"
+    api "org.jetbrains.anko:anko-support-v4:${libraries.ankoVersion}"
+    api "org.jetbrains.anko:anko-appcompat-v7:${libraries.ankoVersion}"
+    api "com.android.support:support-annotations:${libraries.supportVersion}"
 }
 
 apply from: new File("${rootProject.projectDir}/publish.gradle")
\ No newline at end of file