File tree Expand file tree Collapse file tree 2 files changed +13
-5
lines changed Expand file tree Collapse file tree 2 files changed +13
-5
lines changed Original file line number Diff line number Diff line change 11#! /usr/bin/env ksh
2- # -*- coding: utf-8 -*-
2+ # -*- coding: utf-8 -*-
Original file line number Diff line number Diff line change @@ -12,14 +12,22 @@ function core::internal::android::install {
1212 touch " ${ANDROID_FILE_REPOSITORIES} "
1313 mkdir -p " ${ANDROID_HOME} "
1414
15- [ " $( ! core::exists java) " ] && brew install openjdk@11 openjdk@17
16- [ " $( ! core::exists sdkmanager) " ] && brew install android-commandlinetools
15+ if ! core::exists java; then
16+ brew install openjdk@11 openjdk@17 openjdk@21
17+ fi
18+
19+ if ! core::exists sdkmanager; then
20+ brew install android-commandlinetools
21+ mkdir -p " $ANDROID_HOME /cmdline-tools/latest"
22+ cp -R " $( brew --prefix) /share/android-commandlinetools/" * " $ANDROID_HOME /cmdline-tools/latest/"
23+ fi
1724
1825 sdkmanager --update --sdk_root=" ${ANDROID_HOME} "
19- sdkmanager --install " cmdline-tools;latest" --sdk_root=" ${ANDROID_HOME} "
26+
27+ yes | sdkmanager " cmdline-tools;latest" --sdk_root=" ${ANDROID_HOME} "
2028 yes | sdkmanager " platforms;android-${ANDROID_PLATFORM_VERSION} " --sdk_root=" ${ANDROID_HOME} "
2129 yes | sdkmanager " platform-tools" --sdk_root=" ${ANDROID_HOME} "
22- yes | sdkmanager " platform-tools " " build-tools;${ANDROID_SDK_VERSION} " --sdk_root=" ${ANDROID_HOME} "
30+ yes | sdkmanager " build-tools;${ANDROID_SDK_VERSION} " --sdk_root=" ${ANDROID_HOME} "
2331 yes | sdkmanager " extras;google;m2repository" --sdk_root=" ${ANDROID_HOME} "
2432 yes | sdkmanager " extras;android;m2repository" --sdk_root=" ${ANDROID_HOME} "
2533
You can’t perform that action at this time.
0 commit comments