From 574a254f39a9e5c053a083bebf5791cd4c550d90 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Tue, 28 May 2024 16:15:45 +0200
Subject: [PATCH 1/2] Add language_version option

---
 composeApp/build.gradle.kts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index 7ec0390..48b7cfe 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -1,6 +1,7 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion.Companion.fromVersion
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
@@ -12,6 +13,8 @@ plugins {
     kotlin("plugin.compose")
 }
 
+val language_version: String? = project.properties["language_version"] as String?
+
 kotlin {
     androidTarget {
         compilations.all {
@@ -51,6 +54,13 @@ kotlin {
             }
         }
         binaries.executable()
+        compilations.configureEach {
+            compileTaskProvider.configure {
+                language_version?.let {
+                    compilerOptions.languageVersion.set(fromVersion(it))
+                }
+            }
+        }
     }
 
     sourceSets {

From 7de433e87cc701391b2435d781ebc66eabb5f810 Mon Sep 17 00:00:00 2001
From: "Oleksandr.Karpovich" <a.n.karpovich@gmail.com>
Date: Fri, 31 May 2024 12:18:32 +0200
Subject: [PATCH 2/2] Update: CfW is not experimental anymore

---
 composeApp/build.gradle.kts | 4 ----
 gradle.properties           | 6 +-----
 gradle/libs.versions.toml   | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index 48b7cfe..a993f4f 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -128,8 +128,4 @@ compose.desktop {
             packageVersion = "1.0.0"
         }
     }
-}
-
-compose.experimental {
-    web.application {}
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index fc74e4d..f1593ae 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,10 +3,6 @@ kotlin.code.style=official
 #Gradle
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 
-
-#Compose for Web is Experimental
-org.jetbrains.compose.experimental.wasm.enabled=true
-
 #Android
 android.useAndroidX=true
 android.nonTransitiveRClass=true
@@ -18,4 +14,4 @@ kotlin.mpp.enableCInteropCommonization=true
 #Development
 development=true
 
-kotlin_version=2.0.0-RC3
\ No newline at end of file
+kotlin_version=2.0.0
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a4cc09c..0e265f6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 compose = "1.5.4"
-compose-plugin = "1.6.10-rc03"
+compose-plugin = "1.6.10"
 agp = "8.1.4"
 android-minSdk = "24"
 android-compileSdk = "34"