diff --git a/feature/bundledcontent/build.gradle.kts b/feature/bundledcontent/build.gradle.kts index 40eba16da0..39cec6c512 100644 --- a/feature/bundledcontent/build.gradle.kts +++ b/feature/bundledcontent/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("godtools.dynamic-feature-conventions") - kotlin("kapt") + alias(libs.plugins.ksp) } android.namespace = "org.cru.godtools.feature.bundledcontent" @@ -12,5 +12,5 @@ dependencies { implementation(libs.dagger) - kapt(libs.dagger.compiler) + ksp(libs.dagger.compiler) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a98bbe6a9e..b712e9056a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ androidx-compose-compiler = "1.5.3" androidx-compose-material = "1.5.1" androidx-compose-ui = "1.5.1" androidx-core = "1.12.0" -androidx-hilt = "1.0.0" +androidx-hilt = "1.1.0-alpha01" androidx-lifecycle = "2.6.2" androidx-room = "2.5.2" androidx-viewpager2 = "1.0.0" diff --git a/library/account/build.gradle.kts b/library/account/build.gradle.kts index 782e6966e3..4a0c7a7df7 100644 --- a/library/account/build.gradle.kts +++ b/library/account/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("godtools.library-conventions") - kotlin("kapt") + alias(libs.plugins.ksp) } android.namespace = "org.cru.godtools.account" @@ -25,8 +25,8 @@ dependencies { implementation(libs.play.auth) // endregion Google - kapt(libs.dagger.compiler) - kapt(libs.hilt.compiler) + ksp(libs.dagger.compiler) + ksp(libs.hilt.compiler) testImplementation(kotlin("test")) testImplementation(libs.kotlin.coroutines.test) diff --git a/library/analytics/build.gradle.kts b/library/analytics/build.gradle.kts index 18472328d9..d3260d0bc8 100644 --- a/library/analytics/build.gradle.kts +++ b/library/analytics/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("godtools.library-conventions") - kotlin("kapt") + alias(libs.plugins.ksp) } android { @@ -42,8 +42,8 @@ dependencies { implementation(libs.play.tagmanager) implementation(libs.weakdelegate) - kapt(libs.dagger.compiler) - kapt(libs.hilt.compiler) + ksp(libs.dagger.compiler) + ksp(libs.hilt.compiler) testImplementation(kotlin("test")) testImplementation(libs.kotlin.coroutines.test) diff --git a/library/base/build.gradle.kts b/library/base/build.gradle.kts index 50b058dfeb..1c2e017126 100644 --- a/library/base/build.gradle.kts +++ b/library/base/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("godtools.library-conventions") - kotlin("kapt") + alias(libs.plugins.ksp) } android.namespace = "org.cru.godtools.base" @@ -23,8 +23,9 @@ dependencies { implementation(libs.dagger) implementation(libs.hilt) implementation(libs.kotlin.coroutines) - kapt(libs.dagger.compiler) - kapt(libs.hilt.compiler) + + ksp(libs.dagger.compiler) + ksp(libs.hilt.compiler) testImplementation(libs.kotlin.coroutines.test) testImplementation(libs.turbine) diff --git a/library/db/build.gradle.kts b/library/db/build.gradle.kts index 7e7c00a2c6..5f5806f2fd 100644 --- a/library/db/build.gradle.kts +++ b/library/db/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("godtools.library-conventions") - kotlin("kapt") alias(libs.plugins.ksp) } @@ -37,10 +36,9 @@ dependencies { implementation(libs.dagger) implementation(libs.hilt) - kapt(libs.dagger.compiler) - kapt(libs.hilt.compiler) - ksp(libs.androidx.room.compiler) + ksp(libs.dagger.compiler) + ksp(libs.hilt.compiler) testImplementation(kotlin("test")) testImplementation(libs.androidx.room.testing) diff --git a/library/download-manager/build.gradle.kts b/library/download-manager/build.gradle.kts index a0b693e0a4..c3f073c5a3 100644 --- a/library/download-manager/build.gradle.kts +++ b/library/download-manager/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id("godtools.library-conventions") kotlin("kapt") + alias(libs.plugins.ksp) } android { @@ -39,13 +40,13 @@ dependencies { implementation(libs.hilt) implementation(libs.kotlin.coroutines) - kapt(libs.androidx.hilt.compiler) - kapt(libs.dagger.compiler) - kapt(libs.hilt.compiler) + ksp(libs.androidx.hilt.compiler) + ksp(libs.dagger.compiler) + ksp(libs.hilt.compiler) testImplementation(libs.androidx.arch.core.testing) testImplementation(libs.hilt.testing) testImplementation(libs.kotlin.coroutines.test) testImplementation(libs.turbine) - kaptTest(libs.hilt.compiler) + kspTest(libs.hilt.compiler) } diff --git a/library/initial-content/build.gradle.kts b/library/initial-content/build.gradle.kts index 9baad97b83..8680218ed5 100644 --- a/library/initial-content/build.gradle.kts +++ b/library/initial-content/build.gradle.kts @@ -2,7 +2,7 @@ import org.cru.godtools.gradle.bundledcontent.configureBundledContent plugins { id("godtools.library-conventions") - kotlin("kapt") + alias(libs.plugins.ksp) } android { @@ -46,5 +46,5 @@ dependencies { testImplementation(libs.kotlin.coroutines.test) - kapt(libs.hilt.compiler) + ksp(libs.hilt.compiler) } diff --git a/library/sync/build.gradle.kts b/library/sync/build.gradle.kts index 69b7de7379..f31a0282dd 100644 --- a/library/sync/build.gradle.kts +++ b/library/sync/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("godtools.library-conventions") - kotlin("kapt") + alias(libs.plugins.ksp) } android.namespace = "org.cru.godtools.sync" @@ -27,7 +27,7 @@ dependencies { testImplementation(libs.kotlin.coroutines.test) - kapt(libs.androidx.hilt.compiler) - kapt(libs.dagger.compiler) - kapt(libs.hilt.compiler) + ksp(libs.androidx.hilt.compiler) + ksp(libs.dagger.compiler) + ksp(libs.hilt.compiler) } diff --git a/library/user-data/build.gradle.kts b/library/user-data/build.gradle.kts index 53bdd25d8e..f5480851ed 100644 --- a/library/user-data/build.gradle.kts +++ b/library/user-data/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("godtools.library-conventions") - kotlin("kapt") + alias(libs.plugins.ksp) } android.namespace = "org.cru.godtools.user" @@ -17,8 +17,8 @@ dependencies { implementation(libs.dagger) - kapt(libs.dagger.compiler) - kapt(libs.hilt.compiler) + ksp(libs.dagger.compiler) + ksp(libs.hilt.compiler) testImplementation(kotlin("test")) testImplementation(libs.kotlin.coroutines.test) diff --git a/ui/base/build.gradle.kts b/ui/base/build.gradle.kts index 9e9f0ed6e6..fb3d7b8b7d 100644 --- a/ui/base/build.gradle.kts +++ b/ui/base/build.gradle.kts @@ -2,6 +2,7 @@ plugins { id("godtools.library-conventions") kotlin("kapt") alias(libs.plugins.hilt) + alias(libs.plugins.ksp) } android { @@ -50,8 +51,8 @@ dependencies { implementation(libs.hilt) implementation(libs.youtubePlayer) - kapt(libs.dagger.compiler) - kapt(libs.hilt.compiler) + ksp(libs.dagger.compiler) + ksp(libs.hilt.compiler) testImplementation(project(":ui:tract-renderer")) } diff --git a/ui/shortcuts/build.gradle.kts b/ui/shortcuts/build.gradle.kts index a0681340ee..efc4cb0bb8 100644 --- a/ui/shortcuts/build.gradle.kts +++ b/ui/shortcuts/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("godtools.library-conventions") - kotlin("kapt") alias(libs.plugins.hilt) + alias(libs.plugins.ksp) } android { @@ -36,7 +36,7 @@ dependencies { testImplementation(libs.gtoSupport.testing.timber) testImplementation(libs.kotlin.coroutines.test) - kapt(libs.androidx.hilt.compiler) - kapt(libs.dagger.compiler) - kapt(libs.hilt.compiler) + ksp(libs.androidx.hilt.compiler) + ksp(libs.dagger.compiler) + ksp(libs.hilt.compiler) } diff --git a/ui/tutorial-renderer/build.gradle.kts b/ui/tutorial-renderer/build.gradle.kts index a84d963f09..af8d8d0a38 100644 --- a/ui/tutorial-renderer/build.gradle.kts +++ b/ui/tutorial-renderer/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("godtools.library-conventions") - kotlin("kapt") alias(libs.plugins.hilt) + alias(libs.plugins.ksp) } android { @@ -46,6 +46,6 @@ dependencies { implementation(libs.splitties.intents) implementation(libs.youtubePlayer) - kapt(libs.dagger.compiler) - kapt(libs.hilt.compiler) + ksp(libs.dagger.compiler) + ksp(libs.hilt.compiler) }