build: upgrade kotlin to 2.0.0-RC1

fhraise · Apr 14, 2024 · 758e939 · 758e939
1 parent 4cb3052
commit 758e939
Show file tree

Hide file tree

Showing 7 changed files with 450 additions and 252 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,9 @@
 .gradle
 captures
 
+# Kotlin
+.kotlin
+
 # Xcode files
 *.xcodeproj/*
 !*.xcodeproj/project.pbxproj

diff --git a/build-number.properties b/build-number.properties
@@ -15,4 +15,4 @@
 # You should have received a copy of the GNU General Public License along
 # with Fhraise. If not, see <https://www.gnu.org/licenses/>.
 #
-buildNumber=48
+buildNumber=49
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -217,7 +217,7 @@ tasks.register("releaseWebApp") {
     group = "project build"
     description = "Build the Web release"
 
-    dependsOn("compose-app:wasmJsBrowserProductionWebpack")
+    dependsOn("compose-app:wasmJsBrowserDistribution")
 
     doLast {
         logger.lifecycle("output directory: ${file(outputDirectoryOf("web")).absolutePath}")

diff --git a/compose-app/build.gradle.kts b/compose-app/build.gradle.kts
@@ -17,6 +17,8 @@
  */
 
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDistributionDsl
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import xyz.xfqlittlefan.fhraise.buildsrc.outputDirectoryOf
@@ -51,10 +53,8 @@ kotlin {
     }
 
     androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
+        @OptIn(ExperimentalKotlinGradlePluginApi::class) compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
 
@@ -142,11 +142,13 @@ android {
         versionCode = projectBuildNumber
         versionName = projectVersion
     }
+
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+
     signingConfigs {
         val store = file("key.jks")
         if (store.exists()) {
@@ -165,6 +167,7 @@ android {
             }
         }
     }
+
     buildTypes {
         getByName("release") {
             isMinifyEnabled = true
@@ -181,9 +184,10 @@ android {
             }
         }
     }
+
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     splits {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.23"
+kotlin = "2.0.0-RC1"
 kotlinx-atomicfu = "0.23.2"
 kotlinx-coroutines = "1.8.0"
 kotlinx-datetime = "0.5.0"