From 70ce5effdf7c7e8b1751c15d16532d3185e422fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 20:19:27 +0000 Subject: [PATCH 01/15] chore(deps): bump ktor_version from 2.3.4 to 2.3.5 Bumps `ktor_version` from 2.3.4 to 2.3.5. Updates `io.ktor:ktor-client-core` from 2.3.4 to 2.3.5 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/2.3.5/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.4...2.3.5) Updates `io.ktor:ktor-client-okhttp` from 2.3.4 to 2.3.5 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/2.3.5/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.4...2.3.5) Updates `io.ktor:ktor-client-content-negotiation` from 2.3.4 to 2.3.5 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/2.3.5/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.4...2.3.5) Updates `io.ktor:ktor-serialization-kotlinx-json` from 2.3.4 to 2.3.5 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/2.3.5/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.4...2.3.5) Updates `io.ktor:ktor-client-mock` from 2.3.4 to 2.3.5 - [Release notes](https://github.com/ktorio/ktor/releases) - [Changelog](https://github.com/ktorio/ktor/blob/2.3.5/CHANGELOG.md) - [Commits](https://github.com/ktorio/ktor/compare/2.3.4...2.3.5) --- updated-dependencies: - dependency-name: io.ktor:ktor-client-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.ktor:ktor-client-okhttp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.ktor:ktor-client-content-negotiation dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.ktor:ktor-serialization-kotlinx-json dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.ktor:ktor-client-mock dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' } } From 741e6fea449c775b7e53f08a0bd5993996dc0c5b Mon Sep 17 00:00:00 2001 From: Jacek Marchwicki Date: Thu, 26 Oct 2023 15:27:53 +0200 Subject: [PATCH 02/15] chore: fix develop branch after merging #129 --- app/src/test/java/com/appunite/loudius/ActivitySetupTest.kt | 3 +++ 1 file changed, 3 insertions(+) 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 { From 4337c5e39f374c4bfc3fce51c62a0e8d3d8e3439 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 21:03:25 +0000 Subject: [PATCH 03/15] chore(deps): bump stefanzweifel/git-auto-commit-action from 4 to 5 Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4 to 5. - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4...v5) --- updated-dependencies: - dependency-name: stefanzweifel/git-auto-commit-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/run-code-quality-check.yml | 2 +- .github/workflows/run-snapshot-generation.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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" From aebffef316719dfac35e8273d3166d44f7c85910 Mon Sep 17 00:00:00 2001 From: nowakweronika Date: Tue, 14 Nov 2023 13:19:02 +0100 Subject: [PATCH 04/15] Change line of github actor verification. --- .github/workflows/verify-pr-description.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/verify-pr-description.yml b/.github/workflows/verify-pr-description.yml index e7dbaeab..c183faab 100644 --- a/.github/workflows/verify-pr-description.yml +++ b/.github/workflows/verify-pr-description.yml @@ -12,10 +12,9 @@ permissions: read-all jobs: verify: - if: ${{ github.actor != 'dependabot[bot]' }} name: Verify Pull-Request Description runs-on: ubuntu-20.04 - + if: github.actor != 'dependabot[bot]' steps: - name: Checkout uses: actions/checkout@v4 From b2e563d09882e9b83a8c4dd8a756f8de8e383211 Mon Sep 17 00:00:00 2001 From: Jacek Marchwicki Date: Wed, 15 Nov 2023 10:05:03 +0100 Subject: [PATCH 05/15] chore: ignore META-INF file --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index f4e67280..f980929c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,6 +58,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 { From 43342de5f4c87c2b4806eeb01ca50329a83fe843 Mon Sep 17 00:00:00 2001 From: nowakweronika Date: Wed, 15 Nov 2023 11:22:41 +0100 Subject: [PATCH 06/15] Exclude 'META-INF/versions/9/previous-compilation-data.bin' from app-shared-tests. --- app-shared-tests/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 +} From 8ef6eb1a4abc1fd8237362a680c6e0eee53c8cbc Mon Sep 17 00:00:00 2001 From: nowakweronika Date: Wed, 15 Nov 2023 12:05:39 +0100 Subject: [PATCH 07/15] Check if Github Actor is not dependabot. --- .github/workflows/verify-pr-description.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-pr-description.yml b/.github/workflows/verify-pr-description.yml index e7dbaeab..897e4eea 100644 --- a/.github/workflows/verify-pr-description.yml +++ b/.github/workflows/verify-pr-description.yml @@ -12,7 +12,7 @@ permissions: read-all jobs: verify: - if: ${{ github.actor != 'dependabot[bot]' }} + if: github.actor != 'dependabot[bot]' name: Verify Pull-Request Description runs-on: ubuntu-20.04 From 4f75c3b68d06cbde3ea22d8eacdc62517485fc93 Mon Sep 17 00:00:00 2001 From: nowakweronika Date: Wed, 15 Nov 2023 12:08:45 +0100 Subject: [PATCH 08/15] Debug workflow. --- .github/workflows/verify-pr-description.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/verify-pr-description.yml b/.github/workflows/verify-pr-description.yml index 897e4eea..8d27a245 100644 --- a/.github/workflows/verify-pr-description.yml +++ b/.github/workflows/verify-pr-description.yml @@ -17,6 +17,12 @@ jobs: runs-on: ubuntu-20.04 steps: + - name: Debug Workflow Context + run: | + echo "Actor is ${{ github.actor }}" + echo "Event name is ${{ github.event_name }}" + echo "Pull request title: ${{ github.event.pull_request.title }}" + - name: Checkout uses: actions/checkout@v4 with: From ee3fa14f8ac31e9bc4dc50e4097452156abe0955 Mon Sep 17 00:00:00 2001 From: nowakweronika Date: Wed, 15 Nov 2023 12:16:52 +0100 Subject: [PATCH 09/15] Revert "Debug workflow." This reverts commit 4f75c3b68d06cbde3ea22d8eacdc62517485fc93. --- .github/workflows/verify-pr-description.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/verify-pr-description.yml b/.github/workflows/verify-pr-description.yml index 8d27a245..897e4eea 100644 --- a/.github/workflows/verify-pr-description.yml +++ b/.github/workflows/verify-pr-description.yml @@ -17,12 +17,6 @@ jobs: runs-on: ubuntu-20.04 steps: - - name: Debug Workflow Context - run: | - echo "Actor is ${{ github.actor }}" - echo "Event name is ${{ github.event_name }}" - echo "Pull request title: ${{ github.event.pull_request.title }}" - - name: Checkout uses: actions/checkout@v4 with: From 42760348e9fac86fb0a598bc154dd4840e89ff55 Mon Sep 17 00:00:00 2001 From: nowakweronika Date: Wed, 15 Nov 2023 12:38:16 +0100 Subject: [PATCH 10/15] Check if PR title contains "bump". --- .github/workflows/verify-pr-description.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-pr-description.yml b/.github/workflows/verify-pr-description.yml index 897e4eea..59dbba99 100644 --- a/.github/workflows/verify-pr-description.yml +++ b/.github/workflows/verify-pr-description.yml @@ -12,7 +12,7 @@ permissions: read-all jobs: verify: - if: github.actor != 'dependabot[bot]' + if: contain(github.event.pull_request.title, 'bump') name: Verify Pull-Request Description runs-on: ubuntu-20.04 From 9bb41236f840acffec00ec23cc12c9edf62dfc81 Mon Sep 17 00:00:00 2001 From: nowakweronika Date: Wed, 15 Nov 2023 12:48:02 +0100 Subject: [PATCH 11/15] Check if PR title contains "bump". --- .github/workflows/verify-pr-description.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-pr-description.yml b/.github/workflows/verify-pr-description.yml index 59dbba99..f335b8c4 100644 --- a/.github/workflows/verify-pr-description.yml +++ b/.github/workflows/verify-pr-description.yml @@ -12,7 +12,7 @@ permissions: read-all jobs: verify: - if: contain(github.event.pull_request.title, 'bump') + if: contains(github.event.pull_request.title, 'bump') name: Verify Pull-Request Description runs-on: ubuntu-20.04 From 3b346e10bc0a70a3cb1015b5554da76b323d5912 Mon Sep 17 00:00:00 2001 From: nowakweronika Date: Wed, 15 Nov 2023 12:51:21 +0100 Subject: [PATCH 12/15] Check if PR title contains "bump". --- .github/workflows/verify-pr-description.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-pr-description.yml b/.github/workflows/verify-pr-description.yml index f335b8c4..399d22ed 100644 --- a/.github/workflows/verify-pr-description.yml +++ b/.github/workflows/verify-pr-description.yml @@ -12,7 +12,7 @@ permissions: read-all jobs: verify: - if: contains(github.event.pull_request.title, 'bump') + if: ${{ "!contains(github.event.pull_request.title, 'bump')" }} name: Verify Pull-Request Description runs-on: ubuntu-20.04 From 83a4f45a72c1d8d6ba8b397c8f51a8a7aa306ae3 Mon Sep 17 00:00:00 2001 From: nowakweronika Date: Wed, 15 Nov 2023 12:57:36 +0100 Subject: [PATCH 13/15] Check if PR title contains "bump". --- .github/workflows/verify-pr-description.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-pr-description.yml b/.github/workflows/verify-pr-description.yml index 399d22ed..b63f01ac 100644 --- a/.github/workflows/verify-pr-description.yml +++ b/.github/workflows/verify-pr-description.yml @@ -12,7 +12,7 @@ permissions: read-all jobs: verify: - if: ${{ "!contains(github.event.pull_request.title, 'bump')" }} + if: ${{ !contains(github.event.pull_request.title, 'bump') }} name: Verify Pull-Request Description runs-on: ubuntu-20.04 From 2d760dedf79801d484f1ef64c5e90e0cbbd8dbbe Mon Sep 17 00:00:00 2001 From: nowakweronika Date: Wed, 15 Nov 2023 13:28:07 +0100 Subject: [PATCH 14/15] Comment for: check if PR title contains "bump". --- .github/workflows/verify-pr-description.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/verify-pr-description.yml b/.github/workflows/verify-pr-description.yml index b63f01ac..58df6b77 100644 --- a/.github/workflows/verify-pr-description.yml +++ b/.github/workflows/verify-pr-description.yml @@ -12,6 +12,7 @@ permissions: read-all jobs: verify: + # 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 From 6b6e22269a9d128e4ab758943fd0159877ba31bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 20:21:37 +0000 Subject: [PATCH 15/15] chore(deps): bump org.jetbrains.kotlinx:kotlinx-serialization-json Bumps [org.jetbrains.kotlinx:kotlinx-serialization-json](https://github.com/Kotlin/kotlinx.serialization) from 1.6.0 to 1.6.1. - [Release notes](https://github.com/Kotlin/kotlinx.serialization/releases) - [Changelog](https://github.com/Kotlin/kotlinx.serialization/blob/master/CHANGELOG.md) - [Commits](https://github.com/Kotlin/kotlinx.serialization/compare/v1.6.0...v1.6.1) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-serialization-json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index f980929c..31196e3e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -138,7 +138,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")