chrisbanes · chrisbanes · Feb 10, 2023 · Feb 10, 2023
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -156,7 +156,6 @@ dependencies {
     implementation(projects.common.ui.view)
     implementation(projects.common.imageloading)
     implementation(projects.common.ui.compose)
-    implementation(projects.data.inject)
     implementation(projects.data.dbRoom)
     implementation(projects.api.trakt)
     implementation(projects.api.traktAuth.android)

diff --git a/data/episodes/build.gradle.kts b/data/episodes/build.gradle.kts
@@ -30,6 +30,6 @@ dependencies {
     implementation(projects.api.tmdb)
     implementation(libs.retrofit.retrofit)
 
-    implementation(libs.dagger.dagger)
-    kapt(libs.dagger.compiler)
+    implementation(libs.hilt.core)
+    kapt(libs.hilt.compiler)
 }
diff --git a/...va/app/tivi/data/episodes/EpisodeBinds.kt → ...va/app/tivi/data/episodes/EpisodeBinds.kt b/...va/app/tivi/data/episodes/EpisodeBinds.kt → ...va/app/tivi/data/episodes/EpisodeBinds.kt
diff --git a/data/followedshows/build.gradle.kts b/data/followedshows/build.gradle.kts
@@ -33,6 +33,6 @@ dependencies {
     api(libs.store)
     implementation(libs.kotlinx.atomicfu)
 
-    implementation(libs.dagger.dagger)
-    kapt(libs.dagger.compiler)
+    implementation(libs.hilt.core)
+    kapt(libs.hilt.compiler)
 }
diff --git a/.../data/followedshows/FollowedShowsBinds.kt → .../data/followedshows/FollowedShowsBinds.kt b/.../data/followedshows/FollowedShowsBinds.kt → .../data/followedshows/FollowedShowsBinds.kt
diff --git a/data/inject/build.gradle.kts b/data/inject/build.gradle.kts
diff --git a/data/popularshows/build.gradle.kts b/data/popularshows/build.gradle.kts
@@ -33,6 +33,6 @@ dependencies {
     api(libs.store)
     implementation(libs.kotlinx.atomicfu)
 
-    implementation(libs.dagger.dagger)
-    kapt(libs.dagger.compiler)
+    implementation(libs.hilt.core)
+    kapt(libs.hilt.compiler)
 }
diff --git a/...vi/data/popularshows/PopularShowsBinds.kt → ...vi/data/popularshows/PopularShowsBinds.kt b/...vi/data/popularshows/PopularShowsBinds.kt → ...vi/data/popularshows/PopularShowsBinds.kt
diff --git a/data/recommendedshows/build.gradle.kts b/data/recommendedshows/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 plugins {
     id("kotlin")
     alias(libs.plugins.android.lint)
+    alias(libs.plugins.kotlin.kapt)
 }
 
 dependencies {
@@ -31,4 +32,7 @@ dependencies {
 
     api(libs.store)
     implementation(libs.kotlinx.atomicfu)
+
+    implementation(libs.hilt.core)
+    kapt(libs.hilt.compiler)
 }
diff --git a/...recommendedshows/RecommendedShowsBinds.kt → ...recommendedshows/RecommendedShowsBinds.kt b/...recommendedshows/RecommendedShowsBinds.kt → ...recommendedshows/RecommendedShowsBinds.kt
diff --git a/data/relatedshows/build.gradle.kts b/data/relatedshows/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,28 @@
  */
 
 
+import org.jetbrains.kotlin.kapt3.base.Kapt.kapt
+
+/*
+ * Copyright 2017 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 plugins {
     id("kotlin")
     alias(libs.plugins.android.lint)
+    alias(libs.plugins.kotlin.kapt)
 }
 
 dependencies {
@@ -31,4 +50,7 @@ dependencies {
 
     api(libs.store)
     implementation(libs.kotlinx.atomicfu)
+
+    implementation(libs.hilt.core)
+    kapt(libs.hilt.compiler)
 }
diff --git a/...vi/data/relatedshows/RelatedShowsBinds.kt → ...vi/data/relatedshows/RelatedShowsBinds.kt b/...vi/data/relatedshows/RelatedShowsBinds.kt → ...vi/data/relatedshows/RelatedShowsBinds.kt
diff --git a/data/search/build.gradle.kts b/data/search/build.gradle.kts
@@ -35,6 +35,6 @@ dependencies {
 
     implementation(libs.androidx.collection) // LruCache
 
-    implementation(libs.dagger.dagger)
-    kapt(libs.dagger.compiler)
+    implementation(libs.hilt.core)
+    kapt(libs.hilt.compiler)
 }
diff --git a/.../java/app/tivi/data/search/SearchBinds.kt → .../java/app/tivi/data/search/SearchBinds.kt b/.../java/app/tivi/data/search/SearchBinds.kt → .../java/app/tivi/data/search/SearchBinds.kt
diff --git a/data/showimages/build.gradle.kts b/data/showimages/build.gradle.kts
@@ -33,6 +33,6 @@ dependencies {
     api(libs.store)
     implementation(libs.kotlinx.atomicfu)
 
-    implementation(libs.dagger.dagger)
-    kapt(libs.dagger.compiler)
+    implementation(libs.hilt.core)
+    kapt(libs.hilt.compiler)
 }
diff --git a/...p/tivi/data/showimages/ShowImagesBinds.kt → ...p/tivi/data/showimages/ShowImagesBinds.kt b/...p/tivi/data/showimages/ShowImagesBinds.kt → ...p/tivi/data/showimages/ShowImagesBinds.kt
diff --git a/data/shows/build.gradle.kts b/data/shows/build.gradle.kts
@@ -33,6 +33,6 @@ dependencies {
     api(libs.store)
     implementation(libs.kotlinx.atomicfu)
 
-    implementation(libs.dagger.dagger)
-    kapt(libs.dagger.compiler)
+    implementation(libs.hilt.core)
+    kapt(libs.hilt.compiler)
 }
diff --git a/...in/java/app/tivi/data/shows/ShowsBinds.kt → ...in/java/app/tivi/data/shows/ShowsBinds.kt b/...in/java/app/tivi/data/shows/ShowsBinds.kt → ...in/java/app/tivi/data/shows/ShowsBinds.kt
diff --git a/data/test/build.gradle.kts b/data/test/build.gradle.kts
@@ -42,7 +42,6 @@ android {
 }
 
 dependencies {
-    implementation(projects.data.inject)
     implementation(projects.data.followedshows)
     implementation(projects.data.episodes)
     implementation(projects.data.showimages)

diff --git a/data/traktusers/build.gradle.kts b/data/traktusers/build.gradle.kts
@@ -33,6 +33,6 @@ dependencies {
     api(libs.store)
     implementation(libs.kotlinx.atomicfu)
 
-    implementation(libs.dagger.dagger)
-    kapt(libs.dagger.compiler)
+    implementation(libs.hilt.core)
+    kapt(libs.hilt.compiler)
 }
diff --git a/...p/tivi/data/traktusers/TraktUsersBinds.kt → ...p/tivi/data/traktusers/TraktUsersBinds.kt b/...p/tivi/data/traktusers/TraktUsersBinds.kt → ...p/tivi/data/traktusers/TraktUsersBinds.kt
diff --git a/data/trendingshows/build.gradle.kts b/data/trendingshows/build.gradle.kts
@@ -33,6 +33,6 @@ dependencies {
     api(libs.store)
     implementation(libs.kotlinx.atomicfu)
 
-    implementation(libs.dagger.dagger)
-    kapt(libs.dagger.compiler)
+    implementation(libs.hilt.core)
+    kapt(libs.hilt.compiler)
 }
diff --git a/.../data/trendingshows/TrendingShowsBinds.kt → .../data/trendingshows/TrendingShowsBinds.kt b/.../data/trendingshows/TrendingShowsBinds.kt → .../data/trendingshows/TrendingShowsBinds.kt
diff --git a/data/watchedshows/build.gradle.kts b/data/watchedshows/build.gradle.kts
@@ -33,6 +33,6 @@ dependencies {
     api(libs.store)
     implementation(libs.kotlinx.atomicfu)
 
-    implementation(libs.dagger.dagger)
-    kapt(libs.dagger.compiler)
+    implementation(libs.hilt.core)
+    kapt(libs.hilt.compiler)
 }
diff --git a/...vi/data/watchedshows/WatchedShowsBinds.kt → ...vi/data/watchedshows/WatchedShowsBinds.kt b/...vi/data/watchedshows/WatchedShowsBinds.kt → ...vi/data/watchedshows/WatchedShowsBinds.kt
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -15,22 +15,6 @@
  */
 
 
-/*
- * Copyright 2019 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 plugins {
     id("kotlin")
     alias(libs.plugins.cacheFixPlugin)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -111,6 +111,7 @@ debugdrawer-timber = { module = "au.com.gridstone.debugdrawer:debugdrawer-timber
 debugdrawer-okhttplogger = { module = "au.com.gridstone.debugdrawer:debugdrawer-okhttp-logger", version.ref = "debugdrawer" }
 
 hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "dagger" }
+hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "dagger" }
 hilt-library = { module = "com.google.dagger:hilt-android", version.ref = "dagger" }
 hilt-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "dagger" }
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -49,7 +49,6 @@ include(
     ":common:imageloading",
     ":data:db",
     ":data:db-room",
-    ":data:inject",
     ":data:legacy",
     ":data:models",
     ":data:test",