Update kotlin monorepo to v2 (major) (#292)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | | ---------------------------------------------------------------------------------------------------------------------- | ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | [org.jetbrains.kotlin.kapt](https://kotlinlang.org/) ([source](https://togithub.com/JetBrains/kotlin)) | `1.9.24` -> `2.0.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jetbrains.kotlin.kapt/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jetbrains.kotlin.kapt/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jetbrains.kotlin.kapt/1.9.24/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jetbrains.kotlin.kapt/1.9.24/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.jetbrains.kotlin.android](https://kotlinlang.org/) ([source](https://togithub.com/JetBrains/kotlin)) | `1.9.24` -> `2.0.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jetbrains.kotlin.android/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jetbrains.kotlin.android/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jetbrains.kotlin.android/1.9.24/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jetbrains.kotlin.android/1.9.24/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.jetbrains.kotlin.jvm](https://kotlinlang.org/) ([source](https://togithub.com/JetBrains/kotlin)) | `1.9.24` -> `2.0.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jetbrains.kotlin.jvm/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jetbrains.kotlin.jvm/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jetbrains.kotlin.jvm/1.9.24/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jetbrains.kotlin.jvm/1.9.24/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.jetbrains.kotlin:kotlin-gradle-plugin](https://kotlinlang.org/) ([source](https://togithub.com/JetBrains/kotlin)) | `1.9.24` -> `2.0.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jetbrains.kotlin:kotlin-gradle-plugin/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jetbrains.kotlin:kotlin-gradle-plugin/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jetbrains.kotlin:kotlin-gradle-plugin/1.9.24/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jetbrains.kotlin:kotlin-gradle-plugin/1.9.24/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | *** ### Release Notes <details> <summary>JetBrains/kotlin (org.jetbrains.kotlin.kapt)</summary> ### [`v2.0.0`](https://togithub.com/JetBrains/kotlin/compare/v1.9.24...v2.0.0) </details> *** ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. *** - [ ] If you want to rebase/retry this PR, check this box *** This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/WhosNickDoglio/dagger-rules).   - `main` - \#292 :point\_left: Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
WhosNickDoglio · May 28, 2024 · b0db042 · b0db042
1 parent eab1819
commit b0db042
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -150,3 +150,7 @@ local.properties
 
 # Google/Firebase secrets
 google-services.json
+
+
+# Kotlin build directory introduced in K2
+.kotlin
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agp = "8.4.1"
 desugar = "2.0.4"
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 ktlint = "1.2.1"
 lint = "31.4.1"
 detekt = "1.23.6"
@@ -22,7 +22,7 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
-ksp = { id = "com.google.devtools.ksp", version = "1.9.24-1.0.20" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.21" }
 sortDependencies = { id = "com.squareup.sort-dependencies", version.ref = "sort" }
 anvil = { id = "com.squareup.anvil", version = "2.4.9" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }

diff --git a/test-app/build.gradle.kts b/test-app/build.gradle.kts
@@ -1,3 +1,7 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 /*
  * Copyright (C) 2024 Nicholas Doglio
  * SPDX-License-Identifier: MIT
@@ -67,6 +71,22 @@ android {
     }
 }
 
+tasks.withType<KaptGenerateStubsTask>().configureEach {
+    // TODO necessary until anvil supports something for K2 contribution merging
+    compilerOptions {
+        progressiveMode.set(false)
+        languageVersion.set(KotlinVersion.KOTLIN_1_9)
+    }
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    // TODO necessary until anvil supports something for K2 contribution merging
+    compilerOptions {
+        progressiveMode.set(false)
+        languageVersion.set(KotlinVersion.KOTLIN_1_9)
+    }
+}
+
 spotless {
     format("misc") {
         target("*.md", ".gitignore")