Merge pull request #618 from mikepenz/feature/ensure_dependencies_as_…

…compile Update project to properly have transitive dependencies as compile
mikepenz · Feb 7, 2021 · b41f6b0 · b41f6b0
2 parents 56c2da6 + d2766c8
commit b41f6b0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 15 deletions.
diff --git a/aboutlibraries-core/build.gradle b/aboutlibraries-core/build.gradle
@@ -45,10 +45,10 @@ android {
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat:${versions.appcompat}"
+    api "androidx.appcompat:appcompat:${versions.appcompat}"
 
     // kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
 }
 
 if (project.hasProperty('pushall') || project.hasProperty('library_core_only')) {

diff --git a/aboutlibraries/build.gradle b/aboutlibraries/build.gradle
@@ -50,7 +50,6 @@ dependencies {
     api project(':aboutlibraries-core')
 
     implementation "androidx.core:core-ktx:${versions.coreKtx}"
-    implementation "androidx.appcompat:appcompat:${versions.appcompat}"
     implementation "androidx.cardview:cardview:${versions.cardview}"
     implementation "androidx.recyclerview:recyclerview:${versions.recyclerview}"
     implementation "com.google.android.material:material:${versions.material}"
@@ -63,9 +62,6 @@ dependencies {
     // https://github.com/mikepenz/FastAdapter
     implementation "com.mikepenz:fastadapter:${versions.fastadapter}"
 
-    // kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
-
     // navigation
     implementation "androidx.navigation:navigation-fragment-ktx:${versions.navigation}"
 }

diff --git a/app/build.gradle b/app/build.gradle
@@ -86,7 +86,6 @@ dependencies {
     implementation project(':aboutlibraries')
 
     implementation "com.google.android.material:material:${versions.material}"
-    implementation "androidx.appcompat:appcompat:${versions.appcompat}"
     implementation "androidx.recyclerview:recyclerview:${versions.recyclerview}"
     implementation "androidx.cardview:cardview:${versions.cardview}"
 
@@ -107,9 +106,6 @@ dependencies {
     //https://github.com/mikepenz/Android-Iconics
     implementation "com.mikepenz:material-design-iconic-typeface:2.2.0.8-kotlin@aar"
 
-    // kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
-
     // used only tho showcase multi flavor support
     stagingImplementation("com.squareup.okhttp3:okhttp:4.9.1")
 }

diff --git a/build.gradle b/build.gradle
@@ -23,10 +23,10 @@ buildscript {
                 kotlin          : "1.4.30",
                 constraintLayout: '2.0.4',
                 navigation      : "2.3.3",
-                iconics         : "5.2.1",
+                iconics         : "5.2.5",
                 detekt          : '1.15.0',
-                fastadapter     : "5.3.2",
-                materialdrawer  : "8.3.1",
+                fastadapter     : "5.3.4",
+                materialdrawer  : "8.3.2",
                 coreKtx         : "1.3.2"
         ]
     }

diff --git a/gradle-release.gradle b/gradle-release.gradle
@@ -79,6 +79,9 @@ afterEvaluate { project ->
                     asNode().appendNode('description', POM_DESCRIPTION)
                     asNode().appendNode('url', POM_SCM_URL)
                     asNode().children().last() + pomConfig
+
+                    // we want dependencies as compile, to ensure they are transitively resolved
+                    asNode().dependencies.'*'.findAll() { it.scope.text() == 'runtime' }.each { it.scope*.value = 'compile' }
                 }
             }
         }

diff --git a/plugin-build/build.gradle b/plugin-build/build.gradle
@@ -4,6 +4,7 @@ buildscript {
     repositories {
         maven { url "https://plugins.gradle.org/m2/" }
         google()
+        mavenCentral()
         jcenter()
         mavenLocal()
     }
@@ -12,6 +13,7 @@ buildscript {
 allprojects {
     repositories {
         google()
+        mavenCentral()
         jcenter()
         mavenLocal()
     }

diff --git a/plugin-build/plugin/build.gradle b/plugin-build/plugin/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30"
     }
 }
 plugins {
@@ -54,7 +54,7 @@ repositories {
 dependencies {
     implementation gradleApi()
     implementation localGroovy()
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.21'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.30'
 }
 
 compileGroovy {