Skip to content

Commit

Permalink
Updated example's versions (#5155)
Browse files Browse the repository at this point in the history
  • Loading branch information
mazunin-v-jb authored Oct 29, 2024
1 parent 7e9832f commit 2f65f0e
Show file tree
Hide file tree
Showing 36 changed files with 73 additions and 71 deletions.
2 changes: 1 addition & 1 deletion ci/compose-uber-jar/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
compose.version=1.6.10
compose.version=1.7.0
kotlin.code.style=official
4 changes: 2 additions & 2 deletions 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.0.0
compose.version=1.6.10
kotlin.version=2.0.20
compose.version=1.7.0
4 changes: 2 additions & 2 deletions 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.0.0
compose.version=1.6.10
kotlin.version=2.0.20
compose.version=1.7.0
6 changes: 3 additions & 3 deletions 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.0.0
agp.version=8.0.2
compose.version=1.6.10
kotlin.version=2.0.20
agp.version=8.1.0
compose.version=1.7.0
6 changes: 3 additions & 3 deletions examples/chat/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=2.0.0
agp.version=8.0.2
compose.version=1.6.10
kotlin.version=2.0.20
agp.version=8.5.0
compose.version=1.7.0
3 changes: 2 additions & 1 deletion examples/chat/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Thu Oct 17 19:55:35 AMT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions examples/cocoapods-ios-example/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ android.minSdk=24
#Compose

#Versions
kotlin.version=2.0.0
agp.version=8.0.2
compose.version=1.6.10
kotlin.version=2.0.20
agp.version=8.5.0
compose.version=1.7.0
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions examples/codeviewer/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=2.0.0
agp.version=8.0.2
compose.version=1.6.10
kotlin.version=2.0.20
agp.version=8.5.0
compose.version=1.7.0
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions examples/graphics-2d/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=2.0.0
agp.version=8.0.2
compose.version=1.6.10
kotlin.version=2.0.20
agp.version=8.5.0
compose.version=1.7.0

# TODO: remove when switching to 1.9.10. See: https://youtrack.jetbrains.com/issue/KT-60852
# usage: ./gradlew :jsApp:jsBrowserRun -Pworkaround.kotlin.js.kt60852=true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions 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.0.0
compose.version=1.6.10
kotlin.version=2.0.20
compose.version=1.7.0
org.gradle.configuration-cache=true
org.gradle.caching=true
4 changes: 2 additions & 2 deletions 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.0.0
compose.version=1.6.10
kotlin.version=2.0.20
compose.version=1.7.0
org.gradle.configuration-cache=true
org.gradle.caching=true
4 changes: 2 additions & 2 deletions 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.0.0
compose.version=1.6.10
kotlin.version=2.0.20
compose.version=1.7.0
org.gradle.configuration-cache=true
org.gradle.caching=true
4 changes: 2 additions & 2 deletions 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.0.0
compose.version=1.6.10
kotlin.version=2.0.20
compose.version=1.7.0
org.gradle.configuration-cache=true
org.gradle.caching=true
6 changes: 3 additions & 3 deletions examples/imageviewer/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ org.gradle.caching=true
org.jetbrains.compose.experimental.jscanvas.enabled=true
org.jetbrains.compose.experimental.macos.enabled=true
org.jetbrains.compose.experimental.wasm.enabled=true
kotlin.version=2.0.0
agp.version=8.0.2
compose.version=1.6.10
kotlin.version=2.0.20
agp.version=8.5.0
compose.version=1.7.0
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions examples/intellij-plugin/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kotlin.code.style=official
kotlin.version=2.0.0
compose.version=1.6.10
kotlin.version=2.0.20
compose.version=1.7.0
org.gradle.configuration-cache=true
org.gradle.caching=true
4 changes: 2 additions & 2 deletions 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.0.0
compose.version=1.6.10
kotlin.version=2.0.20
compose.version=1.7.0
4 changes: 2 additions & 2 deletions examples/interop/ios-compose-in-uikit/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ xcodeproj=./iosApp
org.gradle.jvmargs=-Xmx3g
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=2.0.0
compose.version=1.6.10
kotlin.version=2.0.20
compose.version=1.7.0
4 changes: 2 additions & 2 deletions examples/interop/ios-swiftui-in-compose/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ xcodeproj=./iosApp
org.gradle.jvmargs=-Xmx3g
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=2.0.0
compose.version=1.6.10
kotlin.version=2.0.20
compose.version=1.7.0
4 changes: 2 additions & 2 deletions examples/interop/ios-uikit-in-compose/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ xcodeproj=./iosApp
org.gradle.jvmargs=-Xmx3g
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=2.0.0
compose.version=1.6.10
kotlin.version=2.0.20
compose.version=1.7.0
6 changes: 3 additions & 3 deletions examples/issues/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ kotlin.code.style=official
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
kotlin.version=2.0.0
agp.version=8.0.2
compose.version=1.6.10
kotlin.version=2.0.20
agp.version=8.5.0
compose.version=1.7.0
2 changes: 1 addition & 1 deletion examples/issues/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions examples/jetsnack/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx8g
kotlin.code.style=official
android.useAndroidX=true
agp.version=8.0.2
kotlin.version=2.0.0
compose.version=1.6.10
agp.version=8.5.0
kotlin.version=2.0.20
compose.version=1.7.0
2 changes: 1 addition & 1 deletion examples/jetsnack/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions examples/nav_cupcake/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[versions]
agp = "8.2.0"
agp = "8.5.0"
android-compileSdk = "34"
android-minSdk = "24"
android-targetSdk = "34"
androidx-activity = "1.8.2"
androidx-lifecycle = "2.8.0-rc03"
androidx-navigation = "2.7.0-alpha06"
compose-android = "1.6.7"
compose-multiplatform = "1.6.10"
compose-multiplatform = "1.7.0"
junit = "4.13.2"
kotlin = "2.0.0"
kotlin = "2.0.20"
kotlinx-datetime = "0.6.0"

[libraries]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Thu Oct 17 19:23:28 AMT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions examples/notepad/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official
kotlin.version=2.0.0
compose.version=1.6.10
kotlin.version=2.0.20
compose.version=1.7.0
org.gradle.configuration-cache=true
org.gradle.caching=true
6 changes: 3 additions & 3 deletions examples/todoapp-lite/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=2.0.0
agp.version=8.0.2
compose.version=1.6.10
kotlin.version=2.0.20
agp.version=8.5.0
compose.version=1.7.0
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions examples/widgets-gallery/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=2.0.0
agp.version=8.0.2
kotlin.version=2.0.20
agp.version=8.5.0
# Replace this with release version when it comes out
compose.version=1.6.10
compose.version=1.7.0
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradle-plugins/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ kotlin.code.style=official
dev.junit.parallel=false

# Default version of Compose Libraries used by Gradle plugin
compose.version=1.7.0-alpha03
compose.version=1.7.0
# The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
compose.tests.kotlin.version=2.0.0
# __SUPPORTED_GRADLE_VERSIONS__
Expand Down
4 changes: 2 additions & 2 deletions tutorials/HTML/Getting_Started/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ pluginManagement {
``` kotlin
// Add compose gradle plugin
plugins {
kotlin("multiplatform") version "2.0.0"
id("org.jetbrains.compose") version "1.6.10"
kotlin("multiplatform") version "2.0.20"
id("org.jetbrains.compose") version "1.7.0"
}

// Add maven repositories
Expand Down

0 comments on commit 2f65f0e

Please sign in to comment.