Set Elvis lib as a transitive dependency

ThanosFisherman · Sep 17, 2020 · c00a2d2 · c00a2d2
1 parent ff647ac
commit c00a2d2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/buildSrc/src/main/kotlin/Artifact.kt b/buildSrc/src/main/kotlin/Artifact.kt
@@ -2,8 +2,8 @@ object Artifact {
 
     val ARTIFACT_NAME = "wifiutils"
     val ARTIFACT_GROUP = "com.thanosfisherman.wifiutils"
-    val VERSION_NAME = "1.6.3"
-    val VERSION_CODE = 20
+    val VERSION_NAME = "1.6.4"
+    val VERSION_CODE = 21
     val POM_URL = "https://github.com/ThanosFisherman/WifiUtils"
     val POM_SCM_URL = "https://github.com/ThanosFisherman/WifiUtils"
     val POM_ISSUE_URL = "https://github.com/ThanosFisherman/WifiUtils/issues"

diff --git a/buildSrc/src/main/kotlin/DependencyManager.kt b/buildSrc/src/main/kotlin/DependencyManager.kt
@@ -7,9 +7,7 @@ fun DependencyHandler.addAppModuleDependencies() {
     AppDependency.getAll().forEach { implementation(it) }
 }
 
-fun DependencyHandler.addLibModuleDependencies() {
-    LibDependency.getAll().forEach { implementation(it) }
-}
+fun DependencyHandler.getLibModuleDependencies() = LibDependency.getAll()
 
 
 fun DependencyHandler.addTestDependencies() {

diff --git a/wifiutils/build.gradle.kts b/wifiutils/build.gradle.kts
@@ -48,7 +48,13 @@ android {
 
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-    addLibModuleDependencies()
+    getLibModuleDependencies().forEach {
+        if (it.contains("elvis", true)) {
+            implementation(it) { isTransitive = true }
+        } else {
+            implementation(it)
+        }
+    }
     addTestDependencies()
 }