Browse Source

Update samples to Compose 1.8 (#5313)

This PR only updates Compose and Kotlin versions.
I'm going to follow it up with further updates addressing various
warnings.

## Testing
`./validateExamples.sh`, `./validateExamplesIos.sh`, and
`./validateExamplesWithJs.sh`

## Release Notes
N/A
pull/5318/head
Victor Kropp 7 months ago committed by GitHub
parent
commit
99c2fd66ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      ci/compose-uber-jar/gradle.properties
  2. 4
      ci/templates/desktop-template/gradle.properties
  3. 4
      ci/templates/html-library-template/gradle.properties
  4. 4
      ci/templates/maven-test-project/pom.xml
  5. 4
      ci/templates/multiplatform-template/gradle.properties
  6. 4
      examples/chat/gradle.properties
  7. 4
      examples/cocoapods-ios-example/gradle.properties
  8. 4
      examples/codeviewer/gradle.properties
  9. 4
      examples/graphics-2d/gradle.properties
  10. 4
      examples/html/compose-bird/gradle.properties
  11. 4
      examples/html/compose-in-js/gradle.properties
  12. 4
      examples/html/landing/gradle.properties
  13. 4
      examples/html/with-react/gradle.properties
  14. 4
      examples/imageviewer/gradle.properties
  15. 4
      examples/intellij-plugin/gradle.properties
  16. 4
      examples/interop/ios-compose-in-swiftui/gradle.properties
  17. 4
      examples/interop/ios-compose-in-uikit/gradle.properties
  18. 4
      examples/interop/ios-swiftui-in-compose/gradle.properties
  19. 4
      examples/interop/ios-uikit-in-compose/gradle.properties
  20. 4
      examples/issues/gradle.properties
  21. 2
      examples/jetsnack/gradle.properties
  22. 4
      examples/notepad/gradle.properties
  23. 4
      examples/todoapp-lite/gradle.properties
  24. 4
      examples/widgets-gallery/gradle.properties
  25. 4
      tutorials/HTML/Getting_Started/README.md

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

@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
compose.version=1.7.3
compose.version=1.8.0
kotlin.code.style=official

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

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official
kotlin.version=2.1.0
compose.version=1.7.3
kotlin.version=2.1.20
compose.version=1.8.0

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

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official
kotlin.version=2.1.0
compose.version=1.7.3
kotlin.version=2.1.20
compose.version=1.8.0

4
ci/templates/maven-test-project/pom.xml

@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
<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.1.0</kotlin.version>
<compose.version>1.8.0-alpha02</compose.version>
<kotlin.version>2.1.20</kotlin.version>
<compose.version>1.8.0</compose.version>
</properties>
<repositories>

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

@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 @@ -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.1.0
kotlin.version=2.1.20
agp.version=8.1.0
compose.version=1.7.3
compose.version=1.8.0

4
examples/chat/gradle.properties

@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true @@ -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.1.0
kotlin.version=2.1.20
agp.version=8.5.0
compose.version=1.7.3
compose.version=1.8.0

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

@ -20,6 +20,6 @@ android.minSdk=24 @@ -20,6 +20,6 @@ android.minSdk=24
#Compose
#Versions
kotlin.version=2.1.0
kotlin.version=2.1.20
agp.version=8.5.0
compose.version=1.7.3
compose.version=1.8.0

4
examples/codeviewer/gradle.properties

@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true @@ -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.1.0
kotlin.version=2.1.20
agp.version=8.5.0
compose.version=1.7.3
compose.version=1.8.0

4
examples/graphics-2d/gradle.properties

@ -10,9 +10,9 @@ kotlin.native.useEmbeddableCompilerJar=true @@ -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.1.0
kotlin.version=2.1.20
agp.version=8.5.0
compose.version=1.7.3
compose.version=1.8.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

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
kotlin.code.style=official
kotlin.version=2.1.0
compose.version=1.7.3
kotlin.version=2.1.20
compose.version=1.8.0
org.gradle.configuration-cache=true
org.gradle.caching=true

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

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
kotlin.code.style=official
kotlin.js.webpack.major.version=4
kotlin.version=2.1.0
compose.version=1.7.3
kotlin.version=2.1.20
compose.version=1.8.0
org.gradle.configuration-cache=true
org.gradle.caching=true

4
examples/html/landing/gradle.properties

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
kotlin.code.style=official
kotlin.version=2.1.0
compose.version=1.7.3
kotlin.version=2.1.20
compose.version=1.8.0
org.gradle.configuration-cache=true
org.gradle.caching=true

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
kotlin.code.style=official
kotlin.version=2.1.0
compose.version=1.7.3
kotlin.version=2.1.20
compose.version=1.8.0
org.gradle.configuration-cache=true
org.gradle.caching=true

4
examples/imageviewer/gradle.properties

@ -7,6 +7,6 @@ org.gradle.configuration-cache=true @@ -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.1.0
kotlin.version=2.1.20
agp.version=8.5.0
compose.version=1.7.3
compose.version=1.8.0

4
examples/intellij-plugin/gradle.properties

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
kotlin.code.style=official
kotlin.version=2.1.0
compose.version=1.7.3
kotlin.version=2.1.20
compose.version=1.8.0
org.gradle.configuration-cache=true
org.gradle.caching=true

4
examples/interop/ios-compose-in-swiftui/gradle.properties

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
kotlin.code.style=official
xcodeproj=./iosApp
org.gradle.jvmargs=-Xmx3g
kotlin.version=2.1.0
compose.version=1.7.3
kotlin.version=2.1.20
compose.version=1.8.0

4
examples/interop/ios-compose-in-uikit/gradle.properties

@ -3,5 +3,5 @@ xcodeproj=./iosApp @@ -3,5 +3,5 @@ xcodeproj=./iosApp
org.gradle.jvmargs=-Xmx3g
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=2.1.0
compose.version=1.7.3
kotlin.version=2.1.20
compose.version=1.8.0

4
examples/interop/ios-swiftui-in-compose/gradle.properties

@ -3,5 +3,5 @@ xcodeproj=./iosApp @@ -3,5 +3,5 @@ xcodeproj=./iosApp
org.gradle.jvmargs=-Xmx3g
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=2.1.0
compose.version=1.7.3
kotlin.version=2.1.20
compose.version=1.8.0

4
examples/interop/ios-uikit-in-compose/gradle.properties

@ -3,5 +3,5 @@ xcodeproj=./iosApp @@ -3,5 +3,5 @@ xcodeproj=./iosApp
org.gradle.jvmargs=-Xmx3g
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=2.1.0
compose.version=1.7.3
kotlin.version=2.1.20
compose.version=1.8.0

4
examples/issues/gradle.properties

@ -19,6 +19,6 @@ kotlin.code.style=official @@ -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.1.0
kotlin.version=2.1.20
agp.version=8.5.0
compose.version=1.7.3
compose.version=1.8.0

2
examples/jetsnack/gradle.properties

@ -3,4 +3,4 @@ kotlin.code.style=official @@ -3,4 +3,4 @@ kotlin.code.style=official
android.useAndroidX=true
agp.version=8.5.0
kotlin.version=2.1.20
compose.version=1.7.3
compose.version=1.8.0

4
examples/notepad/gradle.properties

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official
kotlin.version=2.1.0
compose.version=1.7.3
kotlin.version=2.1.20
compose.version=1.8.0
org.gradle.configuration-cache=true
org.gradle.caching=true

4
examples/todoapp-lite/gradle.properties

@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true @@ -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.1.0
kotlin.version=2.1.20
agp.version=8.5.0
compose.version=1.7.3
compose.version=1.8.0

4
examples/widgets-gallery/gradle.properties

@ -10,7 +10,7 @@ kotlin.native.useEmbeddableCompilerJar=true @@ -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.1.0
kotlin.version=2.1.20
agp.version=8.5.0
# Replace this with release version when it comes out
compose.version=1.7.3
compose.version=1.8.0

4
tutorials/HTML/Getting_Started/README.md

@ -36,8 +36,8 @@ pluginManagement { @@ -36,8 +36,8 @@ pluginManagement {
``` kotlin
// Add compose gradle plugin
plugins {
kotlin("multiplatform") version "2.1.0"
id("org.jetbrains.compose") version "1.7.3"
kotlin("multiplatform") version "2.1.20"
id("org.jetbrains.compose") version "1.8.0"
}
// Add maven repositories

Loading…
Cancel
Save