From 726b98d661e8c0c893efde11641d3166fcb6a5ae Mon Sep 17 00:00:00 2001 From: Nikolai Rykunov Date: Wed, 1 Nov 2023 08:44:16 +0100 Subject: [PATCH] Support 1.5.10 (#3682) Co-authored-by: dima.avdeev Co-authored-by: Oleksandr Karpovich --- CHANGELOG.md | 113 ++++++++++++++++++ VERSIONING.md | 2 + benchmarks/kn-performance/gradle.properties | 2 +- ci/compose-uber-jar/gradle.properties | 2 +- .../desktop-template/gradle.properties | 4 +- .../html-library-template/gradle.properties | 4 +- .../multiplatform-template/gradle.properties | 4 +- examples/chat/gradle.properties | 4 +- .../cocoapods-ios-example/gradle.properties | 4 +- examples/codeviewer/gradle.properties | 4 +- examples/graphics-2d/gradle.properties | 4 +- examples/html/compose-bird/gradle.properties | 4 +- examples/html/compose-in-js/gradle.properties | 6 +- examples/html/landing/gradle.properties | 4 +- examples/html/with-react/gradle.properties | 4 +- examples/imageviewer/gradle.properties | 4 +- examples/intellij-plugin/gradle.properties | 4 +- .../ios-compose-in-swiftui/gradle.properties | 4 +- .../ios-compose-in-uikit/gradle.properties | 4 +- .../ios-swiftui-in-compose/gradle.properties | 4 +- .../ios-uikit-in-compose/gradle.properties | 4 +- examples/issues/gradle.properties | 4 +- examples/notepad/gradle.properties | 4 +- examples/todoapp-lite/gradle.properties | 4 +- examples/widgets-gallery/gradle.properties | 4 +- gradle-plugins/gradle.properties | 8 +- tutorials/HTML/Getting_Started/README.md | 4 +- 27 files changed, 165 insertions(+), 52 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3182d5e00..992d299dd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,116 @@ +# 1.5.10 (October 2023) +> This is a combined changelog from the prerelease versions: +> - [1.5.0-beta01](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.5.0-beta01) +> - [1.5.0-beta02](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.5.10-beta02) +> - [1.5.0-rc01](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.5.10-rc01) +> - [1.5.0-rc02](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.5.10-rc02) + +## Common +### Features +* [Support Kotlin 1.9.20](https://github.com/JetBrains/compose-multiplatform/pull/3884) +* Introduce Material 3 components in common + * [`ModalBottomSheet`](https://github.com/JetBrains/compose-multiplatform-core/pull/794) + * [`SearchBar` and `DockedSearchBar`](https://github.com/JetBrains/compose-multiplatform-core/pull/801) + * [`ExposedDropDownMenu`](https://github.com/JetBrains/compose-multiplatform-core/pull/787) +* [Introduce Material component `ExposedDropDownMenu` in common](https://github.com/JetBrains/compose-multiplatform-core/pull/793) +* [Introduce `WindowInfo.containerSize` experimental api](https://github.com/JetBrains/compose-multiplatform-core/pull/785) +* [Implement `defaultTimePickerLayoutType` based on screen orientation](https://github.com/JetBrains/compose-multiplatform-core/pull/817) +* [Add an option to disable insets in `Popup`/`Dialog`](https://github.com/JetBrains/compose-multiplatform-core/pull/833) +* [Commonize insets `Modifier`'s \(additionally to `WindowInsets.*`\)](https://github.com/JetBrains/compose-multiplatform/issues/3563) + +### Fixes +* [`ExposedDropdownMenuBox.onExpandedChange` was not recomposed](https://github.com/JetBrains/compose-multiplatform/issues/3686) +* [Override `RootLayout` insets only in case of `usePlatformInsets`](https://github.com/JetBrains/compose-multiplatform-core/pull/854) +* [Don't send synthetic Move events before Press/Release for touch](https://github.com/JetBrains/compose-multiplatform-core/pull/870) + +## iOS + +### Breaking changes +* [Having `kotlin.native.cacheKind = none` will result in a build error.](https://github.com/JetBrains/compose-multiplatform/pull/3667) + +### Features +* [Compilation speed up due to enabling compiler caches for Kotlin 1.9.20+](https://github.com/JetBrains/compose-multiplatform/pull/3648) +* [Added crossfade animation during orientation change when used within UIKit hierarchy](https://github.com/JetBrains/compose-multiplatform-core/pull/778) +* [Compose Multiplatform should warn when `CADisableMinimumFrameDurationOnPhone` is not configured properly](https://github.com/JetBrains/compose-multiplatform/issues/3634) +* [Fast delete mode on software keyboard. When you hold a backspace, “turbo mode” is enabled after deleting the first 21 symbols. In turbo mode each tick deletes two words.](https://github.com/JetBrains/compose-multiplatform/issues/2991) +* [On a long scrollable TextFields, If it’s scrolled up to caret position while typing. Then it stopped on the line above the line with a caret.](https://github.com/JetBrains/compose-multiplatform-core/pull/804) +* [Add `UIViewController` lifetime hooks](https://github.com/JetBrains/compose-multiplatform-core/pull/779) +* [Implement iOS native feel scrolls for large text fields](https://github.com/JetBrains/compose-multiplatform-core/pull/771) +* Improve rendering performance + * [Avoid redundant compositing](https://github.com/JetBrains/compose-multiplatform-core/pull/813) + * [Don't send redundant synthetic moves](https://github.com/JetBrains/compose-multiplatform-core/pull/819) + * [Postpone `CAMetalDrawable` acquisition](https://github.com/JetBrains/compose-multiplatform-core/pull/820) + * [Move frame encoding to separate thread when possible](https://github.com/JetBrains/compose-multiplatform-core/pull/829) +* [Double tap and triple tap gesture handling in `TextField`s](https://github.com/JetBrains/compose-multiplatform/issues/2682) + +### Fixes +* [Rendering synchronization of multiple `UIKitView`s within a screen](https://github.com/JetBrains/compose-multiplatform/issues/3534) +* [Today's date is not highlighted with a circle in the material3 datePicker on iOS](https://github.com/JetBrains/compose-multiplatform/issues/3591) +* [Fix text-to-speech crash in iOS 16.0.*](https://github.com/JetBrains/compose-multiplatform/issues/2984) +* [Compose window is shown before the first frame is rendered](https://github.com/JetBrains/compose-multiplatform/issues/3492) +* [iOS TextField, Compound emojis are being treated as many symbols](https://github.com/JetBrains/compose-multiplatform/issues/3104) +* [Use `CADisplayLink.targetTimestamp` value as the time for animation frames](https://github.com/JetBrains/compose-multiplatform-core/pull/796) +* [iOS. Improved performance on 120 hz devices](https://github.com/JetBrains/compose-multiplatform-core/pull/797) +* [Expanded `ModalBottomSheet`: scrim doesn't occupy complete screen](https://github.com/JetBrains/compose-multiplatform/issues/3701) +* [Fix interop view intercepting touches for popups](https://github.com/JetBrains/compose-multiplatform-core/pull/835) +* [Fix applying `WindowInsets` inside `Popup`/`Dialog`](https://github.com/JetBrains/compose-multiplatform-core/pull/832) +* [Scrolling behavior bugs](https://github.com/JetBrains/compose-multiplatform/issues/3335) +* [`OutlinedTextField` label is clipped](https://github.com/JetBrains/compose-multiplatform/issues/3737) +* [Black screens with `UIKitView` after navigating away and navigating back](https://github.com/JetBrains/compose-multiplatform/issues/3749) +* [Long text field overscroll effect not clipped correctly](https://github.com/JetBrains/compose-multiplatform-core/pull/859) +* [First screen is recomposed twice](https://github.com/JetBrains/compose-multiplatform/issues/3778) +* [Bug with selection handle](https://github.com/JetBrains/compose-multiplatform-core/pull/869) +* [Ignore unpressed events during velocity calculation](https://github.com/JetBrains/compose-multiplatform-core/pull/848) +* [Crash with Asian languages in `TextField`](https://github.com/JetBrains/compose-multiplatform-core/pull/872/files) + +## Desktop +### Features +* Improve accessibility support + * [Implement `Role.DropdownList` via `AccessibleRole.COMBO_BOX`](https://github.com/JetBrains/compose-multiplatform-core/pull/822) + * [Fix Compose `Role.Tab` to correctly translate to Java's `AccessibleRole.PAGE_TAB`](https://github.com/JetBrains/compose-multiplatform-core/pull/821) + * [Implement support for `SemanticsProperties.ProgressBarRangeInfo`](https://github.com/JetBrains/compose-multiplatform-core/pull/830) + +### Fixes +* [`LocalLayoutDirection` isn't propagated into `DialogWindow`](https://github.com/JetBrains/compose-multiplatform/issues/3382) +* [CompositionLocals given in application scope are not take into account in window scope (such as `LocalLayoutDirection`)](https://github.com/JetBrains/compose-multiplatform/issues/3571) +* [Fix accessibility issue with actions in popups](https://github.com/JetBrains/compose-multiplatform-core/pull/792) +* [Apply custom Dialog's scrim blend mode only when window is transparent](https://github.com/JetBrains/compose-multiplatform-core/pull/812) +* [Can't type in `TextField` placed in `ModalBottomSheet`](https://github.com/JetBrains/compose-multiplatform/issues/3703) +* [Accessibility not reporting changes](https://github.com/JetBrains/compose-multiplatform-core/pull/842) +* [Crash "LayoutNode should be attached to an owner exception"](https://github.com/JetBrains/compose-multiplatform/issues/3728) +* [Window loses its focus after recomposition of another window](https://github.com/JetBrains/compose-multiplatform/issues/2994) +* [Report semantic `ProgressBarRangeInfo` changes for accessibility](https://github.com/JetBrains/compose-multiplatform-core/pull/862) +* [Fix NPE for getComponentAfter/Before in ComposePanel](https://github.com/JetBrains/compose-multiplatform-core/pull/878) +* [Take into account `enabled` in `scrollable` for mouse input](https://github.com/JetBrains/compose-multiplatform-core/pull/880) +* [Improve accessibility on Windows](https://github.com/JetBrains/compose-multiplatform-core/pull/885) +* [Fix Chinese characters input when using JBR](https://github.com/JetBrains/compose-multiplatform-core/pull/881) + +## Gradle Plugin +### Features +* [Add API to not apply the Compose Compiler plugin](https://github.com/JetBrains/compose-multiplatform/pull/3722) + +### Fixes +* [Increase Kotlinx Serialization version used by the Compose Gradle Plugin](https://github.com/JetBrains/compose-multiplatform/issues/3479) +* [Switch to notarytool for notarization](https://github.com/JetBrains/compose-multiplatform/pull/3642) +* [Fix configuration cache for `syncComposeResourcesForIos`](https://github.com/JetBrains/compose-multiplatform/pull/3764) + +## HTML library +### Features +* [SVG - Add fillOpacity attribute](https://github.com/JetBrains/compose-multiplatform/pull/3725) + +## Web +### Features +* [Allow resources routing configuration (resources library)](https://github.com/JetBrains/compose-multiplatform/pull/3852) + +## Dependencies +This version of Compose Multiplatform is based on the next Jetpack Compose libraries: +* [Compiler 1.5.3](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.5.3) +* [Runtime 1.5.4](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.5.4) +* [UI 1.5.4](https://developer.android.com/jetpack/androidx/releases/compose-ui#1.5.4) +* [Foundation 1.5.4](https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.5.4) +* [Material 1.5.4](https://developer.android.com/jetpack/androidx/releases/compose-material#1.5.4) +* [Material3 1.1.2](https://developer.android.com/jetpack/androidx/releases/compose-material3#1.1.2) + # 1.5.10-rc02 (October 2023) ## Common diff --git a/VERSIONING.md b/VERSIONING.md index 98ab92ea75..44c01eeb6b 100644 --- a/VERSIONING.md +++ b/VERSIONING.md @@ -41,6 +41,7 @@ Kotlin version | Minimal Compose version | Notes 1.8.22 | 1.4.3 1.9.0 | 1.4.3 1.9.10 | 1.5.1 +1.9.20 | 1.5.10 ### Using the latest Kotlin version @@ -106,6 +107,7 @@ When you build your application for Android, the artifacts published by Google a Compose Multiplatform version | Jetpack Compose version | Jetpack Compose Material3 version --- | --- | --- +[1.5.10](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.5.10)|1.5.4|1.1.2 [1.5.1](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.5.1)|1.5.0|1.1.1 [1.5.0](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.5.0)|1.5.0|1.1.1 [1.4.3](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.4.3)|1.4.3|1.0.1 diff --git a/benchmarks/kn-performance/gradle.properties b/benchmarks/kn-performance/gradle.properties index bad987c23e..60d9eb1336 100644 --- a/benchmarks/kn-performance/gradle.properties +++ b/benchmarks/kn-performance/gradle.properties @@ -1,5 +1,5 @@ compose.version=1.5.1 -kotlin.version=1.9.10 +kotlin.version=1.9.20 org.gradle.jvmargs=-Xmx3g kotlin.native.useEmbeddableCompilerJar=true compose.desktop.verbose=true diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index 21cdea8a3d..eea85b57b8 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,2 +1,2 @@ -compose.version=1.5.2 +compose.version=1.5.10 kotlin.code.style=official diff --git a/ci/templates/desktop-template/gradle.properties b/ci/templates/desktop-template/gradle.properties index f38317683d..618b17faa0 100644 --- a/ci/templates/desktop-template/gradle.properties +++ b/ci/templates/desktop-template/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=1.9.10 -compose.version=1.5.2 +kotlin.version=1.9.20 +compose.version=1.5.10 diff --git a/ci/templates/html-library-template/gradle.properties b/ci/templates/html-library-template/gradle.properties index f38317683d..618b17faa0 100644 --- a/ci/templates/html-library-template/gradle.properties +++ b/ci/templates/html-library-template/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=1.9.10 -compose.version=1.5.2 +kotlin.version=1.9.20 +compose.version=1.5.10 diff --git a/ci/templates/multiplatform-template/gradle.properties b/ci/templates/multiplatform-template/gradle.properties index c0845dfbe2..1a60bcbd70 100644 --- a/ci/templates/multiplatform-template/gradle.properties +++ b/ci/templates/multiplatform-template/gradle.properties @@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official -kotlin.version=1.9.10 +kotlin.version=1.9.20 agp.version=8.0.2 -compose.version=1.5.2 +compose.version=1.5.10 diff --git a/examples/chat/gradle.properties b/examples/chat/gradle.properties index c2f765215a..fd43d27a31 100644 --- a/examples/chat/gradle.properties +++ b/examples/chat/gradle.properties @@ -9,6 +9,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.10 +kotlin.version=1.9.20 agp.version=8.0.2 -compose.version=1.5.2 +compose.version=1.5.10 diff --git a/examples/cocoapods-ios-example/gradle.properties b/examples/cocoapods-ios-example/gradle.properties index ad74f4bfd3..4b16b5a573 100644 --- a/examples/cocoapods-ios-example/gradle.properties +++ b/examples/cocoapods-ios-example/gradle.properties @@ -19,6 +19,6 @@ android.minSdk=24 org.jetbrains.compose.experimental.uikit.enabled=true #Versions -kotlin.version=1.9.10 +kotlin.version=1.9.20 agp.version=8.0.2 -compose.version=1.5.2 \ No newline at end of file +compose.version=1.5.10 \ No newline at end of file diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties index c2f765215a..fd43d27a31 100644 --- a/examples/codeviewer/gradle.properties +++ b/examples/codeviewer/gradle.properties @@ -9,6 +9,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.10 +kotlin.version=1.9.20 agp.version=8.0.2 -compose.version=1.5.2 +compose.version=1.5.10 diff --git a/examples/graphics-2d/gradle.properties b/examples/graphics-2d/gradle.properties index 73998f2d5e..9954c9b0da 100644 --- a/examples/graphics-2d/gradle.properties +++ b/examples/graphics-2d/gradle.properties @@ -9,9 +9,9 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.10 +kotlin.version=1.9.20 agp.version=8.0.2 -compose.version=1.5.2 +compose.version=1.5.10 # 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 diff --git a/examples/html/compose-bird/gradle.properties b/examples/html/compose-bird/gradle.properties index eac7330d49..8ddfe59ab0 100644 --- a/examples/html/compose-bird/gradle.properties +++ b/examples/html/compose-bird/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official -kotlin.version=1.9.10 -compose.version=1.5.2 +kotlin.version=1.9.20 +compose.version=1.5.10 diff --git a/examples/html/compose-in-js/gradle.properties b/examples/html/compose-in-js/gradle.properties index 9a4930525c..ed71e71548 100644 --- a/examples/html/compose-in-js/gradle.properties +++ b/examples/html/compose-in-js/gradle.properties @@ -1,6 +1,4 @@ kotlin.code.style=official -kotlin.mpp.enableGranularSourceSetsMetadata=true -kotlin.native.enableDependencyPropagation=false kotlin.js.webpack.major.version=4 -kotlin.version=1.9.10 -compose.version=1.5.2 +kotlin.version=1.9.20 +compose.version=1.5.10 diff --git a/examples/html/landing/gradle.properties b/examples/html/landing/gradle.properties index eac7330d49..8ddfe59ab0 100644 --- a/examples/html/landing/gradle.properties +++ b/examples/html/landing/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official -kotlin.version=1.9.10 -compose.version=1.5.2 +kotlin.version=1.9.20 +compose.version=1.5.10 diff --git a/examples/html/with-react/gradle.properties b/examples/html/with-react/gradle.properties index eac7330d49..8ddfe59ab0 100644 --- a/examples/html/with-react/gradle.properties +++ b/examples/html/with-react/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official -kotlin.version=1.9.10 -compose.version=1.5.2 +kotlin.version=1.9.20 +compose.version=1.5.10 diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties index d679c62ede..0d0c6f139c 100644 --- a/examples/imageviewer/gradle.properties +++ b/examples/imageviewer/gradle.properties @@ -9,6 +9,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.useEmbeddableCompilerJar=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.10 +kotlin.version=1.9.20 agp.version=8.0.2 -compose.version=1.5.2 +compose.version=1.5.10 diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties index eac7330d49..8ddfe59ab0 100644 --- a/examples/intellij-plugin/gradle.properties +++ b/examples/intellij-plugin/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official -kotlin.version=1.9.10 -compose.version=1.5.2 +kotlin.version=1.9.20 +compose.version=1.5.10 diff --git a/examples/interop/ios-compose-in-swiftui/gradle.properties b/examples/interop/ios-compose-in-swiftui/gradle.properties index 6a393189e2..75b6247e5a 100644 --- a/examples/interop/ios-compose-in-swiftui/gradle.properties +++ b/examples/interop/ios-compose-in-swiftui/gradle.properties @@ -2,5 +2,5 @@ kotlin.code.style=official xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g org.jetbrains.compose.experimental.uikit.enabled=true -kotlin.version=1.9.10 -compose.version=1.5.2 +kotlin.version=1.9.20 +compose.version=1.5.10 diff --git a/examples/interop/ios-compose-in-uikit/gradle.properties b/examples/interop/ios-compose-in-uikit/gradle.properties index 65e21ac13e..f85c354a72 100644 --- a/examples/interop/ios-compose-in-uikit/gradle.properties +++ b/examples/interop/ios-compose-in-uikit/gradle.properties @@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx3g org.jetbrains.compose.experimental.uikit.enabled=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.10 -compose.version=1.5.2 +kotlin.version=1.9.20 +compose.version=1.5.10 diff --git a/examples/interop/ios-swiftui-in-compose/gradle.properties b/examples/interop/ios-swiftui-in-compose/gradle.properties index 65e21ac13e..f85c354a72 100644 --- a/examples/interop/ios-swiftui-in-compose/gradle.properties +++ b/examples/interop/ios-swiftui-in-compose/gradle.properties @@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx3g org.jetbrains.compose.experimental.uikit.enabled=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.10 -compose.version=1.5.2 +kotlin.version=1.9.20 +compose.version=1.5.10 diff --git a/examples/interop/ios-uikit-in-compose/gradle.properties b/examples/interop/ios-uikit-in-compose/gradle.properties index 65e21ac13e..f85c354a72 100644 --- a/examples/interop/ios-uikit-in-compose/gradle.properties +++ b/examples/interop/ios-uikit-in-compose/gradle.properties @@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx3g org.jetbrains.compose.experimental.uikit.enabled=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.10 -compose.version=1.5.2 +kotlin.version=1.9.20 +compose.version=1.5.10 diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties index a416a41fc2..b99f2cfd19 100644 --- a/examples/issues/gradle.properties +++ b/examples/issues/gradle.properties @@ -19,6 +19,6 @@ kotlin.code.style=official android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -kotlin.version=1.9.10 +kotlin.version=1.9.20 agp.version=8.0.2 -compose.version=1.5.2 +compose.version=1.5.10 diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties index f38317683d..618b17faa0 100644 --- a/examples/notepad/gradle.properties +++ b/examples/notepad/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=1.9.10 -compose.version=1.5.2 +kotlin.version=1.9.20 +compose.version=1.5.10 diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties index c2f765215a..fd43d27a31 100755 --- a/examples/todoapp-lite/gradle.properties +++ b/examples/todoapp-lite/gradle.properties @@ -9,6 +9,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.10 +kotlin.version=1.9.20 agp.version=8.0.2 -compose.version=1.5.2 +compose.version=1.5.10 diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties index c2f765215a..fd43d27a31 100644 --- a/examples/widgets-gallery/gradle.properties +++ b/examples/widgets-gallery/gradle.properties @@ -9,6 +9,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.10 +kotlin.version=1.9.20 agp.version=8.0.2 -compose.version=1.5.2 +compose.version=1.5.10 diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index cafb63b058..34dec6aad3 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -2,13 +2,13 @@ org.gradle.parallel=true kotlin.code.style=official # Default version of Compose Libraries used by Gradle plugin -compose.version=1.5.2 +compose.version=1.5.10 # 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.3 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI. -compose.tests.compiler.compatible.kotlin.version=1.9.10 +compose.tests.compiler.compatible.kotlin.version=1.9.20 # 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.9.10 +compose.tests.js.compiler.compatible.kotlin.version=1.9.20 # __SUPPORTED_GRADLE_VERSIONS__ # Don't forget to edit versions in .github/workflows/gradle-plugin.yml as well compose.tests.gradle.versions=7.3.3, 8.3 diff --git a/tutorials/HTML/Getting_Started/README.md b/tutorials/HTML/Getting_Started/README.md index 75b9e051d3..341e47a84b 100644 --- a/tutorials/HTML/Getting_Started/README.md +++ b/tutorials/HTML/Getting_Started/README.md @@ -36,8 +36,8 @@ pluginManagement { ``` kotlin // Add compose gradle plugin plugins { - kotlin("multiplatform") version "1.9.10" - id("org.jetbrains.compose") version "1.5.2" + kotlin("multiplatform") version "1.9.20" + id("org.jetbrains.compose") version "1.5.10" } // Add maven repositories