From c0feb8a37db5bb560d109e0f39c2e725b23f335b Mon Sep 17 00:00:00 2001
From: Matthieu <24-artectrex@users.noreply.shinice.net>
Date: Fri, 15 Mar 2024 18:01:04 +0100
Subject: [PATCH 1/2] Seperate version codes per architecture

---
 app/build.gradle | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a95c5561..e68de8d9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -271,7 +271,7 @@ dependencies {
     testImplementation "androidx.room:room-testing:$room_version"
 
 
-    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.3.0'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test:rules:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
@@ -284,6 +284,23 @@ dependencies {
 
 }
 
+// Map for the version code that gives each ABI a value.
+ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, x86: 3, x86_64: 4]
+
+//Different version codes per architecture (for F-Droid support)
+android.applicationVariants.configureEach { variant ->
+    variant.outputs.each { output ->
+        def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(com.android.build.OutputFile.ABI))
+        if (baseAbiVersionCode != null) {
+            output.versionCodeOverride = (100 * project.android.defaultConfig.versionCode) + baseAbiVersionCode
+        } else {
+            output.versionCodeOverride = 100 * project.android.defaultConfig.versionCode
+        }
+    }
+
+}
+
+
 tasks.withType(Test).configureEach {
     jacoco.includeNoLocationClasses = true
     jacoco.excludes = ['jdk.internal.*']

From dd27555d8367babed12bde83cd5e757cf46cf3ad Mon Sep 17 00:00:00 2001
From: Matthieu <24-artectrex@users.noreply.shinice.net>
Date: Fri, 15 Mar 2024 18:10:10 +0100
Subject: [PATCH 2/2] Release 33

---
 app/build.gradle                                  | 6 +++---
 fastlane/metadata/android/en-US/changelogs/33.txt | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/33.txt

diff --git a/app/build.gradle b/app/build.gradle
index e68de8d9..7d3bc865 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,7 +31,7 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 32
+        versionCode 33
         versionName "1.0.beta" + versionCode
 
         //TODO add resConfigs("en", "fr", "ja",...) ?
@@ -161,7 +161,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
     implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
-    implementation "androidx.browser:browser:1.7.0"
+    implementation "androidx.browser:browser:1.8.0"
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
@@ -182,7 +182,7 @@ dependencies {
 
 
     // Use the most recent version of CameraX
-    def cameraX_version = '1.3.1'
+    def cameraX_version = '1.3.2'
     implementation "androidx.camera:camera-core:$cameraX_version"
     implementation "androidx.camera:camera-camera2:$cameraX_version"
     // CameraX Lifecycle library
diff --git a/fastlane/metadata/android/en-US/changelogs/33.txt b/fastlane/metadata/android/en-US/changelogs/33.txt
new file mode 100644
index 00000000..0ff98af3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/33.txt
@@ -0,0 +1,3 @@
+Try again to split the apks
+
+Update dependencies