Skip to content

build: replace kapt with ksp #20225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2024
Merged

build: replace kapt with ksp #20225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import se.bjurr.violations.lib.model.SEVERITY
plugins {
id "com.android.application"
id "org.jetbrains.kotlin.android"
id "org.jetbrains.kotlin.kapt"
id "org.jetbrains.kotlin.plugin.parcelize"
id "org.jetbrains.kotlin.plugin.allopen"
id "io.sentry.android.gradle"
Expand Down Expand Up @@ -337,10 +336,6 @@ static def addBuildConfigFieldsFromPrefixedProperties(variant, properties, prefi
variant.buildConfigField "String", it.key.toUpperCase(), "\"${it.value}\""
}
}
kapt {
// Enable to infer error types in stubs (see: https://kotlinlang.org/docs/kapt.html#non-existent-type-correction)
correctErrorTypes true
}

dependencies {
implementation 'androidx.webkit:webkit:1.10.0'
Expand Down Expand Up @@ -453,7 +448,7 @@ dependencies {
exclude group: 'androidx.appcompat', module: 'appcompat'
}
implementation "com.github.bumptech.glide:glide:$glideVersion"
kapt "com.github.bumptech.glide:compiler:$glideVersion"
ksp "com.github.bumptech.glide:ksp:$glideVersion"
implementation "com.github.bumptech.glide:volley-integration:$glideVersion"
implementation "com.github.indexos.media-for-mobile:domain:$indexosMediaForMobileVersion"
implementation "com.github.indexos.media-for-mobile:android:$indexosMediaForMobileVersion"
Expand All @@ -467,9 +462,9 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
}
implementation "com.google.dagger:dagger-android-support:$gradle.ext.daggerVersion"
kapt "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion"
ksp "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion"
implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion"
kapt "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion"
ksp "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion"

testImplementation "$gradle.ext.storiesAndroidPhotoEditorPath:$automatticStoriesVersion"

Expand Down Expand Up @@ -526,7 +521,7 @@ dependencies {
androidTestImplementation (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing
androidTestImplementation "androidx.work:work-testing:$androidxWorkManagerVersion"
androidTestImplementation "com.google.dagger:hilt-android-testing:$gradle.ext.daggerVersion"
kaptAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion"
kspAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion"
// Enables Java 8+ API desugaring support
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$androidDesugarVersion"
lintChecks "org.wordpress:lint:$wordPressLintVersion"
Expand Down
4 changes: 2 additions & 2 deletions config/lint/lint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- TODO: https://github.com/wordpress-mobile/WordPress-Android/issues/18185 -->
<issue id="MissingFirebaseInstanceTokenRefresh">
<!-- GCM -->
<ignore path="**/generated/source/kapt/**/org/wordpress/android/push/Hilt_GCMMessageService.java" />
<ignore path="**/generated/ksp/**/org/wordpress/android/push/Hilt_GCMMessageService.java" />
</issue>
<issue id="GradleDependency" severity="ignore" /> <!-- Dependabot will take care of this -->
<issue id="MissingNullAnnotationOnField">
Expand Down Expand Up @@ -63,7 +63,7 @@
<ignore path="**/src/wordpress/res" /> <!-- drawable-hdpi, drawable-xxhdpi -->
</issue>
<issue id="ObsoleteSdkInt">
<ignore path="**/generated/source/kapt/**/org/wordpress/android/ui/main/Hilt_WPMainNavigationView.java" />
<ignore path="**/generated/ksp/**/org/wordpress/android/ui/main/Hilt_WPMainNavigationView.java" />
</issue>
<!-- INTEROPERABILITY -->
<issue id="UnknownNullness" severity="informational">
Expand Down
1 change: 0 additions & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ pluginManagement {
plugins {
id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion
id "org.jetbrains.kotlin.jvm" version gradle.ext.kotlinVersion
id "org.jetbrains.kotlin.kapt" version gradle.ext.kotlinVersion
id "org.jetbrains.kotlin.plugin.serialization" version gradle.ext.kotlinVersion
id "org.jetbrains.kotlin.plugin.parcelize" version gradle.ext.kotlinVersion
id "org.jetbrains.kotlin.plugin.allopen" version gradle.ext.kotlinVersion
Expand Down