Skip to content

Update: CfW is not experimental anymore #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: kotlin-community/k2/dev
Choose a base branch
from
Open

Update: CfW is not experimental anymore #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
574a254
Add language_version option
ilgonmic May 28, 2024
7de433e
Update: CfW is not experimental anymore
eymar May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions composeApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,6 +13,8 @@ plugins {
kotlin("plugin.compose")
}

val language_version: String? = project.properties["language_version"] as String?

kotlin {
androidTarget {
compilations.all {
Expand Down Expand Up @@ -51,6 +54,13 @@ kotlin {
}
}
binaries.executable()
compilations.configureEach {
compileTaskProvider.configure {
language_version?.let {
compilerOptions.languageVersion.set(fromVersion(it))
}
}
}
}

sourceSets {
Expand Down Expand Up @@ -118,8 +128,4 @@ compose.desktop {
packageVersion = "1.0.0"
}
}
}

compose.experimental {
web.application {}
}
6 changes: 1 addition & 5 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -18,4 +14,4 @@ kotlin.mpp.enableCInteropCommonization=true
#Development
development=true

kotlin_version=2.0.0-RC3
kotlin_version=2.0.0
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down