From 1e4fc31ed441eaa9a1469b0ebdf5f82cbda8b784 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Mon, 23 Jun 2025 15:57:10 -0500
Subject: [PATCH] Update Kotlin to v2.2.0 (#5408)

---
 annotation/build.gradle.kts          |  2 +-
 app/build.gradle.kts                 |  2 +-
 authenticator/build.gradle.kts       |  2 +-
 authenticatorbridge/build.gradle.kts |  2 +-
 core/build.gradle.kts                | 11 ++++++++---
 data/build.gradle.kts                |  2 +-
 gradle/libs.versions.toml            |  4 ++--
 network/build.gradle.kts             |  4 ++--
 ui/build.gradle.kts                  | 11 ++++++++---
 9 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/annotation/build.gradle.kts b/annotation/build.gradle.kts
index a641330bfd..6e59c102ab 100644
--- a/annotation/build.gradle.kts
+++ b/annotation/build.gradle.kts
@@ -37,6 +37,6 @@ android {
 
 kotlin {
     compilerOptions {
-        jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
+        jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
     }
 }
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index de3bec6ed5..076f896957 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -193,7 +193,7 @@ android {
 
 kotlin {
     compilerOptions {
-        jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
+        jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
     }
 }
 
diff --git a/authenticator/build.gradle.kts b/authenticator/build.gradle.kts
index 4b53babc76..f03e07f8c3 100644
--- a/authenticator/build.gradle.kts
+++ b/authenticator/build.gradle.kts
@@ -143,7 +143,7 @@ android {
 
 kotlin {
     compilerOptions {
-        jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
+        jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
     }
 }
 
diff --git a/authenticatorbridge/build.gradle.kts b/authenticatorbridge/build.gradle.kts
index d663ba1633..7c4c521b76 100644
--- a/authenticatorbridge/build.gradle.kts
+++ b/authenticatorbridge/build.gradle.kts
@@ -54,7 +54,7 @@ android {
 
 kotlin {
     compilerOptions {
-        jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
+        jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
     }
 }
 
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index c8d03e0680..990c3b239c 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.hilt)
@@ -32,9 +34,6 @@ android {
         sourceCompatibility(libs.versions.jvmTarget.get())
         targetCompatibility(libs.versions.jvmTarget.get())
     }
-    kotlinOptions {
-        jvmTarget = libs.versions.jvmTarget.get()
-    }
 }
 
 dependencies {
@@ -54,6 +53,12 @@ dependencies {
     testImplementation(libs.mockk.mockk)
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
+    }
+}
+
 tasks {
     withType<Test> {
         useJUnitPlatform()
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index a3b85142aa..ffcaa86ff1 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -40,7 +40,7 @@ android {
 
 kotlin {
     compilerOptions {
-        jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
+        jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b1c145b539..4ad4f99fc3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -39,12 +39,12 @@ hilt = "2.56.2"
 junit5 = "5.13.1"
 jvmTarget = "17"
 # kotlin and ksp **must** use compatible versions, do not update either without the other.
-kotlin = "2.1.21"
+kotlin = "2.2.0"
 kotlinxCollectionsImmutable = "0.4.0"
 kotlinxCoroutines = "1.10.2"
 kotlinxSerialization = "1.8.1"
 kotlinxKover = "0.9.1"
-ksp = "2.1.21-2.0.1"
+ksp = "2.2.0-RC3-2.0.2"
 mockk = "1.14.2"
 okhttp = "4.12.0"
 retrofitBom = "3.0.0"
diff --git a/network/build.gradle.kts b/network/build.gradle.kts
index c2670daff7..b2d2d23332 100644
--- a/network/build.gradle.kts
+++ b/network/build.gradle.kts
@@ -23,7 +23,7 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
     }
@@ -39,7 +39,7 @@ android {
 
 kotlin {
     compilerOptions {
-        jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
+        jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
     }
 }
 
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
index 83ec5a9ef4..81d7496e3c 100644
--- a/ui/build.gradle.kts
+++ b/ui/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -35,9 +37,6 @@ android {
         unitTests.isIncludeAndroidResources = true
         unitTests.isReturnDefaultValues = true
     }
-    kotlinOptions {
-        jvmTarget = libs.versions.jvmTarget.get()
-    }
     @Suppress("UnstableApiUsage")
     testFixtures {
         enable = true
@@ -88,6 +87,12 @@ dependencies {
     testFixturesImplementation(libs.square.turbine)
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
+    }
+}
+
 tasks {
     withType<Test> {
         useJUnitPlatform()