From 53e367411876f60bd3121756eb4bf9d13629bf27 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Thu, 24 Aug 2023 18:02:09 +0200 Subject: [PATCH] 1.5.0 Changelog and updated examples (#3556) The changelog is merged from the prerelease versions: https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.5.0-beta01 https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.5.0-beta02 I will change versions to 1.5.0 in a separate PR later --- CHANGELOG.md | 146 ++++++++++++++++++ ci/compose-uber-jar/gradle.properties | 2 +- .../desktop-template/gradle.properties | 2 +- .../html-library-template/gradle.properties | 2 +- .../multiplatform-template/gradle.properties | 2 +- examples/chat/androidApp/build.gradle.kts | 4 +- examples/chat/gradle.properties | 2 +- examples/chat/shared/build.gradle.kts | 4 +- .../cocoapods-ios-example/gradle.properties | 4 +- .../codeviewer/androidApp/build.gradle.kts | 4 +- examples/codeviewer/gradle.properties | 2 +- examples/codeviewer/shared/build.gradle.kts | 4 +- .../falling-balls/androidApp/build.gradle.kts | 4 +- examples/falling-balls/gradle.properties | 4 +- .../falling-balls/shared/build.gradle.kts | 4 +- examples/html/compose-bird/gradle.properties | 2 +- examples/html/compose-in-js/gradle.properties | 2 +- examples/html/landing/gradle.properties | 2 +- examples/html/with-react/gradle.properties | 2 +- examples/imageviewer/gradle.properties | 2 +- examples/intellij-plugin/gradle.properties | 2 +- examples/issues/android/build.gradle.kts | 4 +- examples/issues/common/build.gradle.kts | 4 +- examples/issues/gradle.properties | 2 +- .../minesweeper/androidApp/build.gradle.kts | 4 +- examples/minesweeper/gradle.properties | 4 +- examples/minesweeper/shared/build.gradle.kts | 4 +- examples/notepad/gradle.properties | 2 +- .../todoapp-lite/androidApp/build.gradle.kts | 4 +- examples/todoapp-lite/gradle.properties | 2 +- examples/todoapp-lite/shared/build.gradle.kts | 4 +- .../androidApp/build.gradle.kts | 4 +- examples/visual-effects/gradle.properties | 2 +- .../visual-effects/shared/build.gradle.kts | 4 +- .../androidApp/build.gradle.kts | 4 +- examples/widgets-gallery/gradle.properties | 2 +- .../widgets-gallery/shared/build.gradle.kts | 4 +- gradle-plugins/gradle.properties | 2 +- tutorials/HTML/Getting_Started/README.md | 2 +- 39 files changed, 203 insertions(+), 57 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 823fbd66233..3ec1873b00a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,149 @@ +# 1.5.0 (August 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.0-beta02) + +## Common + +### Features +- [`Dialog` API is available to use from common source set](https://github.com/JetBrains/compose-multiplatform-core/pull/632) +- [`Popup` API is available to use from common source set](https://github.com/JetBrains/compose-multiplatform-core/pull/611) +- [`WindowInsets` API is available to use from common source set](https://github.com/JetBrains/compose-multiplatform-core/pull/586) +- [A warning if `compose.kotlinCompilerPlugin` is set to `androidx.compose.compiler.compiler`](https://github.com/JetBrains/compose-multiplatform/pull/3313) +- [`androidx.compose.material.DropdownMenu` is available to use from common source set](https://github.com/JetBrains/compose-multiplatform-core/pull/738) +- [`androidx.compose.material3.DropdownMenu` is available to use from common source set](https://github.com/JetBrains/compose-multiplatform-core/pull/737) +- [`androidx.compose.material.AlertDialog` is available to use from common source set](https://github.com/JetBrains/compose-multiplatform-core/pull/708) +- [`androidx.compose.material3.AlertDialog` is available to use from common source set](https://github.com/JetBrains/compose-multiplatform-core/pull/710) +- [Add `PopupProperties.clippingEnabled` setting](https://github.com/JetBrains/compose-multiplatform-core/pull/740) +- material3. Support [`DatePicker`](https://github.com/JetBrains/compose-multiplatform-core/pull/717), [`DatePickerDialog`](https://github.com/JetBrains/compose-multiplatform-core/pull/745) and `TimePicker` + +### Fixes +- [`Popup`. Fix overriding `pressOwner` on multitouch](https://github.com/JetBrains/compose-multiplatform-core/pull/704) +- [Fix sending multiple touches in tests](https://github.com/JetBrains/compose-multiplatform-core/pull/688) +- [Fix multi-owner input processing](https://github.com/JetBrains/compose-multiplatform-core/pull/634) +- [Fix paragraph word boundary unicode handling](https://github.com/JetBrains/compose-multiplatform-core/pull/541) +- [Optimize the `Canvas` transformation functions](https://github.com/JetBrains/skiko/pull/724) +- [Fix click outside of common `Dialog` behaviour](https://github.com/JetBrains/compose-multiplatform-core/pull/707) + +### API Changes +- [Change the default layout behavior of `AlertDialog`](https://github.com/JetBrains/compose-multiplatform-core/pull/708) + +## iOS + +### Features +- [iOS native scroll and feel](https://github.com/JetBrains/compose-multiplatform-core/pull/609) +- [Simplify resource management](https://github.com/JetBrains/compose-multiplatform/pull/3340) (works without CocoaPods now) +- [`TextField` keyboardOptions, capitalization](https://github.com/JetBrains/compose-multiplatform/issues/2735) +- [`TextField`, keyboard behavior when have fullscreen size TextField](https://github.com/JetBrains/compose-multiplatform/issues/2752) +- [`TextField`, different behavior strategies on appearing the keyboard](https://github.com/JetBrains/compose-multiplatform/issues/3128) +- [Insets on iOS](https://github.com/JetBrains/compose-multiplatform-core/pull/577) +- [Support `Density.textSize` (Dynamic Type)](https://github.com/JetBrains/compose-multiplatform/issues/2567) +- [Change default fonts](https://github.com/JetBrains/compose-multiplatform-core/pull/552) (San Francisco is the default font) +- [UIKit public `LocalUIViewController`](https://github.com/JetBrains/compose-multiplatform-core/pull/501) +- [Support singleLine and `KeyboardAction`](https://github.com/JetBrains/compose-multiplatform-core/pull/699) + +### Fixes +- [Fix dynamic framework support](https://github.com/JetBrains/skiko/pull/763) +- [Fix `TextField` context menu](https://github.com/JetBrains/compose-multiplatform/issues/3276) +- [Fix complex blending on iOS](https://github.com/JetBrains/skiko/pull/728) +- [`ViewConfiguration.touchSlop` value is quite low on iOS](https://github.com/JetBrains/compose-multiplatform/issues/3397) +- [Fix `topLeftOffset` calculation on iOS in Split View](https://github.com/JetBrains/compose-multiplatform-core/pull/678) +- [`Modifier.draggable` `onDragStopped` not called](https://github.com/JetBrains/compose-multiplatform/issues/3310) +- [`UIKitView`. Fix lifetime discrepancy within the composition](https://github.com/JetBrains/compose-multiplatform-core/pull/576/files) +- [Support 120hz screens](https://github.com/JetBrains/compose-multiplatform-ios-android-template/pull/17) +- [Fix incorrect Skiko render target on iOS Metal](https://github.com/JetBrains/compose-multiplatform-core/pull/554) +- [Properly detect content based text direction on native](https://github.com/JetBrains/compose-multiplatform-core/pull/514) +- Implemented all low-level functions to avoid random crashes + - [Implement `TreeSet`](https://github.com/JetBrains/compose-multiplatform/issues/2878) + - [Implement `AnnotatedString.transform`](https://github.com/JetBrains/compose-multiplatform-core/pull/523) + - [Implement `WeakHashMap`](https://github.com/JetBrains/compose-multiplatform/issues/2877) + - [Implement `typefacesCache`](https://github.com/JetBrains/compose-multiplatform/issues/2873) + - [Implement `ExpireAfterAccessCache`](https://github.com/JetBrains/compose-multiplatform/issues/2871) + - [Implement `NativeStringDelegate`](https://github.com/JetBrains/compose-multiplatform/issues/2876) +- [Fix memory leak in `ComposeUIViewController`](https://github.com/JetBrains/compose-multiplatform/issues/3201) +- [Manage Kotlin native cache kind automatically based on Kotlin version](https://github.com/JetBrains/compose-multiplatform/pull/3477) (`kotlin.native.cacheKind=none` is no longer needed) +- [Limit max `Dialog` and `Popup` size by safe area on iOS](https://github.com/JetBrains/compose-multiplatform-core/pull/732) +- [`TextField`, Korean characters are not normally entered](https://github.com/JetBrains/compose-multiplatform/issues/3101) +- [`ColorMatrix` value range for 5th column was incorrect on Skiko backed platforms](https://github.com/JetBrains/compose-multiplatform/issues/3461) +- [`isSystemDarkTheme` now automatically react to the system theme changes](https://github.com/JetBrains/compose-multiplatform-core/pull/715) + +### API Changes +- Resource management was reimplemented. Follow [the guide in the PR](https://github.com/JetBrains/compose-multiplatform/pull/3340) to support new feautures +- [`CADisableMinimumFrameDurationOnPhone` added to the template's `Info.plist` to support 120Hz](https://github.com/JetBrains/compose-multiplatform-ios-android-template/pull/17#issue-1714201779) +- [`ComposeUIViewController`. Dispose composition on `viewDidDisappear`](https://github.com/JetBrains/compose-multiplatform-core/pull/747) + +## Desktop + +### Features +- [Swing interop. Experimental off-screen rendering on graphics](https://github.com/JetBrains/compose-multiplatform-core/pull/601) (hardware accelerated only on macOs at the moment) +- [Swing interop. `ComposePanel` that can be disposed manually](https://github.com/JetBrains/compose-multiplatform-core/pull/620) +- [Add semantic properties to `DialogWindow`, `Popup` and `Dialog`](https://github.com/JetBrains/compose-multiplatform-core/pull/698) +- [Use `Segoe UI` as sans serif font on Windows](https://github.com/JetBrains/compose-multiplatform-core/pull/557) +- [Add ProGuard optimize flag](https://github.com/JetBrains/compose-multiplatform/pull/3408) + +### Fixes +- [Fix loosing frames on macOs](https://github.com/JetBrains/skiko/pull/753) +- [Scrolling `LazyColumn` via mouse wheel stops working](https://github.com/JetBrains/compose-multiplatform/issues/3366) +- [`Slider` can be moved using keyboard, but cannot be submitted](https://github.com/JetBrains/compose-multiplatform/issues/2798) +- [Make one pixel beyond the scrollbar thumb react correctly to clicks](https://github.com/JetBrains/compose-multiplatform-core/pull/505) +- [`VerticalScrollbar` doesn't work properly when `LazyColumn` exists `StickyHeader`](https://github.com/JetBrains/compose-multiplatform/issues/2940) +- [All `Popup` overloads call dismiss on `Esc` key by default](https://github.com/JetBrains/compose-multiplatform-core/pull/712) +- [Fix Could not infer Java runtime version for Java home directory](https://github.com/JetBrains/compose-multiplatform/issues/3133) +- [Usage of deprecated `forEachGesture` in `Scrollbar.desktop.kt`](https://github.com/JetBrains/compose-multiplatform/issues/3045) +- Test framework fixes + - [Implement idling resources for tests](https://github.com/JetBrains/compose-multiplatform-core/pull/599) + - [Implement `SemanticsNodeInteraction.captureToImage()`](https://github.com/JetBrains/compose-multiplatform-core/pull/589) + - [Wait until compose is idle before returning from `DesktopTestOwner.getRoots()`](https://github.com/JetBrains/compose-multiplatform-core/pull/588) + - [When the test main clock is advanced, call `ComposeScene.render` with the current test time](https://github.com/JetBrains/compose-multiplatform-core/pull/584) + - [Add timestamps to batched test input events, and advance the test clock accordingly when sending them](https://github.com/JetBrains/compose-multiplatform-core/pull/578) + - [Tests support semanatic nodes inside `Window` and `DialogWindow`](https://github.com/JetBrains/compose-multiplatform-core/pull/697) + +### API Changes +- [Rename desktop's `Dialog` to `DialogWindow`](https://github.com/JetBrains/compose-multiplatform-core/pull/661) + +## Web + +### Features +- [Let `ComposeWindow` accept a custom canvas id (html canvas element id)](https://github.com/JetBrains/compose-multiplatform-core/pull/626) +- [Support `Scrollbar`](https://github.com/JetBrains/compose-multiplatform-core/pull/571) +- [Make `CanvasBasedWindow` apply default styles, set title](https://github.com/JetBrains/compose-multiplatform-core/pull/722) + +### Fixes +- [Workaround `ComposeWindow` multiple event listeners on resize](https://github.com/JetBrains/compose-multiplatform-core/pull/692) +- [Fix `Modifier.pointerHoverIcon` for browser apps](https://github.com/JetBrains/compose-multiplatform-core/pull/629) +- [Fux `RoundedCornerShape` with zero corners](https://github.com/JetBrains/compose-multiplatform/issues/3013) +- [Fix `ScrollConfig` in web target](https://github.com/JetBrains/compose-multiplatform-core/pull/628) +- Implemented low-level functions to avoid random crashes: + - [Implement cache key in `PlatformFont`](https://github.com/JetBrains/compose-multiplatform-core/pull/671) + - [implement platform detection to apply correct `KeyMapping` and `FontFamiliesMapping`](https://github.com/JetBrains/compose-multiplatform-core/pull/637) + - [Implement `PlatformLocale` and `StringDelegate` for k/wasm](https://github.com/JetBrains/compose-multiplatform-core/pull/625) + - [Add missing `getAndIncrement` in `AtomicLong` implementation for web](https://github.com/JetBrains/compose-multiplatform-core/pull/570) + +## HTML library + +### Features +- [Make HTML `TestUtils` wait functions cancellable](https://github.com/JetBrains/compose-multiplatform/pull/3320) + +## Gradle Plugin + +### Features +- [Add `runtimeSaveable` to Dependencies in compose gradle plugin](https://github.com/JetBrains/compose-multiplatform/pull/3449) + +### API Changes +- [Raise error when Homebrew JDK is used for packaging](https://github.com/JetBrains/compose-multiplatform/pull/3451/files) + +## Dependencies + +This version of Compose Multiplatform is based on the next Jetpack Compose libraries: + +- [Compiler 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.5.0) +- [Runtime 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.5.0) +- [UI 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-ui#1.5.0) +- [Foundation 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.5.0) +- [Material 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-material#1.5.0) +- [Material3 1.1.1](https://developer.android.com/jetpack/androidx/releases/compose-material3#1.1.1) + + # 1.5.0-beta02 (August 2023) ## Common diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index 9e87d28540a..b8d4292904e 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,2 +1,2 @@ -compose.version=1.4.3 +compose.version=1.5.0-rc04 kotlin.code.style=official diff --git a/ci/templates/desktop-template/gradle.properties b/ci/templates/desktop-template/gradle.properties index 105a342d5a8..8855203df22 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.0 -compose.version=1.4.3 +compose.version=1.5.0-rc04 diff --git a/ci/templates/html-library-template/gradle.properties b/ci/templates/html-library-template/gradle.properties index 105a342d5a8..8855203df22 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.0 -compose.version=1.4.3 +compose.version=1.5.0-rc04 diff --git a/ci/templates/multiplatform-template/gradle.properties b/ci/templates/multiplatform-template/gradle.properties index 4d04eec50bf..af877fb404f 100644 --- a/ci/templates/multiplatform-template/gradle.properties +++ b/ci/templates/multiplatform-template/gradle.properties @@ -4,4 +4,4 @@ android.enableJetifier=true kotlin.code.style=official kotlin.version=1.9.0 agp.version=7.1.3 -compose.version=1.4.3 +compose.version=1.5.0-rc04 diff --git a/examples/chat/androidApp/build.gradle.kts b/examples/chat/androidApp/build.gradle.kts index 7bde5c3bafe..a1915b7c65f 100644 --- a/examples/chat/androidApp/build.gradle.kts +++ b/examples/chat/androidApp/build.gradle.kts @@ -16,11 +16,11 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "org.jetbrains.Chat" minSdk = 26 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" } diff --git a/examples/chat/gradle.properties b/examples/chat/gradle.properties index c2334c435e1..73569e8f30a 100644 --- a/examples/chat/gradle.properties +++ b/examples/chat/gradle.properties @@ -11,4 +11,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.0 agp.version=7.1.3 -compose.version=1.5.0-rc01 +compose.version=1.5.0-rc04 diff --git a/examples/chat/shared/build.gradle.kts b/examples/chat/shared/build.gradle.kts index c2298f7b609..b2299af77f1 100644 --- a/examples/chat/shared/build.gradle.kts +++ b/examples/chat/shared/build.gradle.kts @@ -93,14 +93,14 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].res.srcDirs("src/androidMain/res") sourceSets["main"].resources.srcDirs("src/commonMain/resources") defaultConfig { minSdk = 26 - targetSdk = 33 + targetSdk = 34 } compileOptions { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/examples/cocoapods-ios-example/gradle.properties b/examples/cocoapods-ios-example/gradle.properties index 450d4d1294b..14490392217 100644 --- a/examples/cocoapods-ios-example/gradle.properties +++ b/examples/cocoapods-ios-example/gradle.properties @@ -12,7 +12,7 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 #Android android.useAndroidX=true android.compileSdk=34 -android.targetSdk=33 +android.targetSdk=34 android.minSdk=24 #Compose @@ -21,4 +21,4 @@ org.jetbrains.compose.experimental.uikit.enabled=true #Versions kotlin.version=1.9.0 agp.version=7.4.2 -compose.version=1.5.0-rc01 \ No newline at end of file +compose.version=1.5.0-rc04 \ No newline at end of file diff --git a/examples/codeviewer/androidApp/build.gradle.kts b/examples/codeviewer/androidApp/build.gradle.kts index cb6f6495780..4f230577b8d 100644 --- a/examples/codeviewer/androidApp/build.gradle.kts +++ b/examples/codeviewer/androidApp/build.gradle.kts @@ -16,11 +16,11 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "org.jetbrains.Codeviewer" minSdk = 26 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" } diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties index c2334c435e1..73569e8f30a 100644 --- a/examples/codeviewer/gradle.properties +++ b/examples/codeviewer/gradle.properties @@ -11,4 +11,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.0 agp.version=7.1.3 -compose.version=1.5.0-rc01 +compose.version=1.5.0-rc04 diff --git a/examples/codeviewer/shared/build.gradle.kts b/examples/codeviewer/shared/build.gradle.kts index 6ba9730db21..358440be648 100644 --- a/examples/codeviewer/shared/build.gradle.kts +++ b/examples/codeviewer/shared/build.gradle.kts @@ -65,12 +65,12 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/resources") defaultConfig { minSdk = 26 - targetSdk = 33 + targetSdk = 34 } compileOptions { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/examples/falling-balls/androidApp/build.gradle.kts b/examples/falling-balls/androidApp/build.gradle.kts index 8de9b994e5d..173ebf86c08 100644 --- a/examples/falling-balls/androidApp/build.gradle.kts +++ b/examples/falling-balls/androidApp/build.gradle.kts @@ -16,11 +16,11 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "org.jetbrains.FallingBalls" minSdk = 26 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" } diff --git a/examples/falling-balls/gradle.properties b/examples/falling-balls/gradle.properties index ea11125f4ed..e206bf9120e 100644 --- a/examples/falling-balls/gradle.properties +++ b/examples/falling-balls/gradle.properties @@ -11,9 +11,9 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.0 agp.version=7.1.3 -compose.version=1.5.0-rc01 +compose.version=1.5.0-rc04 # 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 # setting it to `true` breaks other targets (see shared/build.gradle.kts), so it should be used to run the web app only. -workaround.kotlin.js.kt60852=false \ No newline at end of file +workaround.kotlin.js.kt60852=false diff --git a/examples/falling-balls/shared/build.gradle.kts b/examples/falling-balls/shared/build.gradle.kts index 0a7e221191c..8f1cf1f8d03 100644 --- a/examples/falling-balls/shared/build.gradle.kts +++ b/examples/falling-balls/shared/build.gradle.kts @@ -106,14 +106,14 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].res.srcDirs("src/androidMain/res") sourceSets["main"].resources.srcDirs("src/commonMain/resources") defaultConfig { minSdk = 26 - targetSdk = 33 + targetSdk = 34 } compileOptions { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/examples/html/compose-bird/gradle.properties b/examples/html/compose-bird/gradle.properties index 27afa0323e3..6e8f5ae2484 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.0 -compose.version=1.5.0-rc01 +compose.version=1.5.0-rc04 diff --git a/examples/html/compose-in-js/gradle.properties b/examples/html/compose-in-js/gradle.properties index 5dbb68dc4b2..d42678cc1c9 100644 --- a/examples/html/compose-in-js/gradle.properties +++ b/examples/html/compose-in-js/gradle.properties @@ -3,4 +3,4 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true kotlin.native.enableDependencyPropagation=false kotlin.js.webpack.major.version=4 kotlin.version=1.9.0 -compose.version=1.5.0-rc01 +compose.version=1.5.0-rc04 diff --git a/examples/html/landing/gradle.properties b/examples/html/landing/gradle.properties index 27afa0323e3..6e8f5ae2484 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.0 -compose.version=1.5.0-rc01 +compose.version=1.5.0-rc04 diff --git a/examples/html/with-react/gradle.properties b/examples/html/with-react/gradle.properties index 27afa0323e3..6e8f5ae2484 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.0 -compose.version=1.5.0-rc01 +compose.version=1.5.0-rc04 diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties index 3c07f3f281e..ba18686b9fe 100644 --- a/examples/imageviewer/gradle.properties +++ b/examples/imageviewer/gradle.properties @@ -11,4 +11,4 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.0 agp.version=7.1.3 -compose.version=1.5.0-rc01 +compose.version=1.5.0-rc04 diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties index c977b41e35a..6e8f5ae2484 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.0 -compose.version=1.4.3 +compose.version=1.5.0-rc04 diff --git a/examples/issues/android/build.gradle.kts b/examples/issues/android/build.gradle.kts index fed67b2b039..69958d0e3f6 100644 --- a/examples/issues/android/build.gradle.kts +++ b/examples/issues/android/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 26 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" } diff --git a/examples/issues/common/build.gradle.kts b/examples/issues/common/build.gradle.kts index 4dc1702e808..d4a3a2cc68c 100644 --- a/examples/issues/common/build.gradle.kts +++ b/examples/issues/common/build.gradle.kts @@ -38,11 +38,11 @@ apollo { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 26 - targetSdk = 33 + targetSdk = 34 } compileOptions { diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties index a61fd0475a4..772790ee1ec 100644 --- a/examples/issues/gradle.properties +++ b/examples/issues/gradle.properties @@ -21,4 +21,4 @@ android.useAndroidX=true android.enableJetifier=true kotlin.version=1.9.0 agp.version=7.1.3 -compose.version=1.4.3 +compose.version=1.5.0-rc04 diff --git a/examples/minesweeper/androidApp/build.gradle.kts b/examples/minesweeper/androidApp/build.gradle.kts index fa39d4d64d6..60df541d3c2 100644 --- a/examples/minesweeper/androidApp/build.gradle.kts +++ b/examples/minesweeper/androidApp/build.gradle.kts @@ -16,11 +16,11 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "org.jetbrains.ComposeMinesweeper" minSdk = 26 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" } diff --git a/examples/minesweeper/gradle.properties b/examples/minesweeper/gradle.properties index ea11125f4ed..e206bf9120e 100644 --- a/examples/minesweeper/gradle.properties +++ b/examples/minesweeper/gradle.properties @@ -11,9 +11,9 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.0 agp.version=7.1.3 -compose.version=1.5.0-rc01 +compose.version=1.5.0-rc04 # 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 # setting it to `true` breaks other targets (see shared/build.gradle.kts), so it should be used to run the web app only. -workaround.kotlin.js.kt60852=false \ No newline at end of file +workaround.kotlin.js.kt60852=false diff --git a/examples/minesweeper/shared/build.gradle.kts b/examples/minesweeper/shared/build.gradle.kts index 0646b76b0f6..3ffe9acf6b8 100644 --- a/examples/minesweeper/shared/build.gradle.kts +++ b/examples/minesweeper/shared/build.gradle.kts @@ -116,14 +116,14 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].res.srcDirs("src/androidMain/res") sourceSets["main"].resources.srcDirs("src/commonMain/resources") defaultConfig { minSdk = 26 - targetSdk = 33 + targetSdk = 34 } compileOptions { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties index 105a342d5a8..8855203df22 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.0 -compose.version=1.4.3 +compose.version=1.5.0-rc04 diff --git a/examples/todoapp-lite/androidApp/build.gradle.kts b/examples/todoapp-lite/androidApp/build.gradle.kts index 4859f67690f..74fc3370893 100755 --- a/examples/todoapp-lite/androidApp/build.gradle.kts +++ b/examples/todoapp-lite/androidApp/build.gradle.kts @@ -17,11 +17,11 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "org.jetbrains.TodoAppLite" minSdk = 26 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" } diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties index c2334c435e1..73569e8f30a 100755 --- a/examples/todoapp-lite/gradle.properties +++ b/examples/todoapp-lite/gradle.properties @@ -11,4 +11,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.0 agp.version=7.1.3 -compose.version=1.5.0-rc01 +compose.version=1.5.0-rc04 diff --git a/examples/todoapp-lite/shared/build.gradle.kts b/examples/todoapp-lite/shared/build.gradle.kts index 98d3f639b63..968f3552bf2 100755 --- a/examples/todoapp-lite/shared/build.gradle.kts +++ b/examples/todoapp-lite/shared/build.gradle.kts @@ -62,14 +62,14 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].res.srcDirs("src/androidMain/res") sourceSets["main"].resources.srcDirs("src/commonMain/resources") defaultConfig { minSdk = 26 - targetSdk = 33 + targetSdk = 34 } compileOptions { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/examples/visual-effects/androidApp/build.gradle.kts b/examples/visual-effects/androidApp/build.gradle.kts index 61a9bd4d72e..8d6b9616248 100644 --- a/examples/visual-effects/androidApp/build.gradle.kts +++ b/examples/visual-effects/androidApp/build.gradle.kts @@ -16,11 +16,11 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "org.jetbrains.VisualEffects" minSdk = 26 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" } diff --git a/examples/visual-effects/gradle.properties b/examples/visual-effects/gradle.properties index 1baf49c20ca..86d23e5737c 100644 --- a/examples/visual-effects/gradle.properties +++ b/examples/visual-effects/gradle.properties @@ -11,4 +11,4 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.0 agp.version=7.1.3 -compose.version=1.5.0-rc01 +compose.version=1.5.0-rc04 diff --git a/examples/visual-effects/shared/build.gradle.kts b/examples/visual-effects/shared/build.gradle.kts index 3346b1484e3..5ff775b1444 100644 --- a/examples/visual-effects/shared/build.gradle.kts +++ b/examples/visual-effects/shared/build.gradle.kts @@ -61,14 +61,14 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].res.srcDirs("src/androidMain/res") sourceSets["main"].resources.srcDirs("src/commonMain/resources") defaultConfig { minSdk = 26 - targetSdk = 33 + targetSdk = 34 } compileOptions { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/examples/widgets-gallery/androidApp/build.gradle.kts b/examples/widgets-gallery/androidApp/build.gradle.kts index 0e3faf69496..7e75a7d0dd7 100644 --- a/examples/widgets-gallery/androidApp/build.gradle.kts +++ b/examples/widgets-gallery/androidApp/build.gradle.kts @@ -16,11 +16,11 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "org.jetbrains.WidgetsGallery" minSdk = 26 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" } diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties index c2334c435e1..73569e8f30a 100644 --- a/examples/widgets-gallery/gradle.properties +++ b/examples/widgets-gallery/gradle.properties @@ -11,4 +11,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.binary.memoryModel=experimental kotlin.version=1.9.0 agp.version=7.1.3 -compose.version=1.5.0-rc01 +compose.version=1.5.0-rc04 diff --git a/examples/widgets-gallery/shared/build.gradle.kts b/examples/widgets-gallery/shared/build.gradle.kts index cc7e9504621..b5eac0c1f20 100644 --- a/examples/widgets-gallery/shared/build.gradle.kts +++ b/examples/widgets-gallery/shared/build.gradle.kts @@ -63,14 +63,14 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].res.srcDirs("src/androidMain/res") sourceSets["main"].resources.srcDirs("src/commonMain/resources") defaultConfig { minSdk = 26 - targetSdk = 33 + targetSdk = 34 } compileOptions { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index 2e0898d84f2..a1d51cfb14b 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -2,7 +2,7 @@ org.gradle.parallel=true kotlin.code.style=official # Default version of Compose Libraries used by Gradle plugin -compose.version=1.5.0-dev1122 +compose.version=1.5.0-rc04 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI. compose.tests.compiler.version=1.5.0 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI. diff --git a/tutorials/HTML/Getting_Started/README.md b/tutorials/HTML/Getting_Started/README.md index 73f3a797af7..888071b898d 100644 --- a/tutorials/HTML/Getting_Started/README.md +++ b/tutorials/HTML/Getting_Started/README.md @@ -37,7 +37,7 @@ pluginManagement { // Add compose gradle plugin plugins { kotlin("multiplatform") version "1.9.0" - id("org.jetbrains.compose") version "1.4.3" + id("org.jetbrains.compose") version "1.5.0-rc04" } // Add maven repositories