Bump Dependencies to K2

6 files changed, 25 insertions, 16 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 3e99a3c7ab..359a4259cc 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -13,6 +13,7 @@ plugins {
     id(Dependencies.Plugin.kotlinParcelizeId)
     id(Dependencies.Plugin.ksp) version Versions.Plugin.ksp
     id(Dependencies.Plugin.junit5) version Versions.Plugin.junit5
+    id(Dependencies.Plugin.composeCompiler) version Versions.kotlin
 }
 
 val repoRootPath = rootProject.projectDir.absoluteFile.parentFile.absolutePath
@@ -127,8 +128,6 @@ android {
         buildConfig = true
     }
 
-    composeOptions { kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -244,6 +243,8 @@ android {
     project.tasks.assemble.dependsOn("ensureValidVersionCode")
 }
 
+composeCompiler { enableStrongSkippingMode = true }
+
 androidComponents {
     beforeVariants { variantBuilder ->
         variantBuilder.enable =
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 978f7ef14b..7ed0057beb 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -49,6 +49,11 @@ buildscript {
         classpath(Dependencies.Plugin.Protobuf.protocOsxX86_64)
         classpath(Dependencies.Plugin.Protobuf.protocWindowsX86_32)
         classpath(Dependencies.Plugin.Protobuf.protocWindowsX86_64)
+        // Kotlin Native Prebuilt
+        classpath(Dependencies.Kotlin.kotlinNavtivePrebuiltLinuxX86_64)
+        classpath(Dependencies.Kotlin.kotlinNavtivePrebuiltMacOsAArch64)
+        classpath(Dependencies.Kotlin.kotlinNavtivePrebuiltMacOsX86_64)
+        classpath(Dependencies.Kotlin.kotlinNavtivePrebuiltWindowsX86_64)
     }
 }
 
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt
index 2b5a2c430a..5df475a45d 100644
--- a/android/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/android/buildSrc/src/main/kotlin/Dependencies.kt
@@ -92,6 +92,15 @@ object Dependencies {
         const val reflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}"
         const val test = "org.jetbrains.kotlin:kotlin-test:${Versions.kotlin}"
+
+        const val kotlinNavtivePrebuiltWindowsX86_64 =
+            "org.jetbrains.kotlin:kotlin-native-prebuilt:${Versions.kotlin}:windows-x86_64@zip"
+        const val kotlinNavtivePrebuiltLinuxX86_64 =
+            "org.jetbrains.kotlin:kotlin-native-prebuilt:${Versions.kotlin}:linux-x86_64@tar.gz"
+        const val kotlinNavtivePrebuiltMacOsAArch64 =
+            "org.jetbrains.kotlin:kotlin-native-prebuilt:${Versions.kotlin}:macos-aarch64@tar.gz"
+        const val kotlinNavtivePrebuiltMacOsX86_64 =
+            "org.jetbrains.kotlin:kotlin-native-prebuilt:${Versions.kotlin}:macos-x86_64@tar.gz"
     }
 
     object KotlinX {
@@ -143,6 +152,7 @@ object Dependencies {
             "org.owasp:dependency-check-gradle:${Versions.Plugin.dependencyCheck}"
         const val dependencyCheckId = "org.owasp.dependencycheck"
         const val detektId = "io.gitlab.arturbosch.detekt"
+        const val composeCompiler = "org.jetbrains.kotlin.plugin.compose"
         const val gradleVersionsId = "com.github.ben-manes.versions"
         const val junit5 = "de.mannodermaus.android-junit5"
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index 592bfeaef5..8b13812c56 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -5,8 +5,7 @@ object Versions {
     const val jvmTarget = "17"
     const val kermit = "2.0.4"
     const val konsist = "0.14.0"
-    const val kotlin = "1.9.24"
-    const val kotlinCompilerExtensionVersion = "1.5.14"
+    const val kotlin = "2.0.0"
     const val kotlinx = "1.8.0"
     const val leakCanary = "2.13"
     const val mockk = "1.13.11"
@@ -40,8 +39,8 @@ object Versions {
     }
 
     object Compose {
-        const val destinations = "1.10.2"
         const val base = "1.7.0-beta03"
+        const val destinations = "2.1.0-beta09"
         const val constrainLayout = "1.0.1"
         const val foundation = base
         const val material3 = "1.3.0-beta03"
@@ -68,7 +67,7 @@ object Versions {
         const val ktfmt = "0.17.0"
         // Ksp version is linked with kotlin version, find matching release here:
         // https://github.com/google/ksp/releases
-        const val ksp = "${kotlin}-1.0.20"
+        const val ksp = "${kotlin}-1.0.21"
     }
 
     object Koin {
diff --git a/android/lib/map/build.gradle.kts b/android/lib/map/build.gradle.kts
index f4606de5bd..dee6779d8a 100644
--- a/android/lib/map/build.gradle.kts
+++ b/android/lib/map/build.gradle.kts
@@ -1,32 +1,27 @@
 plugins {
     id(Dependencies.Plugin.kotlinAndroidId)
     id(Dependencies.Plugin.androidLibraryId)
+    id(Dependencies.Plugin.composeCompiler) version Versions.kotlin
 }
 
 android {
     namespace = "net.mullvad.mullvadvpn.lib.map"
     compileSdk = Versions.Android.compileSdkVersion
 
-    defaultConfig {
-        minSdk = Versions.Android.minSdkVersion
-    }
+    defaultConfig { minSdk = Versions.Android.minSdkVersion }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = Versions.jvmTarget
-    }
+    kotlinOptions { jvmTarget = Versions.jvmTarget }
 
     buildFeatures {
         compose = true
         buildConfig = true
     }
 
-    composeOptions { kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion }
-
     lint {
         lintConfig = file("${rootProject.projectDir}/config/lint.xml")
         abortOnError = true
diff --git a/android/lib/theme/build.gradle.kts b/android/lib/theme/build.gradle.kts
index dbf80a3b98..33f094fba4 100644
--- a/android/lib/theme/build.gradle.kts
+++ b/android/lib/theme/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id(Dependencies.Plugin.androidLibraryId)
     id(Dependencies.Plugin.kotlinAndroidId)
+    id(Dependencies.Plugin.composeCompiler) version Versions.kotlin
 }
 
 android {
@@ -11,8 +12,6 @@ android {
 
     buildFeatures { compose = true }
 
-    composeOptions { kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17