Browse Source

Update versions to CM 1.5.1 and kotlin 1.9.10

pull/3631/head
oleksandr.karpovich 1 year ago
parent
commit
178d2fb59d
  1. 1
      VERSIONING.md
  2. 2
      ci/compose-uber-jar/gradle.properties
  3. 4
      ci/templates/desktop-template/gradle.properties
  4. 4
      ci/templates/html-library-template/gradle.properties
  5. 4
      ci/templates/multiplatform-template/gradle.properties
  6. 6
      compose/integrations/composable-test-cases/gradle.properties
  7. 4
      examples/chat/gradle.properties
  8. 4
      examples/cocoapods-ios-example/gradle.properties
  9. 4
      examples/codeviewer/gradle.properties
  10. 4
      examples/falling-balls/gradle.properties
  11. 4
      examples/html/compose-bird/gradle.properties
  12. 4
      examples/html/compose-in-js/gradle.properties
  13. 4
      examples/html/landing/gradle.properties
  14. 4
      examples/html/with-react/gradle.properties
  15. 4
      examples/imageviewer/gradle.properties
  16. 4
      examples/intellij-plugin/gradle.properties
  17. 4
      examples/interop/ios-compose-in-swiftui/gradle.properties
  18. 4
      examples/interop/ios-compose-in-uikit/gradle.properties
  19. 4
      examples/interop/ios-swiftui-in-compose/gradle.properties
  20. 4
      examples/interop/ios-uikit-in-compose/gradle.properties
  21. 4
      examples/issues/gradle.properties
  22. 4
      examples/minesweeper/gradle.properties
  23. 4
      examples/notepad/gradle.properties
  24. 4
      examples/todoapp-lite/gradle.properties
  25. 4
      examples/visual-effects/gradle.properties
  26. 4
      examples/widgets-gallery/gradle.properties
  27. 2
      gradle-plugins/gradle.properties
  28. 2
      html/buildSrc/gradle.properties
  29. 2
      html/gradle.properties
  30. 4
      tutorials/HTML/Getting_Started/README.md

1
VERSIONING.md

@ -40,6 +40,7 @@ Kotlin version | Minimal Compose version | Notes
1.8.21 | 1.4.3 1.8.21 | 1.4.3
1.8.22 | 1.4.3 1.8.22 | 1.4.3
1.9.0 | 1.4.3 1.9.0 | 1.4.3
1.9.10 | 1.5.1
### Using the latest Kotlin version ### Using the latest Kotlin version

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

@ -1,2 +1,2 @@
compose.version=1.5.0 compose.version=1.5.1
kotlin.code.style=official kotlin.code.style=official

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

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.9.0 kotlin.version=1.9.10
compose.version=1.5.0 compose.version=1.5.1

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

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.9.0 kotlin.version=1.9.10
compose.version=1.5.0 compose.version=1.5.1

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

@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.9.0 kotlin.version=1.9.10
agp.version=7.1.3 agp.version=7.1.3
compose.version=1.5.0 compose.version=1.5.1

6
compose/integrations/composable-test-cases/gradle.properties

@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx2048M -XX:MaxMetaspaceSize=512m
kotlin.code.style=official kotlin.code.style=official
kotlin.native.enableDependencyPropagation=false kotlin.native.enableDependencyPropagation=false
android.useAndroidX=true android.useAndroidX=true
kotlin.version=1.9.0 kotlin.version=1.9.10
agp.version=7.3.0 agp.version=7.3.0
compose.version=1.5.0-beta02 compose.version=1.5.1
kotlin.native.cacheKind=none kotlin.native.cacheKind=none
#empty by default - a default version will be used #empty by default - a default version will be used
compose.kotlinCompilerPluginVersion=1.5.0 compose.kotlinCompilerPluginVersion=1.5.2
# default|failingJs - see enum class CasesToRun # default|failingJs - see enum class CasesToRun
tests.casesToRun=default tests.casesToRun=default

4
examples/chat/gradle.properties

@ -9,6 +9,6 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model # Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0 kotlin.version=1.9.10
agp.version=8.0.2 agp.version=8.0.2
compose.version=1.5.0 compose.version=1.5.1

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

@ -19,6 +19,6 @@ android.minSdk=24
org.jetbrains.compose.experimental.uikit.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true
#Versions #Versions
kotlin.version=1.9.0 kotlin.version=1.9.10
agp.version=8.0.2 agp.version=8.0.2
compose.version=1.5.0 compose.version=1.5.1

4
examples/codeviewer/gradle.properties

@ -9,6 +9,6 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model # Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0 kotlin.version=1.9.10
agp.version=8.0.2 agp.version=8.0.2
compose.version=1.5.0 compose.version=1.5.1

4
examples/falling-balls/gradle.properties

@ -9,9 +9,9 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model # Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0 kotlin.version=1.9.10
agp.version=8.0.2 agp.version=8.0.2
compose.version=1.5.0 compose.version=1.5.1
# TODO: remove when switching to 1.9.10. See: https://youtrack.jetbrains.com/issue/KT-60852 # 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 # usage: ./gradlew :jsApp:jsBrowserRun -Pworkaround.kotlin.js.kt60852=true

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

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.9.0 kotlin.version=1.9.10
compose.version=1.5.0 compose.version=1.5.1

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

@ -2,5 +2,5 @@ kotlin.code.style=official
kotlin.mpp.enableGranularSourceSetsMetadata=true kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.native.enableDependencyPropagation=false kotlin.native.enableDependencyPropagation=false
kotlin.js.webpack.major.version=4 kotlin.js.webpack.major.version=4
kotlin.version=1.9.0 kotlin.version=1.9.10
compose.version=1.5.0 compose.version=1.5.1

4
examples/html/landing/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.9.0 kotlin.version=1.9.10
compose.version=1.5.0 compose.version=1.5.1

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

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.9.0 kotlin.version=1.9.10
compose.version=1.5.0 compose.version=1.5.1

4
examples/imageviewer/gradle.properties

@ -9,6 +9,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.native.useEmbeddableCompilerJar=true kotlin.native.useEmbeddableCompilerJar=true
# Enable kotlin/native experimental memory model # Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0 kotlin.version=1.9.10
agp.version=8.0.2 agp.version=8.0.2
compose.version=1.5.0 compose.version=1.5.1

4
examples/intellij-plugin/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.9.0 kotlin.version=1.9.10
compose.version=1.5.0 compose.version=1.5.1

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

@ -2,5 +2,5 @@ kotlin.code.style=official
xcodeproj=./iosApp xcodeproj=./iosApp
org.gradle.jvmargs=-Xmx3g org.gradle.jvmargs=-Xmx3g
org.jetbrains.compose.experimental.uikit.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true
kotlin.version=1.9.0 kotlin.version=1.9.10
compose.version=1.5.0 compose.version=1.5.1

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

@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx3g
org.jetbrains.compose.experimental.uikit.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true
# Enable kotlin/native experimental memory model # Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0 kotlin.version=1.9.10
compose.version=1.5.0 compose.version=1.5.1

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

@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx3g
org.jetbrains.compose.experimental.uikit.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true
# Enable kotlin/native experimental memory model # Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0 kotlin.version=1.9.10
compose.version=1.5.0 compose.version=1.5.1

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

@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx3g
org.jetbrains.compose.experimental.uikit.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true
# Enable kotlin/native experimental memory model # Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0 kotlin.version=1.9.10
compose.version=1.5.0 compose.version=1.5.1

4
examples/issues/gradle.properties

@ -19,6 +19,6 @@ kotlin.code.style=official
android.useAndroidX=true android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX # Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true android.enableJetifier=true
kotlin.version=1.9.0 kotlin.version=1.9.10
agp.version=8.0.2 agp.version=8.0.2
compose.version=1.5.0 compose.version=1.5.1

4
examples/minesweeper/gradle.properties

@ -9,9 +9,9 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model # Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0 kotlin.version=1.9.10
agp.version=8.0.2 agp.version=8.0.2
compose.version=1.5.0 compose.version=1.5.1
# TODO: remove when switching to 1.9.10. See: https://youtrack.jetbrains.com/issue/KT-60852 # 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 # usage: ./gradlew :jsApp:jsBrowserRun -Pworkaround.kotlin.js.kt60852=true

4
examples/notepad/gradle.properties

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.9.0 kotlin.version=1.9.10
compose.version=1.5.0 compose.version=1.5.1

4
examples/todoapp-lite/gradle.properties

@ -9,6 +9,6 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model # Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0 kotlin.version=1.9.10
agp.version=8.0.2 agp.version=8.0.2
compose.version=1.5.0 compose.version=1.5.1

4
examples/visual-effects/gradle.properties

@ -9,6 +9,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.native.useEmbeddableCompilerJar=true kotlin.native.useEmbeddableCompilerJar=true
# Enable kotlin/native experimental memory model # Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0 kotlin.version=1.9.10
agp.version=8.0.2 agp.version=8.0.2
compose.version=1.5.0 compose.version=1.5.1

4
examples/widgets-gallery/gradle.properties

@ -9,6 +9,6 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model # Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0 kotlin.version=1.9.10
agp.version=8.0.2 agp.version=8.0.2
compose.version=1.5.0 compose.version=1.5.1

2
gradle-plugins/gradle.properties

@ -2,7 +2,7 @@ org.gradle.parallel=true
kotlin.code.style=official kotlin.code.style=official
# Default version of Compose Libraries used by Gradle plugin # Default version of Compose Libraries used by Gradle plugin
compose.version=1.5.0 compose.version=1.5.1
# The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI. # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI.
compose.tests.compiler.version=1.5.2 compose.tests.compiler.version=1.5.2
# The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI. # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.

2
html/buildSrc/gradle.properties

@ -1 +1 @@
kotlin.version=1.8.21 kotlin.version=1.9.10

2
html/gradle.properties

@ -1,4 +1,4 @@
compose.version=1.5.0-dev1107 compose.version=1.5.1
compose.web.buildSamples=false compose.web.buildSamples=false
compose.web.tests.integration.withFirefox compose.web.tests.integration.withFirefox
compose.web.tests.skip.benchmarks=false compose.web.tests.skip.benchmarks=false

4
tutorials/HTML/Getting_Started/README.md

@ -36,8 +36,8 @@ pluginManagement {
``` kotlin ``` kotlin
// Add compose gradle plugin // Add compose gradle plugin
plugins { plugins {
kotlin("multiplatform") version "1.9.0" kotlin("multiplatform") version "1.9.10"
id("org.jetbrains.compose") version "1.5.0" id("org.jetbrains.compose") version "1.5.1"
} }
// Add maven repositories // Add maven repositories

Loading…
Cancel
Save