From 678b3beca3462ff3f0f8ff03e52f980c4e25943d Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Wed, 14 Feb 2024 16:31:55 -0500 Subject: [PATCH 1/8] 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 d0a5512443..169dd8df69 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 fb4615cd29d2188ecc838b9cf3937210bda29bf1 Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Wed, 14 Feb 2024 16:44:24 -0500 Subject: [PATCH 2/8] 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 169dd8df69..3ed0dba260 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: From 392488872077a1e0c5e6c0d9ef2dfc0386b9ae04 Mon Sep 17 00:00:00 2001 From: Nan Date: Thu, 30 Jan 2025 14:09:01 -0800 Subject: [PATCH 3/8] [ci] update `actions` to v4 * See deprecation notice: https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/ * Let's update all `actions` packages to v4 * The `android-actions/setup-android` is still on release v3 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ed0dba260..a0b244e831 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,9 +8,9 @@ jobs: build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: "[Setup] Java" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' @@ -34,7 +34,7 @@ jobs: ./gradlew unittest:testReleaseUnitTest --console=plain - name: Unit tests results if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: unit-tests-results path: OneSignalSDK/unittest/build From 978821307f073846a0370045d4a3c1c1089d1f07 Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Thu, 20 Feb 2025 20:01:11 -0500 Subject: [PATCH 4/8] fix lint errors to get CI to pass CI was not passing, so this most likely missed in a different PR --- .../src/main/java/com/onesignal/ApplicationInfoHelper.kt | 3 +-- .../onesignal/src/main/java/com/onesignal/PackageInfoHelper.kt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/ApplicationInfoHelper.kt b/OneSignalSDK/onesignal/src/main/java/com/onesignal/ApplicationInfoHelper.kt index ddde627be7..30f6e48175 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/ApplicationInfoHelper.kt +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/ApplicationInfoHelper.kt @@ -35,8 +35,7 @@ class ApplicationInfoHelper { // others, as we don't want to silently hide other issues. if (e.cause is DeadSystemException) { null - } - else { + } else { throw e } } diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/PackageInfoHelper.kt b/OneSignalSDK/onesignal/src/main/java/com/onesignal/PackageInfoHelper.kt index 93fd219500..bf58d9f82d 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/PackageInfoHelper.kt +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/PackageInfoHelper.kt @@ -44,8 +44,7 @@ class PackageInfoHelper { // others, as we don't want to silently hide other issues. if (e.cause is DeadSystemException) { GetPackageInfoResult(false, null) - } - else { + } else { throw e } } From 24c81de82d941c3d6a5afd8f0ce9055d560cb292 Mon Sep 17 00:00:00 2001 From: Shepherd Date: Thu, 26 Oct 2023 17:20:01 -0400 Subject: [PATCH 5/8] Remove detekt --- .github/workflows/ci.yml | 5 ----- OneSignalSDK/build.gradle | 3 --- OneSignalSDK/onesignal/build.gradle | 1 - 3 files changed, 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0b244e831..8745a7628b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,11 +23,6 @@ jobs: working-directory: OneSignalSDK run: | ./gradlew ktlintCheck --console=plain - - name: "[Test] Analyzing" - working-directory: OneSignalSDK - continue-on-error: true - run: | - ./gradlew detekt --console=plain - name: "[Test] SDK Unit Tests" working-directory: OneSignalSDK run: | diff --git a/OneSignalSDK/build.gradle b/OneSignalSDK/build.gradle index 0cc8915b42..768c02d3e1 100644 --- a/OneSignalSDK/build.gradle +++ b/OneSignalSDK/build.gradle @@ -14,7 +14,6 @@ buildscript { huaweiHMSLocationVersion = '4.0.0.300' kotlinVersion = '1.5.32' ktlintVersion = '11.0.0' - detektVersion = '1.21.0' } repositories { @@ -29,9 +28,7 @@ buildscript { classpath "com.google.gms:google-services:$googleServicesGradlePluginVersion" classpath "com.huawei.agconnect:agcp:$huaweiAgconnectVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktlintVersion" - classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion" } } diff --git a/OneSignalSDK/onesignal/build.gradle b/OneSignalSDK/onesignal/build.gradle index b43d1b4c95..783fe28f09 100644 --- a/OneSignalSDK/onesignal/build.gradle +++ b/OneSignalSDK/onesignal/build.gradle @@ -7,7 +7,6 @@ ext { apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'org.jlleitschuh.gradle.ktlint' -apply plugin: 'io.gitlab.arturbosch.detekt' android { compileSdkVersion rootProject.buildVersions.compileSdkVersion From d03cc0303ebb120b37ad385920507c43cbd5dccb Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Thu, 20 Feb 2025 20:26:39 -0500 Subject: [PATCH 6/8] player model depends on older android tools --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8745a7628b..d6783a9c76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - name: "[Setup] Android" uses: android-actions/setup-android@v3 with: - cmdline-tools-version: 10406996 + cmdline-tools-version: 9477386 log-accepted-android-sdk-licenses: false - name: "[Test] Linting" working-directory: OneSignalSDK From 06ef594f5441252dcb672ffcb93d22d95e453d2c Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Thu, 20 Feb 2025 20:34:01 -0500 Subject: [PATCH 7/8] Older Android tools is needed --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6783a9c76..6e83e31b8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - name: "[Setup] Android" uses: android-actions/setup-android@v3 with: - cmdline-tools-version: 9477386 + cmdline-tools-version: 8512546 log-accepted-android-sdk-licenses: false - name: "[Test] Linting" working-directory: OneSignalSDK From c92cf7c4e31c721855171e0fb87d1695bef3314a Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Thu, 20 Feb 2025 20:47:08 -0500 Subject: [PATCH 8/8] Use JDK 11 for this branch --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e83e31b8e..b45ec0898f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: - name: "[Setup] Java" uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '11' distribution: 'temurin' - name: "[Setup] Android" uses: android-actions/setup-android@v3