Skip to content

Commit 50b5708

Browse files
eymareymar
authored
Update Kotlin version in components, tutorials and examples to 2.1.0 (#5205)
1 parent 8be4ab8 commit 50b5708

File tree

57 files changed

+1158
-1798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1158
-1798
lines changed

‎ci/compose-uber-jar/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
compose.version=1.7.1
1+
compose.version=1.7.3
22
kotlin.code.style=official

‎ci/templates/desktop-template/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
22
kotlin.code.style=official
3-
kotlin.version=2.0.20
4-
compose.version=1.7.1
3+
kotlin.version=2.1.0
4+
compose.version=1.7.3

‎ci/templates/html-library-template/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
22
kotlin.code.style=official
3-
kotlin.version=2.0.20
4-
compose.version=1.7.1
3+
kotlin.version=2.1.0
4+
compose.version=1.7.3

‎ci/templates/html-library-template/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎ci/templates/multiplatform-template/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
22
android.useAndroidX=true
33
android.enableJetifier=true
44
kotlin.code.style=official
5-
kotlin.version=2.0.20
5+
kotlin.version=2.1.0
66
agp.version=8.1.0
7-
compose.version=1.7.1
7+
compose.version=1.7.3

‎components/AnimatedImage/demo/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
kotlin("multiplatform")
33
id("org.jetbrains.compose")
4+
id("org.jetbrains.kotlin.plugin.compose")
45
}
56

67
kotlin {

‎components/AnimatedImage/library/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
kotlin("multiplatform")
33
id("org.jetbrains.compose")
4+
id("org.jetbrains.kotlin.plugin.compose")
45
id("maven-publish")
56
}
67

‎components/SplitPane/demo/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
kotlin("multiplatform")
33
id("org.jetbrains.compose")
4+
id("org.jetbrains.kotlin.plugin.compose")
45
}
56

67
kotlin {

‎components/SplitPane/library/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
kotlin("multiplatform")
33
id("org.jetbrains.compose")
4+
id("org.jetbrains.kotlin.plugin.compose")
45
id("maven-publish")
56
}
67

‎components/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ org.gradle.configuration-cache=true
77
android.useAndroidX=true
88

99
#Versions
10-
kotlin.version=1.9.24
10+
kotlin.version=2.1.0
1111
agp.version=8.2.2
1212
compose.version=1.8.0-alpha01
1313
deploy.version=0.1.0-SNAPSHOT

‎components/resources/demo/androidApp/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
id("com.android.application")
33
kotlin("android")
44
id("org.jetbrains.compose")
5+
id("org.jetbrains.kotlin.plugin.compose")
56
}
67

78
android {

‎components/resources/demo/desktopApp/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
kotlin("multiplatform")
33
id("org.jetbrains.compose")
4+
id("org.jetbrains.kotlin.plugin.compose")
45
}
56

67
kotlin {

‎components/resources/demo/shared/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
kotlin("multiplatform")
55
id("com.android.library")
66
id("org.jetbrains.compose")
7+
id("org.jetbrains.kotlin.plugin.compose")
78
}
89

910
kotlin {

‎components/resources/library/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
55
plugins {
66
kotlin("multiplatform")
77
id("org.jetbrains.compose")
8+
id("org.jetbrains.kotlin.plugin.compose")
89
id("maven-publish")
910
id("com.android.library")
1011
id("org.jetbrains.kotlinx.binary-compatibility-validator")

‎components/settings.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ pluginManagement {
1212
plugins {
1313
kotlin("jvm").version(extra["kotlin.version"] as String)
1414
kotlin("multiplatform").version(extra["kotlin.version"] as String)
15+
id("org.jetbrains.kotlin.plugin.compose").version(extra["kotlin.version"] as String)
1516
id("org.jetbrains.compose").version(extra["compose.version"] as String)
1617
id("com.android.library").version(extra["agp.version"] as String)
17-
id("org.jetbrains.kotlinx.binary-compatibility-validator").version("0.15.0-Beta.2")
18+
id("org.jetbrains.kotlinx.binary-compatibility-validator").version("0.17.0")
1819
}
1920

2021
val gradlePluginDir = rootDir.resolve("../gradle-plugins")

‎components/ui-tooling-preview/demo/desktopApp/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
kotlin("multiplatform")
33
id("org.jetbrains.compose")
4+
id("org.jetbrains.kotlin.plugin.compose")
45
}
56

67
kotlin {

‎components/ui-tooling-preview/demo/shared/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
kotlin("multiplatform")
33
id("com.android.library")
44
id("org.jetbrains.compose")
5+
id("org.jetbrains.kotlin.plugin.compose")
56
}
67

78
kotlin {

‎examples/chat/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true
1010
kotlin.mpp.androidSourceSetLayoutVersion=2
1111
# Enable kotlin/native experimental memory model
1212
kotlin.native.binary.memoryModel=experimental
13-
kotlin.version=2.0.20
13+
kotlin.version=2.1.0
1414
agp.version=8.5.0
15-
compose.version=1.7.1
15+
compose.version=1.7.3

‎examples/cocoapods-ios-example/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ android.minSdk=24
2020
#Compose
2121

2222
#Versions
23-
kotlin.version=2.0.20
23+
kotlin.version=2.1.0
2424
agp.version=8.5.0
25-
compose.version=1.7.1
25+
compose.version=1.7.3

‎examples/codeviewer/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true
1010
kotlin.mpp.androidSourceSetLayoutVersion=2
1111
# Enable kotlin/native experimental memory model
1212
kotlin.native.binary.memoryModel=experimental
13-
kotlin.version=2.0.20
13+
kotlin.version=2.1.0
1414
agp.version=8.5.0
15-
compose.version=1.7.1
15+
compose.version=1.7.3

‎examples/graphics-2d/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ kotlin.native.useEmbeddableCompilerJar=true
1010
kotlin.mpp.androidSourceSetLayoutVersion=2
1111
# Enable kotlin/native experimental memory model
1212
kotlin.native.binary.memoryModel=experimental
13-
kotlin.version=2.0.20
13+
kotlin.version=2.1.0
1414
agp.version=8.5.0
15-
compose.version=1.7.1
15+
compose.version=1.7.3
1616

1717
# TODO: remove when switching to 1.9.10. See: https://youtrack.jetbrains.com/issue/KT-60852
1818
# usage: ./gradlew :jsApp:jsBrowserRun -Pworkaround.kotlin.js.kt60852=true

‎examples/html/compose-bird/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ kotlin {
2525
dependencies {
2626
implementation(compose.html.core)
2727
implementation(compose.runtime)
28-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0-RC")
28+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
2929
}
3030
}
3131
}

‎examples/html/compose-bird/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kotlin.code.style=official
2-
kotlin.version=2.0.20
3-
compose.version=1.7.1
2+
kotlin.version=2.1.0
3+
compose.version=1.7.3
44
org.gradle.configuration-cache=true
55
org.gradle.caching=true

‎examples/html/compose-in-js/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
kotlin.code.style=official
22
kotlin.js.webpack.major.version=4
3-
kotlin.version=2.0.20
4-
compose.version=1.7.1
3+
kotlin.version=2.1.0
4+
compose.version=1.7.3
55
org.gradle.configuration-cache=true
66
org.gradle.caching=true

‎examples/html/landing/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kotlin.code.style=official
2-
kotlin.version=2.0.20
3-
compose.version=1.7.1
2+
kotlin.version=2.1.0
3+
compose.version=1.7.3
44
org.gradle.configuration-cache=true
55
org.gradle.caching=true

‎examples/html/with-react/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kotlin.code.style=official
2-
kotlin.version=2.0.20
3-
compose.version=1.7.1
2+
kotlin.version=2.1.0
3+
compose.version=1.7.3
44
org.gradle.configuration-cache=true
55
org.gradle.caching=true

‎examples/imageviewer/gradle.properties

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ org.gradle.configuration-cache=true
77
org.gradle.caching=true
88
org.jetbrains.compose.experimental.jscanvas.enabled=true
99
org.jetbrains.compose.experimental.macos.enabled=true
10-
org.jetbrains.compose.experimental.wasm.enabled=true
11-
kotlin.version=2.0.20
10+
kotlin.version=2.1.0
1211
agp.version=8.5.0
13-
compose.version=1.7.1
12+
compose.version=1.7.3

0 commit comments

Comments
 (0)