From cc26ae1d479dc9acf42db5ec5ab578607c806638 Mon Sep 17 00:00:00 2001
From: Andy <fischer@integreat-app.de>
Date: Tue, 20 Aug 2024 14:25:12 +0200
Subject: [PATCH 1/2] 1029: update sdk version

---
 android/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 4e45cd8a..179ccad7 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,10 +2,10 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "33.0.0"
+        buildToolsVersion = "34.0.0"
         minSdkVersion = 24
-        compileSdkVersion = 33
-        targetSdkVersion = 33
+        compileSdkVersion = 34
+        targetSdkVersion = 34
         if (System.properties['os.arch'] == "aarch64") {
             // For M1 Users we need to use the NDK 24 which added support for aarch64
             ndkVersion = "24.0.8215888"

From 1eaa2bed167b762ce3cc5bcbf30b4954cf46bfbb Mon Sep 17 00:00:00 2001
From: Andy <fischer@integreat-app.de>
Date: Tue, 20 Aug 2024 14:41:00 +0200
Subject: [PATCH 2/2] 1029: enable run commit_main (temporary)

---
 .circleci/config.yml                    | 14 ++++++++++----
 .circleci/src/@common.yml               |  4 ++++
 .circleci/src/workflows/commit_main.yml |  8 +++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f5b714ad..9d7bab6a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -573,6 +573,9 @@ parameters:
     run_commit:
         default: true
         type: boolean
+    run_commit_main:
+        default: false
+        type: boolean
     run_dev_delivery:
         default: false
         type: boolean
@@ -658,11 +661,14 @@ workflows:
                     - build_android
                     - build_ios
         when:
-            and:
-                - << pipeline.parameters.run_commit >>
+            or:
                 - equal:
-                    - main
-                    - << pipeline.git.branch >>
+                    - << pipeline.parameters.run_commit_main >>
+                - and:
+                    - << pipeline.parameters.run_commit >>
+                    - equal:
+                        - main
+                        - << pipeline.git.branch >>
     dev_delivery:
         jobs:
             - check:
diff --git a/.circleci/src/@common.yml b/.circleci/src/@common.yml
index 04e5ede5..c0f090b9 100644
--- a/.circleci/src/@common.yml
+++ b/.circleci/src/@common.yml
@@ -5,6 +5,10 @@ parameters:
     default: true
     type: boolean
 
+  run_commit_main:
+    default: false
+    type: boolean
+
   run_dev_delivery:
     default: false
     type: boolean
diff --git a/.circleci/src/workflows/commit_main.yml b/.circleci/src/workflows/commit_main.yml
index 50ccacd9..b28f64b7 100644
--- a/.circleci/src/workflows/commit_main.yml
+++ b/.circleci/src/workflows/commit_main.yml
@@ -1,7 +1,9 @@
 when:
-  and:
-    - << pipeline.parameters.run_commit >>
-    - equal: [main, << pipeline.git.branch >>]
+  or:
+    - equal: [<< pipeline.parameters.run_commit_main >>]
+    - and:
+        - << pipeline.parameters.run_commit >>
+        - equal: [main, << pipeline.git.branch >>]
 jobs:
   - check:
       context: