Update versions: compose - 1.3.0 and kotlin - 1.8.0 (#2651)

* Update versions in examples * Add more scripts to validate example on android and k/js * Add validateExamplesIos.sh * Update CHANGELOG.md for 1.3.0 * check examples with 1.3.0-rc06 * Update the versions: compose-multiplatform - 1.3.0, kotlin - 1.8.0 * Update ComposeCompilerCompatibility (1.4.0) * Update web/yarn.lock
JetBrains · Jan 30, 2023 · bc6d42e · bc6d42e
1 parent 8f3beed
commit bc6d42e
Show file tree

Hide file tree

Showing 54 changed files with 307 additions and 109 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,33 @@
+# 1.3.0 (January 2023)
+
+## Common
+
+### Fixes
+- [Fix configuration cache issues](https://github.com/JetBrains/compose-jb/pull/2607)
+- [Use global directory to download wix toolset](https://github.com/JetBrains/compose-jb/pull/2639)
+- [IDEA plugin - Redo: set until-build to undefined value](https://github.com/JetBrains/compose-jb/pull/2658)
+
+## Desktop
+
+### Features
+- [Desktop AlertDialog scrim color](https://github.com/JetBrains/androidx/pull/358)
+- [Material 3 DropdownMenu Skiko support](https://github.com/JetBrains/androidx/pull/347)
+
+### Fixes
+- [Fix San Francisco font as a default (macOS)](https://github.com/JetBrains/androidx/pull/343)
+- [Make ScrollbarAdapter for LazyList take contentPadding into account](https://github.com/JetBrains/androidx/pull/365)
+- [Fix AlertDialog dismiss on click to Dialog content](https://github.com/JetBrains/androidx/pull/359)
+- [Fix shaky scrolling of LazyColumn when the items are of varying size](https://github.com/JetBrains/androidx/pull/362)
+
+## Dependencies
+This version of Compose Multiplatform is based on the next Jetpack Compose libraries:
+- [Compiler 1.4.0](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.4.0)
+- [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.2.2 (December 2022)
 
 ## Desktop

diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties
@@ -1,2 +1,2 @@
-compose.version=1.2.2
+compose.version=1.3.0
 kotlin.code.style=official
diff --git a/components/gradle.properties b/components/gradle.properties
@@ -3,9 +3,9 @@ android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
 # __KOTLIN_COMPOSE_VERSION__
-kotlin.version=1.7.20
+kotlin.version=1.8.0
 # __LATEST_COMPOSE_RELEASE_VERSION__
-compose.version=1.3.0-beta02
+compose.version=1.3.0
 agp.version=7.3.1
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true

diff --git a/examples/codeviewer/android/build.gradle.kts b/examples/codeviewer/android/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
     }
@@ -23,4 +23,4 @@ android {
 dependencies {
     implementation(project(":common"))
     implementation("androidx.activity:activity-compose:1.5.0")
-}
+}
diff --git a/examples/codeviewer/common/build.gradle.kts b/examples/codeviewer/common/build.gradle.kts
@@ -34,11 +34,11 @@ kotlin {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
     }
 
     sourceSets {

diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties
@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.7.20
+kotlin.version=1.8.0
 agp.version=7.1.3
-compose.version=1.2.2
+compose.version=1.3.0
diff --git a/examples/falling-balls/gradle.properties b/examples/falling-balls/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.7.20
-compose.version=1.2.2
+kotlin.version=1.8.0
+compose.version=1.3.0
diff --git a/examples/imageviewer/android/build.gradle.kts b/examples/imageviewer/android/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/examples/imageviewer/common/build.gradle.kts b/examples/imageviewer/common/build.gradle.kts
@@ -33,11 +33,11 @@ kotlin {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
     }
 
     compileOptions {

diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties
@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.7.20
+kotlin.version=1.8.0
 agp.version=7.1.3
-compose.version=1.2.2
+compose.version=1.3.0
diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.7.20
-compose.version=1.2.2
+kotlin.version=1.8.0
+compose.version=1.3.0
diff --git a/examples/issues/android/build.gradle.kts b/examples/issues/android/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/examples/issues/common/build.gradle.kts b/examples/issues/common/build.gradle.kts
@@ -38,11 +38,11 @@ apollo {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
     }
 
     compileOptions {

diff --git 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.7.20
+kotlin.version=1.8.0
 agp.version=7.1.3
-compose.version=1.2.2
+compose.version=1.3.0
diff --git 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.7.20
-compose.version=1.2.2
+kotlin.version=1.8.0
+compose.version=1.3.0
diff --git a/examples/todoapp-lite/android/build.gradle.kts b/examples/todoapp-lite/android/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/examples/todoapp-lite/common/build.gradle.kts b/examples/todoapp-lite/common/build.gradle.kts
@@ -20,11 +20,11 @@ kotlin {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
     }
 
     compileOptions {

diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties
@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.7.20
+kotlin.version=1.8.0
 agp.version=7.1.3
-compose.version=1.2.2
+compose.version=1.3.0
diff --git a/examples/todoapp/gradle.properties b/examples/todoapp/gradle.properties
@@ -27,5 +27,5 @@ kotlin.native.disableCompilerDaemon=true
 # After updating Compose Multiplatform version, update corresponding Jetpack Compose versions
 # in Android module (search "Workaround for https://github.com/JetBrains/compose-jb/issues/2340")
 #TODO also change version in buildSrc/gradle.properties
-kotlin.version=1.7.20
-compose.version=1.2.2
+kotlin.version=1.8.0
+compose.version=1.3.0
diff --git a/examples/validateExamplesAndroid.sh b/examples/validateExamplesAndroid.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Script to build most of the examples, to verify if they can compile.
+# Don't add examples, which don't depend on maven.pkg.jetbrains.space, because they won't be able to compile.
+
+set -euo pipefail
+
+if [ "$#" -ne 2 ]; then
+echo "Specify Compose and Kotlin version. For example: ./validateExamplesAndroid.sh 1.1.1 1.6.10"
+exit 1
+fi
+COMPOSE_VERSION=$1
+KOTLIN_VERSION=$2
+
+
+runGradle() {
+    pushd $1
+    ./gradlew $2 -Pcompose.version=$COMPOSE_VERSION -Pkotlin.version=$KOTLIN_VERSION --rerun-tasks
+    popd
+}
+
+# requires an emulator running or an Android device to be connected
+runGradle codeviewer installDebug
+runGradle imageviewer installDebug
+runGradle issues installDebug
+runGradle todoapp-lite installDebug
+runGradle widgets-gallery installDebug
+runGradle todoapp installDebug
diff --git a/examples/visual-effects/gradle.properties b/examples/visual-effects/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.7.20
-compose.version=1.2.2
+kotlin.version=1.8.0
+compose.version=1.3.0
diff --git a/examples/web-compose-bird/gradle.properties b/examples/web-compose-bird/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.7.20
-compose.version=1.2.2
+kotlin.version=1.8.0
+compose.version=1.3.0
diff --git a/examples/web-compose-in-js/gradle.properties b/examples/web-compose-in-js/gradle.properties
@@ -2,5 +2,5 @@ kotlin.code.style=official
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.js.webpack.major.version=4
-kotlin.version=1.7.20
-compose.version=1.2.2
+kotlin.version=1.8.0
+compose.version=1.3.0
diff --git a/examples/web-landing/gradle.properties b/examples/web-landing/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.7.20
-compose.version=1.2.2
+kotlin.version=1.8.0
+compose.version=1.3.0
diff --git a/examples/web-with-react/gradle.properties b/examples/web-with-react/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.7.20
-compose.version=1.2.2
+kotlin.version=1.8.0
+compose.version=1.3.0
diff --git a/examples/widgets-gallery/android/build.gradle.kts b/examples/widgets-gallery/android/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
     }
@@ -23,4 +23,4 @@ android {
 dependencies {
     implementation(project(":common"))
     implementation("androidx.activity:activity-compose:1.5.0")
-}
+}
diff --git a/examples/widgets-gallery/common/build.gradle.kts b/examples/widgets-gallery/common/build.gradle.kts
@@ -32,11 +32,11 @@ kotlin {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
     }
 
     compileOptions {
@@ -50,4 +50,4 @@ android {
             res.srcDirs("src/androidMain/res", "src/commonMain/resources")
         }
     }
-}
+}
diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties
@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.7.20
-compose.version=1.2.2
+kotlin.version=1.8.0
+compose.version=1.3.0
 agp.version=7.1.3
diff --git a/experimental/examples/chat-mpp/gradle.properties b/experimental/examples/chat-mpp/gradle.properties
@@ -12,6 +12,6 @@ kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.7.20
+kotlin.version=1.8.0
 agp.version=7.1.3
-compose.version=1.2.1
+compose.version=1.3.0
diff --git a/experimental/examples/codeviewer/gradle.properties b/experimental/examples/codeviewer/gradle.properties
@@ -12,6 +12,6 @@ kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.7.20
+kotlin.version=1.8.0
 agp.version=7.1.3
-compose.version=1.3.0-beta04-dev885
+compose.version=1.3.0
diff --git a/experimental/examples/falling-balls-mpp/gradle.properties b/experimental/examples/falling-balls-mpp/gradle.properties
@@ -12,6 +12,6 @@ kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.7.20
+kotlin.version=1.8.0
 agp.version=7.1.3
-compose.version=1.2.1
+compose.version=1.3.0
diff --git a/experimental/examples/imageviewer/gradle.properties b/experimental/examples/imageviewer/gradle.properties
@@ -12,7 +12,7 @@ kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.7.20
+kotlin.version=1.8.0
 agp.version=7.1.3
-compose.version=1.2.2
+compose.version=1.3.0
 ktor.version=2.2.1
diff --git a/experimental/examples/intellij-plugin-with-experimental-shared-base/gradle.properties b/experimental/examples/intellij-plugin-with-experimental-shared-base/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.stdlib.default.dependency=false
 kotlin.code.style=official
-kotlin.version=1.7.10
-compose.version=1.2.0
+kotlin.version=1.8.0
+compose.version=1.3.0
 
diff --git a/experimental/examples/minesweeper/gradle.properties b/experimental/examples/minesweeper/gradle.properties
@@ -12,6 +12,6 @@ kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.7.20
+kotlin.version=1.8.0
 agp.version=7.1.3
-compose.version=1.3.0-beta04-dev885
+compose.version=1.3.0