feat: Update JDK installation and enhance Android SDK setup for cross-platform compatibility
This commit is contained in:
@@ -35,18 +35,27 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
if java -version 2>&1 | grep -q "17"; then
|
if java -version 2>&1 | grep -q "17"; then
|
||||||
echo "JDK 17 is already installed"
|
echo "JDK 17 is already installed"
|
||||||
else
|
elif command -v apt-get &> /dev/null; then
|
||||||
|
sudo apt-get update && sudo apt-get install -y openjdk-17-jdk
|
||||||
|
echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64" >> $GITHUB_ENV
|
||||||
|
elif command -v brew &> /dev/null; then
|
||||||
brew install openjdk@17
|
brew install openjdk@17
|
||||||
sudo ln -sfn "$(brew --prefix openjdk@17)/libexec/openjdk.jdk" /Library/Java/JavaVirtualMachines/openjdk-17.jdk
|
sudo ln -sfn "$(brew --prefix openjdk@17)/libexec/openjdk.jdk" /Library/Java/JavaVirtualMachines/openjdk-17.jdk
|
||||||
fi
|
|
||||||
echo "JAVA_HOME=$(/usr/libexec/java_home -v 17)" >> $GITHUB_ENV
|
echo "JAVA_HOME=$(/usr/libexec/java_home -v 17)" >> $GITHUB_ENV
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Install Android SDK
|
- name: Install Android SDK
|
||||||
run: |
|
run: |
|
||||||
export ANDROID_HOME="$HOME/android-sdk"
|
export ANDROID_HOME="$HOME/android-sdk"
|
||||||
mkdir -p "$ANDROID_HOME/cmdline-tools"
|
mkdir -p "$ANDROID_HOME/cmdline-tools"
|
||||||
if [ ! -d "$ANDROID_HOME/cmdline-tools/latest" ]; then
|
if [ ! -d "$ANDROID_HOME/cmdline-tools/latest" ]; then
|
||||||
curl -sL https://dl.google.com/android/repository/commandlinetools-mac-11076708_latest.zip -o /tmp/cmdline-tools.zip
|
OS_NAME="$(uname -s)"
|
||||||
|
if [ "$OS_NAME" = "Darwin" ]; then
|
||||||
|
SDK_URL="https://dl.google.com/android/repository/commandlinetools-mac-11076708_latest.zip"
|
||||||
|
else
|
||||||
|
SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip"
|
||||||
|
fi
|
||||||
|
curl -sL "$SDK_URL" -o /tmp/cmdline-tools.zip
|
||||||
unzip -q /tmp/cmdline-tools.zip -d "$ANDROID_HOME/cmdline-tools"
|
unzip -q /tmp/cmdline-tools.zip -d "$ANDROID_HOME/cmdline-tools"
|
||||||
mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest"
|
mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest"
|
||||||
rm /tmp/cmdline-tools.zip
|
rm /tmp/cmdline-tools.zip
|
||||||
@@ -59,6 +68,9 @@ jobs:
|
|||||||
echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
|
echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
|
||||||
echo "ANDROID_SDK_ROOT=$ANDROID_HOME" >> $GITHUB_ENV
|
echo "ANDROID_SDK_ROOT=$ANDROID_HOME" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Create google-services.json
|
||||||
|
run: echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 -d > app/google-services.json
|
||||||
|
|
||||||
- name: Setup Gradle wrapper
|
- name: Setup Gradle wrapper
|
||||||
run: |
|
run: |
|
||||||
chmod +x ./gradlew
|
chmod +x ./gradlew
|
||||||
|
|||||||
Reference in New Issue
Block a user