Merge branch 'develop' into feature/analytics

appunite · Nov 15, 2023 · d6a9c4a · d6a9c4a
2 parents f6d1f13 + dffc6ff
commit d6a9c4a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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")
-}
+}
diff --git a/app/build.gradle b/app/build.gradle
@@ -64,6 +64,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 {

diff --git 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'
     }
 }