From b1fe574a7ec358bcd4438d158b3145a7c26b0f87 Mon Sep 17 00:00:00 2001 From: "dima.avdeev" <99798741+dima-avdeev-jb@users.noreply.github.com> Date: Thu, 23 Jun 2022 20:08:19 +0300 Subject: [PATCH] update uikit sample to compose version 1.2.0 alpha01 dev724 (#2137) --- experimental/examples/falling-balls-mpp/README.md | 4 +--- experimental/examples/falling-balls-mpp/build.gradle.kts | 5 +++++ experimental/examples/falling-balls-mpp/gradle.properties | 3 ++- experimental/examples/minesweeper/README.md | 4 ++++ experimental/examples/minesweeper/build.gradle.kts | 8 +++++--- experimental/examples/minesweeper/gradle.properties | 1 + 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/experimental/examples/falling-balls-mpp/README.md b/experimental/examples/falling-balls-mpp/README.md index 1d1e9df285..b1ef1a3d8c 100644 --- a/experimental/examples/falling-balls-mpp/README.md +++ b/experimental/examples/falling-balls-mpp/README.md @@ -29,8 +29,6 @@ After a successful launch on the device - you can delete this temporary project. Certificates will remain in login.keychain ## Run on iOS device - - set teamId in local.properties - - In build.gradle.kts -add block `connectedDevice("Device") { }` to compose.experimental.uikit.application.deployConfigurations + - Set teamId in build.gradle.kts, or set in local.properties (compose.ios.teamId=***) - `./gradlew iosDeployDeviceRelease` - During the build, you will be prompted to access login.keychain diff --git a/experimental/examples/falling-balls-mpp/build.gradle.kts b/experimental/examples/falling-balls-mpp/build.gradle.kts index 9d18a6f547..c5a80129cf 100644 --- a/experimental/examples/falling-balls-mpp/build.gradle.kts +++ b/experimental/examples/falling-balls-mpp/build.gradle.kts @@ -163,6 +163,11 @@ compose.experimental { //Usage: ./gradlew iosDeployIPadDebug device = IOSDevices.IPAD_MINI_6th_Gen } + connectedDevice("Device") { + //First need specify your teamId here, or in local.properties (compose.ios.teamId=***) + //teamId="***" + //Usage: ./gradlew iosDeployDeviceRelease + } } } } diff --git a/experimental/examples/falling-balls-mpp/gradle.properties b/experimental/examples/falling-balls-mpp/gradle.properties index a5a651e452..ea951222ab 100644 --- a/experimental/examples/falling-balls-mpp/gradle.properties +++ b/experimental/examples/falling-balls-mpp/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx3g -compose.version=1.2.0-alpha01-dev716 +compose.version=1.2.0-alpha01-dev724 kotlin.version=1.6.21 kotlin.code.style=official kotlin.native.cacheKind=none @@ -8,3 +8,4 @@ kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental +compose.desktop.verbose=true diff --git a/experimental/examples/minesweeper/README.md b/experimental/examples/minesweeper/README.md index cb98fe7730..0807d51dc4 100644 --- a/experimental/examples/minesweeper/README.md +++ b/experimental/examples/minesweeper/README.md @@ -9,5 +9,9 @@ A simple game powered by Compose Multiplatform `./gradlew iosDeployIPhone8Debug` `./gradlew iosDeployIPadDebug` +## Run on iOS device +- Read about iOS target in [falling-balls-mpp/README.md](../falling-balls-mpp/README.md) +- `./gradlew iosDeployDeviceRelease` + ## Credits
Icons made by Creaticca Creative Agency from www.flaticon.com
\ No newline at end of file diff --git a/experimental/examples/minesweeper/build.gradle.kts b/experimental/examples/minesweeper/build.gradle.kts index 7954b230eb..be0cc4d795 100644 --- a/experimental/examples/minesweeper/build.gradle.kts +++ b/experimental/examples/minesweeper/build.gradle.kts @@ -16,7 +16,7 @@ buildscript { plugins { kotlin("multiplatform") version "1.6.21" - id("org.jetbrains.compose") version "1.2.0-alpha01-dev716" + id("org.jetbrains.compose") version "1.2.0-alpha01-dev724" } version = "1.0-SNAPSHOT" @@ -164,9 +164,11 @@ compose.experimental { //Usage: ./gradlew iosDeployIPadDebug device = IOSDevices.IPAD_MINI_6th_Gen } -// connectedDevice("Device") { //todo lazy init (compose.ios.teamId=*** in local.properties) + connectedDevice("Device") { + //First need specify your teamId here, or in local.properties (compose.ios.teamId=***) + //teamId="***" //Usage: ./gradlew iosDeployDeviceRelease -// } + } } } } diff --git a/experimental/examples/minesweeper/gradle.properties b/experimental/examples/minesweeper/gradle.properties index 8a3a400651..a0fbe1f957 100644 --- a/experimental/examples/minesweeper/gradle.properties +++ b/experimental/examples/minesweeper/gradle.properties @@ -5,3 +5,4 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true kotlin.native.enableDependencyPropagation=false # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental +compose.desktop.verbose=true