Remove unnecessary module dependencies

chrisbanes · Dec 15, 2019 · 16e686b · 16e686b
1 parent 80f81ca
commit 16e686b
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 133 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -167,7 +167,6 @@ dependencies {
     implementation project(":base-android")
     implementation project(":common-ui-view")
     implementation project(":common-epoxy")
-    implementation project(":common-layouts")
     implementation project(':common-imageloading')
     implementation project(":common-databinding")
     implementation project(":common-entrygrid")
@@ -178,9 +177,9 @@ dependencies {
     implementation project(":tmdb")
     implementation project(':domain')
     implementation project(":tasks")
+
     implementation project(":ui-discover")
     implementation project(":ui-showdetails")
-    implementation project(":presenter-episodedetails")
     implementation project(":ui-episodedetails")
     implementation project(":ui-followed")
     implementation project(":ui-watched")
@@ -190,17 +189,12 @@ dependencies {
     implementation project(":ui-search")
 
     implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodel
+    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
 
     implementation Libs.AndroidX.appcompat
     implementation Libs.AndroidX.browser
-    implementation Libs.AndroidX.palette
-    implementation Libs.AndroidX.recyclerview
     implementation Libs.AndroidX.emoji
     implementation Libs.AndroidX.preference
-    implementation Libs.AndroidX.constraintlayout
-    implementation Libs.AndroidX.coreKtx
-    implementation Libs.AndroidX.Fragment.fragment
     implementation Libs.AndroidX.Fragment.fragmentKtx
     implementation Libs.AndroidX.Navigation.fragment
     implementation Libs.AndroidX.Navigation.ui

diff --git a/base-android/build.gradle b/base-android/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 
     implementation Libs.AndroidX.Fragment.fragment
     implementation Libs.AndroidX.coreKtx
-    implementation Libs.AndroidX.collection
+    //implementation Libs.AndroidX.collection
 
     implementation Libs.timber
     implementation Libs.threeTenAbp

diff --git a/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt b/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt
@@ -131,7 +131,7 @@ object Libs {
         object Lifecycle {
             private const val version = "2.2.0-rc02"
             const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
-            const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
+            const val viewmodelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
         }
 
         object Room {

diff --git a/common-entrygrid/build.gradle b/common-entrygrid/build.gradle
@@ -53,7 +53,7 @@ dependencies {
     implementation project(":common-databinding")
 
     implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodel
+    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
 
     implementation Libs.AndroidX.Paging.runtime
 
@@ -63,7 +63,7 @@ dependencies {
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Fragment.fragmentKtx
     implementation Libs.AndroidX.Navigation.fragment
-    implementation Libs.AndroidX.Navigation.ui
+    api Libs.AndroidX.Navigation.ui
 
     kapt Libs.Dagger.compiler
 }
diff --git a/common-ui-resources/build.gradle b/common-ui-resources/build.gradle
@@ -45,7 +45,7 @@ dependencies {
     implementation project(":base-android")
 
     implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodel
+    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
 
     api Libs.AndroidX.appcompat
     api Libs.Google.material

diff --git a/common-ui-view/build.gradle b/common-ui-view/build.gradle
@@ -46,7 +46,7 @@ dependencies {
     api project(':common-ui-resources')
 
     implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodel
+    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
 
     api Libs.AndroidX.appcompat
     implementation Libs.AndroidX.recyclerview

diff --git a/data-android/build.gradle b/data-android/build.gradle
@@ -68,6 +68,7 @@ dependencies {
     api project(":data")
 
     implementation Libs.AndroidX.Room.runtime
+    implementation Libs.AndroidX.Room.ktx
     kapt Libs.AndroidX.Room.compiler
 
     implementation Libs.Roomigrant.library

diff --git a/data/build.gradle b/data/build.gradle
@@ -31,7 +31,6 @@ dependencies {
     api project(":tmdb")
 
     api Libs.AndroidX.Room.common
-    api Libs.AndroidX.Room.ktx
     implementation Libs.AndroidX.collection
 
     api Libs.AndroidX.Paging.common

diff --git a/presenter-episodedetails/build.gradle b/presenter-episodedetails/build.gradle
@@ -52,12 +52,7 @@ dependencies {
     implementation project(":common-ui-view")
 
     implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodel
+    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
-
-    implementation Libs.AndroidX.Paging.runtime
-
-    implementation Libs.Kotlin.stdlib
-    implementation Libs.Kotlin.reflect
 
     implementation Libs.Dagger.dagger
     kapt Libs.Dagger.compiler

diff --git a/trakt/build.gradle b/trakt/build.gradle
@@ -29,7 +29,7 @@ dependencies {
     api (Libs.traktJava) {
         exclude group: 'org.threeten', module: 'threetenbp'
     }
-    api Libs.threeTenBpNoTzdb
+    implementation Libs.threeTenBpNoTzdb
 
     implementation project(":base")
 

diff --git a/ui-discover/build.gradle b/ui-discover/build.gradle
@@ -55,29 +55,19 @@ dependencies {
     implementation project(":common-databinding")
 
     implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodel
+    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
-
-    implementation Libs.AndroidX.Paging.runtime
 
     implementation Libs.AndroidX.appcompat
-    implementation Libs.AndroidX.browser
-    implementation Libs.AndroidX.palette
     implementation Libs.AndroidX.recyclerview
     implementation Libs.AndroidX.swiperefresh
-    implementation Libs.AndroidX.emoji
-    implementation Libs.AndroidX.preference
     implementation Libs.AndroidX.constraintlayout
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Fragment.fragment
     implementation Libs.AndroidX.Fragment.fragmentKtx
     implementation Libs.AndroidX.Navigation.fragment
-    implementation Libs.AndroidX.Navigation.ui
 
     implementation Libs.Google.material
 
-    implementation Libs.Kotlin.stdlib
-    implementation Libs.Kotlin.reflect
-
     implementation Libs.Dagger.androidSupport
     kapt Libs.Dagger.compiler
     kapt Libs.Dagger.androidProcessor
@@ -87,8 +77,5 @@ dependencies {
 
     implementation Libs.mvRx
 
-    implementation Libs.Epoxy.epoxy
-    implementation Libs.Epoxy.paging
-    implementation Libs.Epoxy.dataBinding
     kapt Libs.Epoxy.processor
 }
diff --git a/ui-episodedetails/build.gradle b/ui-episodedetails/build.gradle
@@ -62,16 +62,12 @@ dependencies {
     api project(":presenter-episodedetails")
 
     implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodel
+    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
 
     implementation Libs.AndroidX.Paging.runtime
 
     implementation Libs.AndroidX.appcompat
-    implementation Libs.AndroidX.browser
-    implementation Libs.AndroidX.palette
     implementation Libs.AndroidX.recyclerview
-    implementation Libs.AndroidX.emoji
-    implementation Libs.AndroidX.preference
     implementation Libs.AndroidX.constraintlayout
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Fragment.fragment
@@ -81,9 +77,6 @@ dependencies {
 
     implementation Libs.Google.material
 
-    implementation Libs.Kotlin.stdlib
-    implementation Libs.Kotlin.reflect
-
     implementation Libs.Dagger.androidSupport
     kapt Libs.Dagger.compiler
     kapt Libs.Dagger.androidProcessor
@@ -93,8 +86,5 @@ dependencies {
 
     implementation Libs.mvRx
 
-    implementation Libs.Epoxy.epoxy
-    implementation Libs.Epoxy.paging
-    implementation Libs.Epoxy.dataBinding
     kapt Libs.Epoxy.processor
 }
diff --git a/ui-followed/build.gradle b/ui-followed/build.gradle
@@ -54,37 +54,29 @@ dependencies {
     implementation project(":base")
     implementation project(":base-android")
     implementation project(':domain')
-    implementation project(":trakt-auth")
+
     implementation project(":common-ui-view")
     implementation project(":common-epoxy")
     implementation project(":common-layouts")
     implementation project(':common-imageloading')
     implementation project(":common-databinding")
 
     implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodel
+    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
 
     implementation Libs.AndroidX.Paging.runtime
 
     implementation Libs.AndroidX.appcompat
-    implementation Libs.AndroidX.browser
-    implementation Libs.AndroidX.palette
     implementation Libs.AndroidX.recyclerview
     implementation Libs.AndroidX.swiperefresh
-    implementation Libs.AndroidX.emoji
-    implementation Libs.AndroidX.preference
     implementation Libs.AndroidX.constraintlayout
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Fragment.fragment
     implementation Libs.AndroidX.Fragment.fragmentKtx
     implementation Libs.AndroidX.Navigation.fragment
-    implementation Libs.AndroidX.Navigation.ui
 
     implementation Libs.Google.material
 
-    implementation Libs.Kotlin.stdlib
-    implementation Libs.Kotlin.reflect
-
     implementation Libs.Dagger.androidSupport
     kapt Libs.Dagger.compiler
     kapt Libs.Dagger.androidProcessor
@@ -94,8 +86,5 @@ dependencies {
 
     implementation Libs.mvRx
 
-    implementation Libs.Epoxy.epoxy
-    implementation Libs.Epoxy.paging
-    implementation Libs.Epoxy.dataBinding
     kapt Libs.Epoxy.processor
 }
diff --git a/ui-popular/build.gradle b/ui-popular/build.gradle
@@ -57,29 +57,21 @@ dependencies {
     implementation project(":common-entrygrid")
 
     implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodel
+    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
 
     implementation Libs.AndroidX.Paging.runtime
 
     implementation Libs.AndroidX.appcompat
-    implementation Libs.AndroidX.browser
-    implementation Libs.AndroidX.palette
     implementation Libs.AndroidX.recyclerview
     implementation Libs.AndroidX.swiperefresh
-    implementation Libs.AndroidX.emoji
-    implementation Libs.AndroidX.preference
     implementation Libs.AndroidX.constraintlayout
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Fragment.fragment
     implementation Libs.AndroidX.Fragment.fragmentKtx
     implementation Libs.AndroidX.Navigation.fragment
-    implementation Libs.AndroidX.Navigation.ui
 
     implementation Libs.Google.material
 
-    implementation Libs.Kotlin.stdlib
-    implementation Libs.Kotlin.reflect
-
     implementation Libs.Dagger.androidSupport
     kapt Libs.Dagger.compiler
     kapt Libs.Dagger.androidProcessor
@@ -88,8 +80,4 @@ dependencies {
     kapt Libs.AssistedInject.processorDagger2
 
     implementation Libs.mvRx
-
-    implementation Libs.Epoxy.epoxy
-    implementation Libs.Epoxy.paging
-    implementation Libs.Epoxy.dataBinding
 }
diff --git a/ui-recommended/build.gradle b/ui-recommended/build.gradle
@@ -57,17 +57,13 @@ dependencies {
     implementation project(":common-entrygrid")
 
     implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodel
+    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
 
     implementation Libs.AndroidX.Paging.runtime
 
     implementation Libs.AndroidX.appcompat
-    implementation Libs.AndroidX.browser
-    implementation Libs.AndroidX.palette
     implementation Libs.AndroidX.recyclerview
     implementation Libs.AndroidX.swiperefresh
-    implementation Libs.AndroidX.emoji
-    implementation Libs.AndroidX.preference
     implementation Libs.AndroidX.constraintlayout
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Fragment.fragment
@@ -77,9 +73,6 @@ dependencies {
 
     implementation Libs.Google.material
 
-    implementation Libs.Kotlin.stdlib
-    implementation Libs.Kotlin.reflect
-
     implementation Libs.Dagger.androidSupport
     kapt Libs.Dagger.compiler
     kapt Libs.Dagger.androidProcessor
@@ -88,8 +81,4 @@ dependencies {
     kapt Libs.AssistedInject.processorDagger2
 
     implementation Libs.mvRx
-
-    implementation Libs.Epoxy.epoxy
-    implementation Libs.Epoxy.paging
-    implementation Libs.Epoxy.dataBinding
 }
diff --git a/ui-search/build.gradle b/ui-search/build.gradle
@@ -62,29 +62,21 @@ dependencies {
     implementation project(":common-databinding")
 
     implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodel
+    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
 
     implementation Libs.AndroidX.Paging.runtime
 
     implementation Libs.AndroidX.appcompat
-    implementation Libs.AndroidX.browser
-    implementation Libs.AndroidX.palette
     implementation Libs.AndroidX.recyclerview
     implementation Libs.AndroidX.swiperefresh
-    implementation Libs.AndroidX.emoji
-    implementation Libs.AndroidX.preference
     implementation Libs.AndroidX.constraintlayout
     implementation Libs.AndroidX.coreKtx
     implementation Libs.AndroidX.Fragment.fragment
     implementation Libs.AndroidX.Fragment.fragmentKtx
     implementation Libs.AndroidX.Navigation.fragment
-    implementation Libs.AndroidX.Navigation.ui
 
     implementation Libs.Google.material
 
-    implementation Libs.Kotlin.stdlib
-    implementation Libs.Kotlin.reflect
-
     implementation Libs.Dagger.androidSupport
     kapt Libs.Dagger.compiler
     kapt Libs.Dagger.androidProcessor
@@ -94,8 +86,5 @@ dependencies {
 
     implementation Libs.mvRx
 
-    implementation Libs.Epoxy.epoxy
-    implementation Libs.Epoxy.paging
-    implementation Libs.Epoxy.dataBinding
     kapt Libs.Epoxy.processor
 }