From 2932d09a83b9156036b7f1223fd7355751038223 Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Wed, 14 Feb 2024 16:31:55 -0500 Subject: [PATCH 1/2] switch ci to use android-actions/setup-android@v3 maxim-lobanov/setup-android-tools is no longer working with github CI and it hasn't been updated in 4 years. --- .github/workflows/ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5880a10486..a620d60499 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,12 +19,10 @@ jobs: with: gradle-version: 7.3.1 - name: "[Setup] Android" - uses: maxim-lobanov/setup-android-tools@v1 + uses: android-actions/setup-android@v3 with: - packages: | - platforms;android-31 - build-tools;31.0.0 - cache: true + cmdline-tools-version: 10406996 + log-accepted-android-sdk-licenses: false - name: "[Test] Linting" working-directory: OneSignalSDK run: | From 5c335b4b7cfa510171113508c2bec6680722e269 Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Wed, 14 Feb 2024 16:44:24 -0500 Subject: [PATCH 2/2] update to java 17 This is required for the newer Android command line tools being used now. Also dropped installing gradle, gradlew already handles this. --- .github/workflows/ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a620d60499..5d108601db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,12 +12,8 @@ jobs: - name: "[Setup] Java" uses: actions/setup-java@v3 with: + java-version: '17' distribution: 'temurin' - java-version: 11 - - name: "[Setup] Gradle" - uses: gradle/gradle-build-action@v2 - with: - gradle-version: 7.3.1 - name: "[Setup] Android" uses: android-actions/setup-android@v3 with: