Browse Source

Update all versions for 1.3.1 + update Changelog (#2856)

* Add changes for 1.3.1 + update Changelog

Versions:
compose 1.3.1
kotlin 1.8.10
compiler: 1.4.2

* revert version update in experimental examples

* Update CHANGELOG.md
pull/2884/head
Oleksandr Karpovich 2 years ago committed by GitHub
parent
commit
0b429b6ac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 28
      CHANGELOG.md
  2. 5
      VERSIONING.md
  3. 2
      ci/compose-uber-jar/gradle.properties
  4. 4
      components/gradle.properties
  5. 4
      compose/integrations/composable-test-cases/gradle.properties
  6. 4
      compose/integrations/compose-with-ktx-serialization/gradle.properties
  7. 4
      examples/codeviewer/gradle.properties
  8. 4
      examples/falling-balls/gradle.properties
  9. 4
      examples/imageviewer/gradle.properties
  10. 4
      examples/intellij-plugin/gradle.properties
  11. 4
      examples/issues/gradle.properties
  12. 4
      examples/notepad/gradle.properties
  13. 4
      examples/todoapp-lite/gradle.properties
  14. 4
      examples/todoapp/gradle.properties
  15. 4
      examples/visual-effects/gradle.properties
  16. 4
      examples/web-compose-bird/gradle.properties
  17. 4
      examples/web-compose-in-js/gradle.properties
  18. 4
      examples/web-landing/gradle.properties
  19. 4
      examples/web-with-react/gradle.properties
  20. 4
      examples/widgets-gallery/gradle.properties
  21. 3
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt
  22. 8
      gradle-plugins/gradle.properties
  23. 4
      templates/desktop-template/gradle.properties
  24. 4
      templates/multiplatform-template/gradle.properties
  25. 4
      templates/web-template/gradle.properties
  26. 4
      tools/replaceVersion.sh
  27. 8
      tutorials/Getting_Started/README.md
  28. 4
      tutorials/Web/Getting_Started/README.md
  29. 2
      web/buildSrc/gradle.properties
  30. 2
      web/gradle.properties

28
CHANGELOG.md

@ -1,3 +1,31 @@
# 1.3.1 (March 2023)
## Common
- Added support for Kotlin 1.8.10
### Fixes
- [Layout in movableContent](https://github.com/JetBrains/compose-multiplatform-core/pull/413)
- [Unzip wix to build directory](https://github.com/JetBrains/compose-multiplatform/pull/2838)
## Desktop
### Fixes
- [Korean text input](https://github.com/JetBrains/compose-multiplatform-core/pull/406)
- [Size UndecoratedWindowResizer to the size of the window](https://github.com/JetBrains/compose-multiplatform-core/pull/388)
- [Fix sizing a window with unspecified size to its content's size](https://github.com/JetBrains/compose-multiplatform-core/pull/401)
## Dependencies
This version of Compose Multiplatform is based on the next Jetpack Compose libraries:
- [Compiler 1.4.2](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.4.2)
- [Runtime 1.3.3](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.3.3)
- [UI 1.3.3](https://developer.android.com/jetpack/androidx/releases/compose-ui#1.3.3)
- [Foundation 1.3.1](https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.3.1)
- [Material 1.3.1](https://developer.android.com/jetpack/androidx/releases/compose-material#1.3.1)
- [Material3 1.0.1](https://developer.android.com/jetpack/androidx/releases/compose-material3#1.0.1)
___
# 1.3.0 (January 2023) # 1.3.0 (January 2023)
## Common ## Common

5
VERSIONING.md

@ -33,6 +33,7 @@ Kotlin version | Minimal Compose version | Notes
1.7.20 | 1.2.0 | JS is not supported (fixed in the 1.2.1) 1.7.20 | 1.2.0 | JS is not supported (fixed in the 1.2.1)
1.7.20 | 1.2.1 1.7.20 | 1.2.1
1.8.0 | 1.3.0 | 1.3.0 is not supported by earlier k/native versions 1.8.0 | 1.3.0 | 1.3.0 is not supported by earlier k/native versions
1.8.10 | 1.3.1
### Using the latest Kotlin version ### Using the latest Kotlin version
@ -45,10 +46,10 @@ The compilation process of composable functions is handled by the Compose compil
First, check [this page](https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility) to find a compatible version. If there is one, use it this way: First, check [this page](https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility) to find a compatible version. If there is one, use it this way:
``` ```
compose { compose {
kotlinCompilerPlugin.set("androidx.compose.compiler:compiler:1.4.0") kotlinCompilerPlugin.set("androidx.compose.compiler:compiler:1.4.2")
} }
``` ```
(`1.4.0` corresponds Kotlin 1.8.0) (`1.4.2` corresponds Kotlin 1.8.10)
#### Disabling Kotlin compatibility check #### Disabling Kotlin compatibility check

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

@ -1,2 +1,2 @@
compose.version=1.3.0 compose.version=1.3.1
kotlin.code.style=official kotlin.code.style=official

4
components/gradle.properties

@ -3,9 +3,9 @@ android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
kotlin.code.style=official kotlin.code.style=official
# __KOTLIN_COMPOSE_VERSION__ # __KOTLIN_COMPOSE_VERSION__
kotlin.version=1.8.0 kotlin.version=1.8.10
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=1.3.0 compose.version=1.3.1
agp.version=7.3.1 agp.version=7.3.1
org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.jscanvas.enabled=true
org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.macos.enabled=true

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

@ -4,11 +4,11 @@ kotlin.native.enableDependencyPropagation=false
android.useAndroidX=true android.useAndroidX=true
kotlin.version=1.8.10 kotlin.version=1.8.10
agp.version=7.3.0 agp.version=7.3.0
compose.version=1.3.0 compose.version=1.3.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.4.2-rc03 compose.kotlinCompilerPluginVersion=1.4.2
# default|failingJs - see enum class CasesToRun # default|failingJs - see enum class CasesToRun
tests.casesToRun=default tests.casesToRun=default

4
compose/integrations/compose-with-ktx-serialization/gradle.properties

@ -1,9 +1,9 @@
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.8.0 kotlin.version=1.8.10
agp.version=7.3.0 agp.version=7.3.0
compose.version=1.3.0-rc02 compose.version=1.3.1
org.jetbrains.compose.experimental.uikit.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true
org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.jscanvas.enabled=true
org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.macos.enabled=true

4
examples/codeviewer/gradle.properties

@ -19,6 +19,6 @@ android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete": # Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.8.0 kotlin.version=1.8.10
agp.version=7.1.3 agp.version=7.1.3
compose.version=1.3.0 compose.version=1.3.1

4
examples/falling-balls/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.8.0 kotlin.version=1.8.10
compose.version=1.3.0 compose.version=1.3.1

4
examples/imageviewer/gradle.properties

@ -19,6 +19,6 @@ android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete": # Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.8.0 kotlin.version=1.8.10
agp.version=7.1.3 agp.version=7.1.3
compose.version=1.3.0 compose.version=1.3.1

4
examples/intellij-plugin/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.8.0 kotlin.version=1.8.10
compose.version=1.3.0 compose.version=1.3.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.8.0 kotlin.version=1.8.10
agp.version=7.1.3 agp.version=7.1.3
compose.version=1.3.0 compose.version=1.3.1

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.8.0 kotlin.version=1.8.10
compose.version=1.3.0 compose.version=1.3.1

4
examples/todoapp-lite/gradle.properties

@ -19,6 +19,6 @@ android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete": # Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.8.0 kotlin.version=1.8.10
agp.version=7.1.3 agp.version=7.1.3
compose.version=1.3.0 compose.version=1.3.1

4
examples/todoapp/gradle.properties

@ -27,5 +27,5 @@ kotlin.native.disableCompilerDaemon=true
# After updating Compose Multiplatform version, update corresponding Jetpack Compose versions # After updating Compose Multiplatform version, update corresponding Jetpack Compose versions
# in Android module (search "Workaround for https://github.com/JetBrains/compose-jb/issues/2340") # in Android module (search "Workaround for https://github.com/JetBrains/compose-jb/issues/2340")
#TODO also change version in buildSrc/gradle.properties #TODO also change version in buildSrc/gradle.properties
kotlin.version=1.8.0 kotlin.version=1.8.10
compose.version=1.3.0 compose.version=1.3.1

4
examples/visual-effects/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.8.0 kotlin.version=1.8.10
compose.version=1.3.0 compose.version=1.3.1

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

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.8.0 kotlin.version=1.8.10
compose.version=1.3.0 compose.version=1.3.1

4
examples/web-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.8.0 kotlin.version=1.8.10
compose.version=1.3.0 compose.version=1.3.1

4
examples/web-landing/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.8.0 kotlin.version=1.8.10
compose.version=1.3.0 compose.version=1.3.1

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

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.8.0 kotlin.version=1.8.10
compose.version=1.3.0 compose.version=1.3.1

4
examples/widgets-gallery/gradle.properties

@ -19,6 +19,6 @@ android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete": # Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.8.0 kotlin.version=1.8.10
compose.version=1.3.0 compose.version=1.3.1
agp.version=7.1.3 agp.version=7.1.3

3
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt

@ -7,7 +7,8 @@ internal object ComposeCompilerCompatibility {
private val kotlinToCompiler = sortedMapOf( private val kotlinToCompiler = sortedMapOf(
"1.7.10" to "1.3.0", "1.7.10" to "1.3.0",
"1.7.20" to "1.3.2.2", "1.7.20" to "1.3.2.2",
"1.8.0" to "1.4.0" "1.8.0" to "1.4.0",
"1.8.10" to "1.4.2",
) )
fun compilerVersionFor(kotlinVersion: String): String { fun compilerVersionFor(kotlinVersion: String): String {

8
gradle-plugins/gradle.properties

@ -2,13 +2,13 @@ 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.3.0 compose.version=1.3.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.4.0 compose.tests.compiler.version=1.4.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.
compose.tests.compiler.compatible.kotlin.version=1.8.0 compose.tests.compiler.compatible.kotlin.version=1.8.10
# The latest version of Kotlin compatible with compose.tests.compiler.version for JS target. Used only on CI. # The latest version of Kotlin compatible with compose.tests.compiler.version for JS target. Used only on CI.
compose.tests.js.compiler.compatible.kotlin.version=1.8.0 compose.tests.js.compiler.compatible.kotlin.version=1.8.10
# __SUPPORTED_GRADLE_VERSIONS__ # __SUPPORTED_GRADLE_VERSIONS__
compose.tests.gradle.versions=7.0.2, 8.0-rc-1 compose.tests.gradle.versions=7.0.2, 8.0-rc-1

4
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.8.0 kotlin.version=1.8.10
compose.version=1.3.0 compose.version=1.3.1

4
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.8.0 kotlin.version=1.8.10
agp.version=7.1.3 agp.version=7.1.3
compose.version=1.3.0 compose.version=1.3.1

4
templates/web-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.8.0 kotlin.version=1.8.10
compose.version=1.3.0 compose.version=1.3.1

4
tools/replaceVersion.sh

@ -8,12 +8,14 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/..
declare -a folders=( declare -a folders=(
"templates" "templates"
"examples" "examples"
#"experimental/examples"
"gradle-plugins" "gradle-plugins"
"components" "components"
"ci" "ci"
"web" "web"
"tutorials" "tutorials"
"experimental/examples" "compose/integrations/composable-test-cases"
"compose/integrations/compose-with-ktx-serialization"
) )
if [ -z "$1" ]; then if [ -z "$1" ]; then

8
tutorials/Getting_Started/README.md

@ -42,8 +42,8 @@ The Compose plugin version used in the wizard above might not be the latest. Upd
For the latest versions, see the [latest versions](https://github.com/JetBrains/compose-multiplatform/releases) site and the [Kotlin](https://kotlinlang.org/) site. For the latest versions, see the [latest versions](https://github.com/JetBrains/compose-multiplatform/releases) site and the [Kotlin](https://kotlinlang.org/) site.
``` ```
plugins { plugins {
kotlin("jvm") version "1.8.0" kotlin("jvm") version "1.8.10"
id("org.jetbrains.compose") version "1.3.0" id("org.jetbrains.compose") version "1.3.1"
} }
``` ```
@ -76,8 +76,8 @@ pluginManagement {
Then create `build.gradle.kts` with the following content: Then create `build.gradle.kts` with the following content:
``` kotlin ``` kotlin
plugins { plugins {
kotlin("jvm") version "1.8.0" kotlin("jvm") version "1.8.10"
id("org.jetbrains.compose") version "1.3.0" id("org.jetbrains.compose") version "1.3.1"
} }
repositories { repositories {

4
tutorials/Web/Getting_Started/README.md

@ -40,8 +40,8 @@ pluginManagement {
``` kotlin ``` kotlin
// Add compose gradle plugin // Add compose gradle plugin
plugins { plugins {
kotlin("multiplatform") version "1.8.0" kotlin("multiplatform") version "1.8.10"
id("org.jetbrains.compose") version "1.3.0" id("org.jetbrains.compose") version "1.3.1"
} }
// Add maven repositories // Add maven repositories

2
web/buildSrc/gradle.properties

@ -1 +1 @@
kotlin.version=1.8.0 kotlin.version=1.8.10

2
web/gradle.properties

@ -1,4 +1,4 @@
compose.version=1.3.0 compose.version=1.3.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

Loading…
Cancel
Save