Updating Dependencies with AGP and Kotlin version upgrade

build.gradle.kts

@@ -41,7 +41,7 @@ fun KotlinCompile.configureTask() {
 }
 
 fun BaseExtension.configureExtension() {
-    compileSdkVersion(33)
+    compileSdkVersion(34)
 
     defaultConfig {
         minSdk = 21
@@ -56,7 +56,7 @@ fun BaseExtension.configureExtension() {
 
 
 plugins {
-    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.12.1"
+    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
 }
 
 apiValidation {
@@ -65,4 +65,4 @@ apiValidation {
 
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
-}
+}

gradle.properties

@@ -28,13 +28,12 @@ kapt.include.compile.classpath=false
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.disableAutomaticComponentCreation=true
 # Build Features
 android.defaults.buildfeatures.buildconfig=false
 android.defaults.buildfeatures.resvalues=false
 # Library Information
 GROUP=com.deliveryhero.whetstone
-VERSION_NAME=0.5.1-SNAPSHOT
+VERSION_NAME=0.6.0-SNAPSHOT
 # Maven central
 SONATYPE_HOST=S01
 RELEASE_SIGNING_ENABLED=true

gradle/libs.versions.toml

@@ -1,20 +1,20 @@
 [versions]
-androidGradle = "7.4.2"
+androidGradle = "8.0.2"
 androidxActivity = "1.5.0"
 androidxAppCompat = "1.3.1"
-androidxCompose = "1.2.0"
-androidxComposeCompiler = "1.4.4"
+androidxCompose = "1.5.3"
+androidxComposeCompiler = "1.5.3"
 androidxCore = "1.7.0"
 androidxFragment = "1.5.0"
 androidxLifecycle = "2.5.0"
 androidxWork = "2.7.0"
-anvil = "2.4.4"
-dagger = "2.45"
-kotlin = "1.8.10"
+anvil = "2.4.8"
+dagger = "2.48.1"
+kotlin = "1.9.10"
 kotlinxCoroutines = "1.6.4"
-mavenPublish = "0.22.0"
+mavenPublish = "0.25.3"
 truth = "1.1.3"
-autoService = "1.0.1"
+autoService = "1.1.1"
 
 [plugins]
 kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

whetstone-gradle-plugin/build.gradle.kts

@@ -87,3 +87,9 @@ fun loadParentProperties() {
         extra.set(key, value)
     }
 }
+
+afterEvaluate {
+    with(tasks) {
+        findByName("kaptGenerateStubsKotlin")?.dependsOn(findByName("generateBuildConfig"))
+    }
+}

whetstone/src/test/java/com/deliveryhero/whetstone/codegen/TestUtil.kt

@@ -1,4 +1,5 @@
 @file:OptIn(ExperimentalCompilerApi::class)
+
 package com.deliveryhero.whetstone.codegen
 
 import com.deliveryhero.whetstone.SingleIn
@@ -10,6 +11,7 @@ import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.STAR
 import com.squareup.kotlinpoet.asClassName
 import com.squareup.kotlinpoet.asTypeName
+import com.tschuchort.compiletesting.JvmCompilationResult
 import com.tschuchort.compiletesting.KotlinCompilation
 import dagger.Binds
 import dagger.Component
@@ -24,7 +26,7 @@ import kotlin.reflect.full.*
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-internal fun KotlinCompilation.Result.validateInstanceBinding(
+internal fun JvmCompilationResult.validateInstanceBinding(
     classUnderTest: String,
     baseClass: KClass<*>,
     scope: KClass<*>
@@ -43,7 +45,7 @@ internal fun KotlinCompilation.Result.validateInstanceBinding(
     assertEquals(baseClass, bindsMethod.returnType.classifier)
 }
 
-internal fun KotlinCompilation.Result.validateInjectorBinding(classUnderTest: String, scope: KClass<*>) {
+internal fun JvmCompilationResult.validateInjectorBinding(classUnderTest: String, scope: KClass<*>) {
     val clas = classLoader.loadClass(classUnderTest).kotlin
     val bindingModule = classLoader.loadClass("${classUnderTest}BindingsModule").kotlin
     val membersInjector = MembersInjector::class.asClassName()
@@ -62,7 +64,7 @@ internal fun KotlinCompilation.Result.validateInjectorBinding(classUnderTest: St
     assertEquals(membersInjector.parameterizedBy(STAR), bindsMethod.returnType.asTypeName())
 }
 
-internal fun KotlinCompilation.Result.validateAppComponent() {
+internal fun JvmCompilationResult.validateAppComponent() {
     val appComponent = classLoader.loadClass("GeneratedApplicationComponent").kotlin
 
     assertTrue(appComponent.isAbstract)