From 3221d7c3069c92a294e91aa9bd24e87e8eb55928 Mon Sep 17 00:00:00 2001 From: dima-avdeev-jb <99798741+dima-avdeev-jb@users.noreply.github.com> Date: Mon, 2 May 2022 18:44:34 +0300 Subject: [PATCH] update experimental samples compose (1.2.0-alpha01-dev675) and kotlin version (1.6.21) (#2047) * update compose version in experimental/examples (version 1.2.0-alpha01-dev675) * experimental/examples kotlin 1.6.21 * experimental/samples gradle wrapper 7.4.2 --- experimental/examples/falling-balls-mpp/build.gradle.kts | 3 --- experimental/examples/falling-balls-mpp/gradle.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- experimental/examples/minesweeper/build.gradle.kts | 8 ++++---- .../minesweeper/gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/experimental/examples/falling-balls-mpp/build.gradle.kts b/experimental/examples/falling-balls-mpp/build.gradle.kts index 3ace2987f1..9d18a6f547 100644 --- a/experimental/examples/falling-balls-mpp/build.gradle.kts +++ b/experimental/examples/falling-balls-mpp/build.gradle.kts @@ -163,9 +163,6 @@ compose.experimental { //Usage: ./gradlew iosDeployIPadDebug device = IOSDevices.IPAD_MINI_6th_Gen } - connectedDevice("Device") { - //Usage: ./gradlew iosDeployDeviceRelease - } } } } diff --git a/experimental/examples/falling-balls-mpp/gradle.properties b/experimental/examples/falling-balls-mpp/gradle.properties index d0c69fe7c3..e9690b1a9a 100644 --- a/experimental/examples/falling-balls-mpp/gradle.properties +++ b/experimental/examples/falling-balls-mpp/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx3g -compose.version=1.2.0-alpha01-dev620 -kotlin.version=1.6.10 +compose.version=1.2.0-alpha01-dev675 +kotlin.version=1.6.21 kotlin.code.style=official kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true diff --git a/experimental/examples/falling-balls-mpp/gradle/wrapper/gradle-wrapper.properties b/experimental/examples/falling-balls-mpp/gradle/wrapper/gradle-wrapper.properties index 2e6e5897b5..aa991fceae 100644 --- a/experimental/examples/falling-balls-mpp/gradle/wrapper/gradle-wrapper.properties +++ b/experimental/examples/falling-balls-mpp/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/experimental/examples/minesweeper/build.gradle.kts b/experimental/examples/minesweeper/build.gradle.kts index cb6a9a6792..7b8c600470 100644 --- a/experimental/examples/minesweeper/build.gradle.kts +++ b/experimental/examples/minesweeper/build.gradle.kts @@ -15,8 +15,8 @@ buildscript { } plugins { - kotlin("multiplatform") version "1.6.10" - id("org.jetbrains.compose") version "1.2.0-alpha01-dev620" + kotlin("multiplatform") version "1.6.21" + id("org.jetbrains.compose") version "1.2.0-alpha01-dev675" } version = "1.0-SNAPSHOT" @@ -164,9 +164,9 @@ compose.experimental { //Usage: ./gradlew iosDeployIPadDebug device = IOSDevices.IPAD_MINI_6th_Gen } - connectedDevice("Device") { +// connectedDevice("Device") { //todo lazy init (compose.ios.teamId=*** in local.properties) //Usage: ./gradlew iosDeployDeviceRelease - } +// } } } } diff --git a/experimental/examples/minesweeper/gradle/wrapper/gradle-wrapper.properties b/experimental/examples/minesweeper/gradle/wrapper/gradle-wrapper.properties index 05679dc3c1..aa991fceae 100644 --- a/experimental/examples/minesweeper/gradle/wrapper/gradle-wrapper.properties +++ b/experimental/examples/minesweeper/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists