Merge branch 'develop' into dependabot/github_actions/stefanzweifel/g…

…it-auto-commit-action-5 # Conflicts: # .github/workflows/verify-pr-description.yml
appunite · Nov 15, 2023 · ea7aaaa · ea7aaaa
2 parents aebffef + bcf7267
commit ea7aaaa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/verify-pr-description.yml b/.github/workflows/verify-pr-description.yml
@@ -12,9 +12,11 @@ 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
-    if: github.actor != 'dependabot[bot]'
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4

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
@@ -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 {

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