Skip to content

Commit

Permalink
Migrate hilt kapt to ksp
Browse files Browse the repository at this point in the history
  • Loading branch information
skydoves committed Oct 7, 2023
1 parent 1c23d8b commit fb1452e
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 18 deletions.
6 changes: 3 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import com.skydoves.pokedex.Configuration
plugins {
id(libs.plugins.android.application.get().pluginId)
id(libs.plugins.kotlin.android.get().pluginId)
id(libs.plugins.kotlin.kapt.get().pluginId)
id(libs.plugins.ksp.get().pluginId)
id(libs.plugins.kotlin.parcelize.get().pluginId)
id(libs.plugins.hilt.plugin.get().pluginId)
}
Expand Down Expand Up @@ -99,9 +99,9 @@ dependencies {

// di
implementation(libs.hilt.android)
kapt(libs.hilt.compiler)
ksp(libs.hilt.compiler)
androidTestImplementation(libs.hilt.testing)
kaptAndroidTest(libs.hilt.compiler)
kspAndroidTest(libs.hilt.compiler)

// coroutines
implementation(libs.coroutines)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import javax.inject.Inject
@AndroidEntryPoint
class DetailActivity : BindingActivity<ActivityDetailBinding>(R.layout.activity_detail) {

@set:Inject
@Inject
internal lateinit var detailViewModelFactory: DetailViewModel.AssistedFactory

@get:VisibleForTesting
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

@Suppress("DSL_SCOPE_VIOLATION")
plugins {
alias(libs.plugins.ksp) apply false
alias(libs.plugins.spotless)
}

Expand Down
4 changes: 2 additions & 2 deletions core-data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import com.skydoves.pokedex.Configuration
plugins {
id(libs.plugins.android.library.get().pluginId)
id(libs.plugins.kotlin.android.get().pluginId)
id(libs.plugins.kotlin.kapt.get().pluginId)
id(libs.plugins.ksp.get().pluginId)
}

android {
Expand Down Expand Up @@ -52,7 +52,7 @@ dependencies {

// di
implementation(libs.hilt.android)
kapt(libs.hilt.compiler)
ksp(libs.hilt.compiler)

// unit test
testImplementation(libs.junit)
Expand Down
5 changes: 2 additions & 3 deletions core-database/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import com.skydoves.pokedex.Configuration
plugins {
id(libs.plugins.android.library.get().pluginId)
id(libs.plugins.kotlin.android.get().pluginId)
id(libs.plugins.kotlin.kapt.get().pluginId)
id(libs.plugins.ksp.get().pluginId) version libs.versions.ksp.get()
id(libs.plugins.ksp.get().pluginId)
}

android {
Expand Down Expand Up @@ -68,7 +67,7 @@ dependencies {

// di
implementation(libs.hilt.android)
kapt(libs.hilt.compiler)
ksp(libs.hilt.compiler)

// unit test
testImplementation(libs.junit)
Expand Down
2 changes: 1 addition & 1 deletion core-model/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
id(libs.plugins.android.library.get().pluginId)
id(libs.plugins.kotlin.android.get().pluginId)
id(libs.plugins.kotlin.parcelize.get().pluginId)
id(libs.plugins.ksp.get().pluginId) version libs.versions.ksp.get()
id(libs.plugins.ksp.get().pluginId)
}

android {
Expand Down
5 changes: 2 additions & 3 deletions core-network/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import com.skydoves.pokedex.Configuration
plugins {
id(libs.plugins.android.library.get().pluginId)
id(libs.plugins.kotlin.android.get().pluginId)
id(libs.plugins.kotlin.kapt.get().pluginId)
id(libs.plugins.ksp.get().pluginId) version libs.versions.ksp.get()
id(libs.plugins.ksp.get().pluginId)
}

android {
Expand Down Expand Up @@ -60,5 +59,5 @@ dependencies {

// di
implementation(libs.hilt.android)
kapt(libs.hilt.compiler)
ksp(libs.hilt.compiler)
}
9 changes: 4 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ agp = "8.1.2"
kotlin = "1.9.10"
ksp = "1.9.10-1.0.13"
jvmTarget = "17"
material = "1.9.0"
material = "1.10.0"
androidxActivity = "1.7.0"
androidxFragment = "1.6.1"
androidxLifecycle = "2.6.2"
androidxRoom = "2.5.2"
androidxArchCore = "2.2.0"
androidXStartup = "1.1.1"
bindables = "1.1.0"
hilt = "2.48"
hilt = "2.48.1"
retrofit = "2.9.0"
okHttp = "4.11.0"
sandwich = "1.3.9"
Expand All @@ -29,11 +29,11 @@ progressView = "1.1.3"
rainbow = "1.0.3"
timber = "5.0.1"
baselineProfiles = "1.3.1"
macroBenchmark = "1.2.0-rc01"
macroBenchmark = "1.2.0-rc02"
uiAutomator = "2.3.0-alpha04"
truth = "1.1.3"
junit = "4.13.2"
turbine = "0.13.0"
turbine = "1.0.0"
robolectric = "4.10"
androidxTest = "1.5.0"
androidxTestJunit = "1.1.5"
Expand All @@ -48,7 +48,6 @@ android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
android-test = { id = "com.android.test", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
Expand Down

0 comments on commit fb1452e

Please sign in to comment.