Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ci/templates/desktop-template/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
compose.version=1.10.1
2 changes: 1 addition & 1 deletion ci/templates/html-library-template/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
compose.version=1.10.1
2 changes: 1 addition & 1 deletion ci/templates/maven-test-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kotlin.code.style>official</kotlin.code.style>
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
<kotlin.version>2.3.20</kotlin.version>
<kotlin.version>2.4.0-RC2</kotlin.version>
<compose.version>1.10.1</compose.version>
<compose.material3.version>1.9.0</compose.material3.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion ci/templates/multiplatform-template/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
agp.version=8.9.0
compose.version=1.10.1
2 changes: 1 addition & 1 deletion components/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ org.gradle.configuration-cache=true
android.useAndroidX=true

#Versions
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
agp.version=8.9.0
compose.version=1.10.1
deploy.version=9999.0.0-SNAPSHOT
Expand Down
2 changes: 1 addition & 1 deletion examples/chat/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ org.gradle.jvmargs=-Xmx8g
org.gradle.configuration-cache=true
org.gradle.caching=true
org.jetbrains.compose.experimental.macos.enabled=true
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
agp.version=9.2.1
compose.version=1.10.1
2 changes: 1 addition & 1 deletion examples/codeviewer/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ org.gradle.jvmargs=-Xmx8g
org.gradle.configuration-cache=true
org.gradle.caching=true
org.jetbrains.compose.experimental.macos.enabled=true
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
agp.version=9.2.1
compose.version=1.10.1
2 changes: 1 addition & 1 deletion examples/graphics-2d/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ org.gradle.jvmargs=-Xmx8g
org.gradle.configuration-cache=true
org.gradle.caching=true
org.jetbrains.compose.experimental.macos.enabled=true
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
agp.version=9.2.1
compose.version=1.10.1
2 changes: 1 addition & 1 deletion examples/html/compose-bird/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kotlin.code.style=official
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
compose.version=1.10.1
org.gradle.configuration-cache=true
org.gradle.caching=true
2 changes: 1 addition & 1 deletion examples/html/compose-in-js/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kotlin.code.style=official
kotlin.js.webpack.major.version=4
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
compose.version=1.10.1
org.gradle.configuration-cache=true
org.gradle.caching=true
2 changes: 1 addition & 1 deletion examples/html/landing/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kotlin.code.style=official
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
compose.version=1.10.1
org.gradle.configuration-cache=true
org.gradle.caching=true
2 changes: 1 addition & 1 deletion examples/html/with-react/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kotlin.code.style=official
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
compose.version=1.10.1
org.gradle.configuration-cache=true
org.gradle.caching=true
2 changes: 1 addition & 1 deletion examples/imageviewer/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ org.gradle.configuration-cache=true
org.gradle.caching=true
org.jetbrains.compose.experimental.jscanvas.enabled=true
org.jetbrains.compose.experimental.macos.enabled=true
kotlin.version=2.3.21
kotlin.version=2.4.0-RC2
agp.version=9.2.1
compose.version=1.10.1
2 changes: 1 addition & 1 deletion examples/interop/ios-compose-in-swiftui/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kotlin.code.style=official
xcodeproj=./iosApp
org.gradle.jvmargs=-Xmx3g
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
compose.version=1.10.1
2 changes: 1 addition & 1 deletion examples/interop/ios-compose-in-uikit/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kotlin.code.style=official
xcodeproj=./iosApp
org.gradle.jvmargs=-Xmx3g
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
compose.version=1.10.1
2 changes: 1 addition & 1 deletion examples/interop/ios-swiftui-in-compose/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kotlin.code.style=official
xcodeproj=./iosApp
org.gradle.jvmargs=-Xmx3g
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
compose.version=1.10.1
2 changes: 1 addition & 1 deletion examples/interop/ios-uikit-in-compose/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kotlin.code.style=official
xcodeproj=./iosApp
org.gradle.jvmargs=-Xmx3g
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
compose.version=1.10.1
2 changes: 1 addition & 1 deletion examples/issues/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m
org.gradle.caching=true
kotlin.code.style=official
android.useAndroidX=true
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
agp.version=9.2.1
compose.version=1.10.1
2 changes: 1 addition & 1 deletion examples/nav_cupcake/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ kotlin.code.style=official
android.useAndroidX=true
org.gradle.jvmargs=-Xmx8g
org.gradle.caching=true
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
agp.version=9.2.1
compose.version=1.10.1
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ class GradlePluginTest : GradlePluginTestBase() {
}
}

// Note: we can't test non-jvm targets with Kotlin older than 2.3.0, because of klib abi version bump in 2.3.0
private val oldestSupportedKotlinVersion = "2.3.0"
// Note: we can't test non-jvm targets with Kotlin older than 2.4.0-Beta1, because of klib abi version bump in 2.4.0-Beta1
private val oldestSupportedKotlinVersion = "2.4.0-Beta1"
@Test
fun testOldestKotlinMpp() = with(
testProject(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ plugins {
}

kotlin {
targetHierarchy.default()

android {
namespace = "com.google.samples.apps.diceroller.shared"
compileSdk = 37
Expand Down
2 changes: 1 addition & 1 deletion gradle-plugins/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dev.junit.parallel=false
compose.version=1.10.1
compose.material3.version=1.9.0
# The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
compose.tests.kotlin.version=2.3.20
compose.tests.kotlin.version=2.4.0-RC2
# __SUPPORTED_GRADLE_VERSIONS__
# Don't forget to edit versions in .github/workflows/gradle-plugin.yml as well
# and Publish.Subtasks.buildTypes.gradle.GradlePluginTestKt#gradleVersions in the TC config
Expand Down
2 changes: 1 addition & 1 deletion html/buildSrc/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
kotlin.version=2.3.20
kotlin.version=2.4.0-RC2
2 changes: 1 addition & 1 deletion tutorials/HTML/Getting_Started/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pluginManagement {
``` kotlin
// Add compose gradle plugin
plugins {
kotlin("multiplatform") version "2.3.20"
kotlin("multiplatform") version "2.4.0-RC2"
id("org.jetbrains.compose") version "1.10.1"
}

Expand Down
Loading