From b3a4cbc9f3643b92092dcf4c3f972ed7aadd6f30 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Thu, 26 Aug 2021 14:49:35 +0300 Subject: [PATCH] Update Compose --- compose/.run/build extended icons.run.xml | 2 +- compose/.run/build.run.xml | 2 +- .../publish (without Android Layout Inspector).run.xml | 2 +- compose/README.md | 5 ++--- compose/frameworks/support | 2 +- compose/golden | 2 +- compose/gradle/wrapper/gradle-wrapper.properties | 2 +- compose/prebuilts/androidx/internal | 2 +- compose/scripts/downloadAndroidSdk | 10 ++++++---- compose/scripts/prepare | 2 +- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/compose/.run/build extended icons.run.xml b/compose/.run/build extended icons.run.xml index b02cd3b814..397e072f21 100644 --- a/compose/.run/build extended icons.run.xml +++ b/compose/.run/build extended icons.run.xml @@ -4,7 +4,7 @@ diff --git a/compose/.run/build.run.xml b/compose/.run/build.run.xml index 4f02a631a2..e92e4e0022 100644 --- a/compose/.run/build.run.xml +++ b/compose/.run/build.run.xml @@ -4,7 +4,7 @@ diff --git a/compose/.run/publish (without Android Layout Inspector).run.xml b/compose/.run/publish (without Android Layout Inspector).run.xml index 95fcf49e1e..3583bc2f45 100644 --- a/compose/.run/publish (without Android Layout Inspector).run.xml +++ b/compose/.run/publish (without Android Layout Inspector).run.xml @@ -4,7 +4,7 @@ diff --git a/compose/README.md b/compose/README.md index 83c4cfb69a..1e48dc340f 100644 --- a/compose/README.md +++ b/compose/README.md @@ -15,13 +15,13 @@ git config --global submodule.recurse true - Java 11 (should be specified in JAVA_HOME) - [macOs/Linux] Android SDK downloaded via `./scripts/downloadAndroidSdk` - [Windows] Android SDK downloaded from Android Studio and specified in ANDROID_SDK_ROOT. Required components: - - Android 11 + - Android 12 - Build-Tools 30.0.3 - NDK 21.3.6528147 (in folder $androidSdk/ndk, not in $androidSdk/ndk/$version) - CMake 3.10.2.4988404 (in folder $androidSdk/cmake, not in $androidSdk/cmake/$version) ## Requirements to develop in IDE -- Android Studio Arctic Fox +- Android Studio 2021.1.1 Canary 8 (https://developer.android.com/studio/archive) - Custom Gradle 7.1 specified in `Settings -> Build, Execution, Deployment -> Build Tools -> Gradle` (because Android Studio will pick the wrong Gradle in the subproject instead of the Gradle in the root project) - Specified Gradle JDK 11 in `... -> Build Tools -> Gradle` - Environment variables: @@ -29,7 +29,6 @@ git config --global submodule.recurse true export ALLOW_PUBLIC_REPOS=1 export JAVA_TOOLS_JAR=$PWD/external/tools.jar export ANDROIDX_PROJECTS=COMPOSE -export COMPOSE_CUSTOM_GROUP=org.jetbrains.compose ``` - Gradle properties in ~/.gradle/gradle.properties: ``` diff --git a/compose/frameworks/support b/compose/frameworks/support index 30f010967c..efb2046671 160000 --- a/compose/frameworks/support +++ b/compose/frameworks/support @@ -1 +1 @@ -Subproject commit 30f010967cd12643134a80269c7eb2de65b2332b +Subproject commit efb20466711ebf8a29299d8d76de3ef4b1da741f diff --git a/compose/golden b/compose/golden index 1b20aa5514..2bc172b3d3 160000 --- a/compose/golden +++ b/compose/golden @@ -1 +1 @@ -Subproject commit 1b20aa551446123340cb42b4eb21d2f2797e608a +Subproject commit 2bc172b3d36904e78780624700c0d188acd83e1a diff --git a/compose/gradle/wrapper/gradle-wrapper.properties b/compose/gradle/wrapper/gradle-wrapper.properties index 1acc777d74..ffed3a254e 100644 --- a/compose/gradle/wrapper/gradle-wrapper.properties +++ b/compose/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-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/compose/prebuilts/androidx/internal b/compose/prebuilts/androidx/internal index 818a882ba7..c93d857e3c 160000 --- a/compose/prebuilts/androidx/internal +++ b/compose/prebuilts/androidx/internal @@ -1 +1 @@ -Subproject commit 818a882ba70e8603d6a22b17d421c9049926da4c +Subproject commit c93d857e3c972842489c8115fd6d3f2ff8e404e1 diff --git a/compose/scripts/downloadAndroidSdk b/compose/scripts/downloadAndroidSdk index 7f438aa19d..c06c08feb4 100755 --- a/compose/scripts/downloadAndroidSdk +++ b/compose/scripts/downloadAndroidSdk @@ -12,9 +12,11 @@ clone() { popd } +# Commit hashes and sdk versions from default.xml (git clone --branch androidx-main https://android.googlesource.com/platform/manifest) + downloadLinuxSDK() { - clone ../prebuilts/fullsdk-linux/platforms/android-30 https://android.googlesource.com/platform/prebuilts/fullsdk/platforms/android-30 master - clone ../prebuilts/fullsdk-linux/sources/android-30 https://android.googlesource.com/platform/prebuilts/fullsdk/sources/android-30 master + clone ../prebuilts/fullsdk-linux/platforms/android-31 https://android.googlesource.com/platform/prebuilts/fullsdk/platforms/android-31 master + clone ../prebuilts/fullsdk-linux/sources/android-31 https://android.googlesource.com/platform/prebuilts/fullsdk/sources/android-31 master clone ../prebuilts/fullsdk-linux/ndk https://android.googlesource.com/toolchain/prebuilts/ndk/r21 master clone ../prebuilts/fullsdk-linux/build-tools/30.0.3 https://android.googlesource.com/platform/prebuilts/fullsdk-linux/build-tools/30.0.3 master clone ../prebuilts/fullsdk-linux/platform-tools https://android.googlesource.com/platform/prebuilts/fullsdk-linux/platform-tools master @@ -23,8 +25,8 @@ downloadLinuxSDK() { } downloadMacOsSDK() { - clone ../prebuilts/fullsdk-darwin/platforms/android-30 https://android.googlesource.com/platform/prebuilts/fullsdk/platforms/android-30 master - clone ../prebuilts/fullsdk-darwin/sources/android-30 https://android.googlesource.com/platform/prebuilts/fullsdk/sources/android-30 master + clone ../prebuilts/fullsdk-darwin/platforms/android-31 https://android.googlesource.com/platform/prebuilts/fullsdk/platforms/android-31 master + clone ../prebuilts/fullsdk-darwin/sources/android-31 https://android.googlesource.com/platform/prebuilts/fullsdk/sources/android-31 master clone ../prebuilts/fullsdk-darwin/ndk https://android.googlesource.com/toolchain/prebuilts/ndk-darwin/r21 master clone ../prebuilts/fullsdk-darwin/build-tools/30.0.3 https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/build-tools/30.0.3 master clone ../prebuilts/fullsdk-darwin/platform-tools https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/platform-tools master diff --git a/compose/scripts/prepare b/compose/scripts/prepare index 63be054ca7..57dec964e5 100755 --- a/compose/scripts/prepare +++ b/compose/scripts/prepare @@ -6,4 +6,4 @@ export ALLOW_PUBLIC_REPOS=1 export JAVA_TOOLS_JAR=$SCRIPT_DIR/../external/tools.jar export ANDROIDX_PROJECTS=COMPOSE export COMPOSE_CUSTOM_GROUP=org.jetbrains.compose -export COMPOSE_DEFAULT_GRADLE_ARGS="-Pandroidx.compose.multiplatformEnabled=true -Pandroidx.versionExtraCheckEnabled=false -Pandroidx.alternativeProjectUrl=https://github.com/JetBrains/compose-jb -Pandroidx.compose.jsCompilerTestsEnabled=true" \ No newline at end of file +export COMPOSE_DEFAULT_GRADLE_ARGS="-Pandroidx.compose.multiplatformEnabled=true -Pandroidx.versionExtraCheckEnabled=false -Pandroidx.alternativeProjectUrl=https://github.com/JetBrains/compose-jb -Pandroidx.compose.jsCompilerTestsEnabled=true -Pandroidx.validateProjectStructure=false" \ No newline at end of file