Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Player model - CI - Apply fixes from main #2261

Open
wants to merge 8 commits into
base: player-model-main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions OneSignalSDK/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ buildscript {
huaweiHMSLocationVersion = '4.0.0.300'
kotlinVersion = '1.5.32'
ktlintVersion = '11.0.0'
detektVersion = '1.21.0'
}

repositories {
Expand All @@ -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"
}
}

Expand Down
1 change: 0 additions & 1 deletion OneSignalSDK/onesignal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Loading