From ebe0677a11fa1e835660e7b457dbc95da4cf73a1 Mon Sep 17 00:00:00 2001 From: "lukasz.suski" Date: Fri, 22 Dec 2023 12:03:09 +0100 Subject: [PATCH] update hilt to 2.50, replace kapt with ksp, update cucumber-jvm to 7.15.0 --- build.gradle | 6 ++++-- cucumber-android-hilt/build.gradle | 6 +++--- cukeulator/build.gradle | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 3381ba7..22fd393 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,8 @@ import java.time.Duration buildscript { ext.kotlin_version = '1.9.21' - ext.hilt_version = '2.48.1' + ext.ksp_version = "$kotlin_version-1.0.16" + ext.hilt_version = '2.50' repositories { google() mavenCentral() @@ -15,6 +16,7 @@ buildscript { classpath "io.github.gradle-nexus:publish-plugin:1.3.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version" + classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$ksp_version" } } @@ -49,7 +51,7 @@ allprojects { } } version = "7.15.0-SNAPSHOT" - ext.cucumber_javaVersion = '7.14.0' + ext.cucumber_javaVersion = '7.15.0' group = 'io.cucumber' } diff --git a/cucumber-android-hilt/build.gradle b/cucumber-android-hilt/build.gradle index 4e254f3..33ea000 100644 --- a/cucumber-android-hilt/build.gradle +++ b/cucumber-android-hilt/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' +apply plugin: 'com.google.devtools.ksp' apply plugin: 'dagger.hilt.android.plugin' addAndroidConfig() @@ -12,10 +12,10 @@ dependencies { api "com.google.dagger:hilt-android:$hilt_version" api "com.google.dagger:hilt-android-testing:$hilt_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - kapt "com.google.dagger:hilt-android-compiler:$hilt_version" + ksp "com.google.dagger:hilt-android-compiler:$hilt_version" testImplementation "org.robolectric:robolectric:$robolectricVersion" - kaptTest "com.google.dagger:hilt-android-compiler:$hilt_version" + kspTest "com.google.dagger:hilt-android-compiler:$hilt_version" } diff --git a/cukeulator/build.gradle b/cukeulator/build.gradle index b4841b9..751161f 100644 --- a/cukeulator/build.gradle +++ b/cukeulator/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' apply plugin: 'jacoco' apply plugin: "kotlin-android" -apply plugin: 'kotlin-kapt' +apply plugin: 'com.google.devtools.ksp' apply plugin: 'dagger.hilt.android.plugin' ext { @@ -78,14 +78,14 @@ dependencies { implementation "androidx.compose.runtime:runtime:$composeVersion" implementation "androidx.compose.material:material:$composeMaterialVersion" implementation "com.google.dagger:hilt-android:$hilt_version" - kapt "com.google.dagger:hilt-compiler:$hilt_version" + ksp "com.google.dagger:hilt-compiler:$hilt_version" androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation 'androidx.test:core:1.5.0' androidTestImplementation 'androidx.test:rules:1.5.0' androidTestImplementation "androidx.compose.ui:ui-test-junit4:$composeVersion" androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_version" - kaptAndroidTest "com.google.dagger:hilt-android-compiler:$hilt_version" + kspAndroidTest "com.google.dagger:hilt-android-compiler:$hilt_version" androidTestUtil 'androidx.test:orchestrator:1.4.2'