diff --git a/.github/workflows/run-code-quality-check.yml b/.github/workflows/run-code-quality-check.yml index f4e40e0a..26985a39 100644 --- a/.github/workflows/run-code-quality-check.yml +++ b/.github/workflows/run-code-quality-check.yml @@ -92,7 +92,7 @@ jobs: run: sudo chown -Rc $UID .git/ - name: Commit and push applied linter fixes if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) && !contains(github.event.head_commit.message, 'skip fix') - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }} commit_message: "[MegaLinter] Apply linters fixes" diff --git a/.github/workflows/run-snapshot-generation.yml b/.github/workflows/run-snapshot-generation.yml index b0ba37b8..15bc7a8d 100644 --- a/.github/workflows/run-snapshot-generation.yml +++ b/.github/workflows/run-snapshot-generation.yml @@ -34,7 +34,7 @@ jobs: run: ./gradlew components:recordPaparazziDebug - name: Commit and push recorded screenshots - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }} commit_message: "[Paparazzi] Record new snapshots" diff --git a/.github/workflows/verify-pr-description.yml b/.github/workflows/verify-pr-description.yml index e7dbaeab..58df6b77 100644 --- a/.github/workflows/verify-pr-description.yml +++ b/.github/workflows/verify-pr-description.yml @@ -12,7 +12,8 @@ permissions: read-all jobs: verify: - if: ${{ github.actor != 'dependabot[bot]' }} + # To make sure the pull request was created by dependabot. + if: ${{ !contains(github.event.pull_request.title, 'bump') }} name: Verify Pull-Request Description runs-on: ubuntu-20.04 diff --git a/app-shared-tests/build.gradle b/app-shared-tests/build.gradle index 9d957a82..bf13fd22 100644 --- a/app-shared-tests/build.gradle +++ b/app-shared-tests/build.gradle @@ -42,6 +42,7 @@ android { excludes += 'META-INF/{AL2.0,LGPL2.1}' excludes += 'META-INF/LICENSE.md' excludes += 'META-INF/LICENSE-notice.md' + excludes += 'META-INF/versions/9/previous-compilation-data.bin' } } @@ -107,4 +108,4 @@ dependencies { // ktlint ktlintRuleset project(":custom-ktlint-rules") -} \ No newline at end of file +} diff --git a/app/build.gradle b/app/build.gradle index 7439cf67..0c49a878 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,6 +62,7 @@ android { excludes += '/META-INF/{AL2.0,LGPL2.1}' excludes += '/META-INF/LICENSE.md' excludes += '/META-INF/LICENSE-notice.md' + excludes += '/META-INF/versions/9/previous-compilation-data.bin' } } testOptions { @@ -185,7 +186,7 @@ dependencies { implementation "io.ktor:ktor-serialization-kotlinx-json:$ktor_version" testImplementation("io.ktor:ktor-client-mock:$ktor_version") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.1") implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1") testImplementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1") diff --git a/app/src/test/java/com/appunite/loudius/ActivitySetupTest.kt b/app/src/test/java/com/appunite/loudius/ActivitySetupTest.kt index 7ac03c93..57227ec1 100644 --- a/app/src/test/java/com/appunite/loudius/ActivitySetupTest.kt +++ b/app/src/test/java/com/appunite/loudius/ActivitySetupTest.kt @@ -16,6 +16,7 @@ package com.appunite.loudius +import android.os.Build import androidx.activity.ComponentActivity import androidx.test.core.app.ActivityScenario import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -24,8 +25,10 @@ import org.junit.Before import org.junit.Test import org.junit.jupiter.api.DisplayName import org.junit.runner.RunWith +import org.robolectric.annotation.Config @RunWith(AndroidJUnit4::class) +@Config(sdk = [Build.VERSION_CODES.Q]) @DisplayName("ensure activity tests are set correctly") class ActivitySetupTest { diff --git a/build.gradle b/build.gradle index d7c7a505..ab3a6a3a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { compose_version = '1.3.3' - ktor_version = '2.3.4' + ktor_version = '2.3.5' koin_version = '3.5.0' } }