Skip to content

Commit fac28b0

Browse files
committed
kapt -> ksp (duckduckgo#3680)
Task/Issue URL: https://app.asana.com/0/488551667048375/1205715262913151/f Moving everything except dagger in the `:app` module from kapt -> ksp NA Should build and pass tests
1 parent a8bad37 commit fac28b0

File tree

31 files changed

+71
-119
lines changed

31 files changed

+71
-119
lines changed

ad-click/ad-click-store/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'kotlin-kapt'
20+
id 'com.google.devtools.ksp' version "$ksp_version"
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"
@@ -44,7 +44,7 @@ dependencies {
4444
implementation AndroidX.room.runtime
4545
implementation AndroidX.room.rxJava2
4646
implementation AndroidX.room.ktx
47-
kapt AndroidX.room.compiler
47+
ksp AndroidX.room.compiler
4848
testImplementation AndroidX.room.testing
4949

5050
implementation Square.retrofit2.converter.moshi

anrs/anrs-store/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'kotlin-kapt'
20+
id 'com.google.devtools.ksp' version "$ksp_version"
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"
@@ -34,7 +34,7 @@ dependencies {
3434
implementation AndroidX.room.runtime
3535
implementation AndroidX.room.rxJava2
3636
implementation AndroidX.room.ktx
37-
kapt AndroidX.room.compiler
37+
ksp AndroidX.room.compiler
3838

3939
testImplementation Testing.junit4
4040
testImplementation Testing.mockito.kotlin

anvil/anvil-compiler/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'java-library'
1919
id 'kotlin'
20-
id 'kotlin-kapt'
20+
id 'com.google.devtools.ksp' version "$ksp_version"
2121
}
2222

2323
apply from: "$rootProject.projectDir/code-formatting.gradle"
@@ -40,7 +40,7 @@ dependencies {
4040
implementation Google.dagger
4141
implementation project(":feature-toggles-api")
4242

43-
compileOnly "com.google.auto.service:auto-service-annotations:1.0"
44-
kapt "com.google.auto.service:auto-service:1.0"
43+
implementation "com.google.auto.service:auto-service-annotations:1.1.0"
44+
ksp "dev.zacsweers.autoservice:auto-service-ksp:1.1.0"
4545
}
4646

app-store/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'kotlin-kapt'
20+
id 'com.google.devtools.ksp' version "$ksp_version"
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"
@@ -31,7 +31,7 @@ dependencies {
3131

3232
implementation "com.jakewharton.threetenabp:threetenabp:_"
3333

34-
kapt AndroidX.room.compiler
34+
ksp AndroidX.room.compiler
3535
}
3636
android {
3737
namespace 'com.duckduckgo.app'

app-tracking-protection/vpn-internal/src/main/java/com/duckduckgo/vpn/internal/feature/VpnInternalSettingsActivity.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ import androidx.lifecycle.lifecycleScope
2828
import androidx.work.OneTimeWorkRequestBuilder
2929
import androidx.work.WorkManager
3030
import com.duckduckgo.anvil.annotations.ContributeToActivityStarter
31+
import com.duckduckgo.anvil.annotations.InjectWith
3132
import com.duckduckgo.app.global.DispatcherProvider
3233
import com.duckduckgo.app.global.DuckDuckGoActivity
3334
import com.duckduckgo.app.utils.ConflatedJob
3435
import com.duckduckgo.appbuildconfig.api.AppBuildConfig
36+
import com.duckduckgo.di.scopes.VpnScope
3537
import com.duckduckgo.mobile.android.app.tracking.AppTrackingProtection
3638
import com.duckduckgo.mobile.android.ui.viewbinding.viewBinding
3739
import com.duckduckgo.mobile.android.vpn.apps.VpnExclusionList
@@ -55,6 +57,7 @@ import kotlinx.coroutines.isActive
5557
import kotlinx.coroutines.launch
5658

5759
@ContributeToActivityStarter(LaunchVpnInternalScreenWithEmptyParams::class)
60+
@InjectWith(VpnScope::class)
5861
class VpnInternalSettingsActivity : DuckDuckGoActivity() {
5962

6063
@Inject

app-tracking-protection/vpn-store/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'com.android.library'
1919
id 'kotlin-android'
20-
id 'kotlin-kapt'
20+
id 'com.google.devtools.ksp' version "$ksp_version"
2121
}
2222

2323
apply from: "$rootProject.projectDir/gradle/android-library.gradle"
@@ -65,7 +65,7 @@ dependencies {
6565
implementation AndroidX.room.ktx
6666
// need access to Dagger annotations
6767
implementation Google.dagger
68-
kapt AndroidX.room.compiler
68+
ksp AndroidX.room.compiler
6969
testImplementation AndroidX.room.testing
7070
// multi-process shared preferences
7171
implementation "com.frybits.harmony:harmony:_"

app/build.gradle

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
apply plugin: 'com.android.application'
1+
plugins {
2+
id 'com.android.application'
23

3-
apply plugin: 'kotlin-android'
4-
apply plugin: 'kotlin-kapt'
5-
apply plugin: 'com.squareup.anvil'
4+
id 'kotlin-android'
5+
id 'kotlin-kapt'
6+
id 'com.google.devtools.ksp' version "$ksp_version"
7+
id 'com.squareup.anvil'
8+
}
69
apply from: '../versioning.gradle'
710
apply from: "$rootDir/code-formatting.gradle"
811

@@ -365,7 +368,7 @@ dependencies {
365368
implementation AndroidX.room.runtime
366369
implementation AndroidX.room.rxJava2
367370
implementation AndroidX.room.ktx
368-
kapt AndroidX.room.compiler
371+
ksp AndroidX.room.compiler
369372
testImplementation AndroidX.room.testing
370373
androidTestImplementation AndroidX.room.testing
371374

@@ -383,7 +386,7 @@ dependencies {
383386
// Glide
384387
implementation "com.github.bumptech.glide:glide:_"
385388
implementation "com.github.bumptech.glide:okhttp3-integration:_"
386-
kapt "com.github.bumptech.glide:compiler:_"
389+
ksp "com.github.bumptech.glide:ksp:_"
387390

388391
// Lottie
389392
implementation "com.airbnb.android:lottie:_"

app/src/internal/java/com/duckduckgo/app/di.component/VpnInternalSettingsActivityComponent.kt

Lines changed: 0 additions & 55 deletions
This file was deleted.

app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ import androidx.lifecycle.LifecycleOwner
2727
import androidx.lifecycle.lifecycleScope
2828
import androidx.recyclerview.widget.ListAdapter
2929
import androidx.recyclerview.widget.RecyclerView.ViewHolder
30+
import com.bumptech.glide.Glide
31+
import com.bumptech.glide.RequestManager
3032
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
3133
import com.duckduckgo.app.browser.databinding.ItemTabBinding
3234
import com.duckduckgo.app.browser.favicon.FaviconManager
@@ -35,8 +37,6 @@ import com.duckduckgo.app.browser.tabpreview.TabEntityDiffCallback.Companion.DIF
3537
import com.duckduckgo.app.browser.tabpreview.TabEntityDiffCallback.Companion.DIFF_KEY_TITLE
3638
import com.duckduckgo.app.browser.tabpreview.TabEntityDiffCallback.Companion.DIFF_KEY_VIEWED
3739
import com.duckduckgo.app.browser.tabpreview.WebViewPreviewPersister
38-
import com.duckduckgo.app.global.image.GlideApp
39-
import com.duckduckgo.app.global.image.GlideRequests
4040
import com.duckduckgo.app.tabs.model.TabEntity
4141
import com.duckduckgo.app.tabs.ui.TabSwitcherAdapter.TabViewHolder
4242
import com.duckduckgo.mobile.android.ui.view.show
@@ -76,7 +76,7 @@ class TabSwitcherAdapter(
7676
) {
7777
val context = holder.binding.root.context
7878
val tab = getItem(position)
79-
val glide = GlideApp.with(context)
79+
val glide = Glide.with(context)
8080

8181
holder.title.text = extractTabTitle(tab, context)
8282
updateUnreadIndicator(holder, tab)
@@ -123,7 +123,7 @@ class TabSwitcherAdapter(
123123
}
124124

125125
bundle[DIFF_KEY_PREVIEW]?.let {
126-
loadTabPreviewImage(tab, GlideApp.with(holder.binding.root), holder)
126+
loadTabPreviewImage(tab, Glide.with(holder.binding.root), holder)
127127
}
128128

129129
bundle[DIFF_KEY_TITLE]?.let {
@@ -148,7 +148,7 @@ class TabSwitcherAdapter(
148148

149149
private fun loadTabPreviewImage(
150150
tab: TabEntity,
151-
glide: GlideRequests,
151+
glide: RequestManager,
152152
holder: TabViewHolder,
153153
) {
154154
val previewFile = tab.tabPreviewFile

autoconsent/autoconsent-store/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'com.android.library'
33
id 'kotlin-android'
4-
id 'kotlin-kapt'
4+
id 'com.google.devtools.ksp' version "$ksp_version"
55
}
66

77
apply from: "$rootProject.projectDir/gradle/android-library.gradle"
@@ -17,7 +17,7 @@ dependencies {
1717
// Room
1818
implementation AndroidX.room.runtime
1919
implementation AndroidX.room.ktx
20-
kapt AndroidX.room.compiler
20+
ksp AndroidX.room.compiler
2121
testImplementation AndroidX.room.testing
2222

2323
// Testing dependencies

0 commit comments

Comments
 (0)