Migrate to k2

build-logic/build.gradle.kts

@@ -21,18 +21,18 @@ plugins {
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
+  sourceCompatibility = JavaVersion.VERSION_17
+  targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-  kotlinOptions {
-    jvmTarget = "1.8"
-    freeCompilerArgs += listOf(
-      "-Xopt-in=kotlin.ExperimentalStdlibApi",
-      "-Xopt-in=kotlin.RequiresOptIn",
-      "-Xopt-in=kotlin.time.ExperimentalTime",
-      "-Xopt-in=kotlin.experimental.ExperimentalTypeInference",
+  compilerOptions {
+    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+    freeCompilerArgs.addAll(
+      "-opt-in=kotlin.ExperimentalStdlibApi",
+      "-opt-in=kotlin.RequiresOptIn",
+      "-opt-in=kotlin.time.ExperimentalTime",
+      "-opt-in=kotlin.experimental.ExperimentalTypeInference",
       "-Xexplicit-api=strict"
     )
   }

build-logic/settings.gradle.kts

@@ -25,8 +25,6 @@ pluginManagement {
     id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.6.0"
   }
 }
-enableFeaturePreview("VERSION_CATALOGS")
-
 dependencyResolutionManagement {
   repositories {
     google()

build-logic/src/main/kotlin/gradle/Catalog.kt

@@ -29,5 +29,5 @@ internal fun VersionCatalog.version(reference: String): String? = findVersion(re
   .orElse(null)
   ?.toString()
 
-internal fun VersionCatalog.dependency(reference: String): String? = findDependency(reference)
+internal fun VersionCatalog.dependency(reference: String): String? = findLibrary(reference)
   .orElse(null)?.toString()

build-logic/src/main/kotlin/kt/KotlinCommon.kt

@@ -26,9 +26,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal fun Project.kotlinCommon() {
   tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-      jvmTarget = "1.8"
-      freeCompilerArgs = freeCompilerArgs + listOf(
+    compilerOptions {
+      jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+      freeCompilerArgs.addAll(
         "-opt-in=kotlin.ExperimentalStdlibApi",
         "-opt-in=kotlin.RequiresOptIn",
         "-opt-in=kotlin.time.ExperimentalTime",

build.gradle

@@ -31,14 +31,14 @@ allprojects {
   plugins.withType(com.android.build.gradle.BasePlugin).configureEach { plugin ->
     //noinspection GrDeprecatedAPIUsage
     plugin.extension.compileOptions {
-      sourceCompatibility = JavaVersion.VERSION_1_8
-      targetCompatibility = JavaVersion.VERSION_1_8
+      sourceCompatibility = JavaVersion.VERSION_17
+      targetCompatibility = JavaVersion.VERSION_17
     }
   }
 
   tasks.withType(JavaCompile).configureEach { task ->
-    task.sourceCompatibility = JavaVersion.VERSION_1_8
-    task.targetCompatibility = JavaVersion.VERSION_1_8
+    task.sourceCompatibility = JavaVersion.VERSION_17
+    task.targetCompatibility = JavaVersion.VERSION_17
   }
 
   pluginManager.withPlugin("kotlin-kapt") {

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
 compose = "1.2.0-rc02"
 ktlint = "0.46.1"
-dokka = "1.5.0"
-kotlin = "1.6.21"
+dokka = "1.9.20"
+kotlin = "2.0.21"
 coroutines = "1.5.0"
-dagger = "2.42"
+dagger = "2.51.1"
 binary-validator = "0.11.0"
 
 [libraries]
@@ -36,7 +36,7 @@ dagger-android-processor = { module = "com.google.dagger:dagger-android-processo
 dagger-hilt = { module = "com.google.dagger:hilt-android", version.ref = "dagger" }
 dagger-hilt-android = { module = "com.google.dagger:hilt-android-compiler", version.ref = "dagger" }
 dagger-hilt-gradle = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "dagger" }
-dagger-anvil = "com.squareup.anvil:gradle-plugin:2.4.1-1-6"
+dagger-anvil = "com.squareup.anvil:gradle-plugin:2.5.0-beta11"
 dagger-spi = { module = "com.google.dagger:dagger-spi", version.ref = "dagger" }
 
 compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
@@ -69,5 +69,5 @@ turbine = "app.cash.turbine:turbine:0.7.0"
 truth = "com.google.truth:truth:1.0"
 
 [plugins]
-gradle-publish = { id = "com.gradle.plugin-publish", version = "0.14.0" }
+gradle-publish = { id = "com.gradle.plugin-publish", version = "1.3.0" }
 binary-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-validator" }

gradle/scabbard-local-processor.gradle

@@ -18,7 +18,7 @@
 configurations.configureEach {
   resolutionStrategy {
     dependencySubstitution {
-      substitute module("dev.arunkumar:scabbard-processor") with project(":scabbard-processor")
+      substitute module("dev.arunkumar:scabbard-processor") using project(":scabbard-processor")
     }
   }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,20 +1,7 @@
-#
-# Copyright 2022 Arunkumar
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists