From 23921ae3ff0e6d6406554c640147b3ca43fd9285 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov <654232+AlexeyTsvetkov@users.noreply.github.com> Date: Tue, 18 Jan 2022 11:17:15 +0300 Subject: [PATCH] Downgrade prebuilt cmake version (#1704) Otherwise, new clean builds fail with error: ``` A problem occurred configuring project ':support:compose:ui:ui-inspection'. > Failed to notify project evaluation listener. > com.android.builder.errors.EvalIssueException: [CXX1300] CMake '3.18.1' was not found in SDK, PATH, or by cmake.dir property. > The androidx.inspection plugin requires release build variant. ``` --- compose/scripts/downloadAndroidSdk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/scripts/downloadAndroidSdk b/compose/scripts/downloadAndroidSdk index ce49ea7ff5..9f84a51d00 100755 --- a/compose/scripts/downloadAndroidSdk +++ b/compose/scripts/downloadAndroidSdk @@ -21,7 +21,7 @@ downloadLinuxSDK() { 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 clone ../prebuilts/fullsdk-linux/tools https://android.googlesource.com/platform/prebuilts/fullsdk-linux/tools master - clone ../prebuilts/fullsdk-linux/cmake https://android.googlesource.com/platform/prebuilts/cmake/linux-x86 master + clone ../prebuilts/fullsdk-linux/cmake https://android.googlesource.com/platform/prebuilts/cmake/linux-x86 b0bbb39ad35994d10722ed60f244fe3015bdc856 clone ../prebuilts/fullsdk-linux/ninja https://android.googlesource.com/platform/prebuilts/ninja/linux-x86 master } @@ -32,7 +32,7 @@ downloadMacOsSDK() { 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 clone ../prebuilts/fullsdk-darwin/tools https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/tools master - clone ../prebuilts/fullsdk-darwin/cmake https://android.googlesource.com/platform/prebuilts/cmake/darwin-x86 master + clone ../prebuilts/fullsdk-darwin/cmake https://android.googlesource.com/platform/prebuilts/cmake/darwin-x86 d09ee7574f3e46668b23b3b6efebd0ea75de85b2 clone ../prebuilts/fullsdk-darwin/ninja https://android.googlesource.com/platform/prebuilts/ninja/darwin-x86 master }