diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0a5512443..b45ec0898f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,39 +8,28 @@ 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: '11' distribution: 'temurin' - java-version: 11 - - name: "[Setup] Gradle" - uses: gradle/gradle-build-action@v2 - 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: 8512546 + log-accepted-android-sdk-licenses: false - name: "[Test] Linting" 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: | ./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 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 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 } }