@@ -27,31 +27,34 @@ jobs:
2727 distribution : temurin
2828 java-version : ' 17'
2929
30- - name : Install Gradle 8.7
30+ - name : Install Gradle & Android SDK
3131 run : |
32+ # Install Gradle 8.7
3233 wget -q https://services.gradle.org/distributions/gradle-8.7-bin.zip -O /tmp/gradle.zip
3334 sudo unzip -q /tmp/gradle.zip -d /opt
34- echo "/opt/gradle-8.7/bin" >> $GITHUB_PATH
3535
36- - name : Setup Android SDK
37- run : |
38- export SDK=/usr/local/lib/android/sdk
39- echo "ANDROID_HOME=$SDK "
40- # Ensure required platform is installed
41- if [ ! -d "$ SDK/platforms/android-34" ]; then
42- echo "Installing android-34 platform..."
43- if [ -f "$SDK /cmdline-tools/latest/bin/sdkmanager" ]; then
44- yes | $SDK /cmdline-tools/latest/bin/sdkmanager --licenses > /dev/null 2>&1 || true
45- $SDK/cmdline-tools/latest/bin/sdkmanager "platforms;android-34" > /dev/null 2>&1
46- fi
36+ # Setup Android SDK
37+ export ANDROID_SDK_ROOT=/usr/local/lib/android/sdk
38+ echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
39+ ls -la $ANDROID_SDK_ROOT/platforms/ 2>/dev/null || echo "Initial platforms: (empty) "
40+
41+ # Install required SDK components
42+ if [ -f "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" ]; then
43+ yes | $ANDROID_SDK_ROOT /cmdline-tools/latest/bin/sdkmanager --licenses 2>/dev/null || true
44+ $ANDROID_SDK_ROOT /cmdline-tools/latest/bin/sdkmanager \
45+ "platforms;android-34" \
46+ "build-tools;34.0.0" 2>&1 | tail -5
4747 fi
48- echo "sdk.dir=$SDK" > android/local.properties
48+
49+ # Create local.properties
50+ echo "sdk.dir=$ANDROID_SDK_ROOT" > android/local.properties
51+ echo "Gradle installed. Android SDK ready."
4952
5053 - name : Run unit tests
5154 working-directory : android
5255 run : /opt/gradle-8.7/bin/gradle testDebugUnitTest 2>&1 | tail -60
5356 env :
54- ANDROID_HOME : /usr/local/lib/android/sdk
57+ ANDROID_SDK_ROOT : /usr/local/lib/android/sdk
5558
5659 - name : Upload test reports
5760 uses : actions/upload-artifact@v4
@@ -75,33 +78,37 @@ jobs:
7578 distribution : temurin
7679 java-version : ' 17'
7780
78- - name : Install Gradle 8.7
81+ - name : Install Gradle & Android SDK
7982 run : |
83+ # Install Gradle 8.7
8084 wget -q https://services.gradle.org/distributions/gradle-8.7-bin.zip -O /tmp/gradle.zip
8185 sudo unzip -q /tmp/gradle.zip -d /opt
8286
83- - name : Setup Android SDK
84- run : |
85- export SDK=/usr/local/lib/android/sdk
86- if [ ! -d "$SDK/platforms/android-34" ]; then
87- if [ -f "$SDK/cmdline-tools/latest/bin/sdkmanager" ]; then
88- yes | $SDK/cmdline-tools/latest/bin/sdkmanager --licenses > /dev/null 2>&1 || true
89- $SDK/cmdline-tools/latest/bin/sdkmanager "platforms;android-34" > /dev/null 2>&1
90- fi
87+ # Setup Android SDK
88+ export ANDROID_SDK_ROOT=/usr/local/lib/android/sdk
89+ echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
90+
91+ # Install required SDK components
92+ if [ -f "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" ]; then
93+ yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses 2>/dev/null || true
94+ $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager \
95+ "platforms;android-34" \
96+ "build-tools;34.0.0" 2>&1 | tail -5
9197 fi
92- echo "sdk.dir=$SDK" > android/local.properties
98+
99+ echo "sdk.dir=$ANDROID_SDK_ROOT" > android/local.properties
93100
94101 - name : Build APK
95102 working-directory : android
96103 run : |
97- echo "=== Gradle version ==="
98- /opt/gradle-8.7/bin/gradle --version
99- echo "=== local.properties ==="
104+ echo "=== SDK Config ==="
100105 cat local.properties
101- echo "=== Building APK ==="
102- /opt/gradle-8.7/bin/gradle assembleDebug --stacktrace --info 2>&1 | tail -150
106+ echo "=== Gradle Version ==="
107+ /opt/gradle-8.7/bin/gradle --version 2>&1 | head -3
108+ echo "=== Building ==="
109+ /opt/gradle-8.7/bin/gradle assembleDebug --stacktrace --no-daemon 2>&1 | tail -120
103110 env :
104- ANDROID_HOME : /usr/local/lib/android/sdk
111+ ANDROID_SDK_ROOT : /usr/local/lib/android/sdk
105112
106113 - name : Upload APK artifact
107114 uses : actions/upload-artifact@v4
0 commit comments