1 files changed, 45 insertions, 17 deletions

diff --git a/wallet/build.gradle b/wallet/build.gradle
index 1ee682e..93f4a49 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -19,7 +19,7 @@ plugins {
     id "kotlinx-serialization"
 }
 
-def qtart_version = "0.9.3-dev.8"
+def qtart_version = "0.10.6"
 
 static def versionCodeEpoch() {
     return (new Date().getTime() / 1000).toInteger()
@@ -35,20 +35,19 @@ def gitCommit = { ->
 
 android {
     namespace 'net.taler.wallet'
-    compileSdkVersion 33
-    buildToolsVersion "$build_tools_version"
+    compileSdk 34
 
     defaultConfig {
         applicationId "net.taler.wallet"
         minSdkVersion 24
         targetSdkVersion 33
-        versionCode 28
-        versionName "0.9.3+p2"
+        versionCode 41
+        versionName "0.10.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
@@ -56,11 +55,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    flavorDimensions "distributionChannel"
+    flavorDimensions = ["distributionChannel"]
     productFlavors {
         fdroid {
             dimension "distributionChannel"
             applicationIdSuffix ".fdroid"
+            // version codes get multiplied by 10 and an ABI suffix gets added to the code
+            // if 'splitApk' property is set
         }
         google {
             dimension "distributionChannel"
@@ -74,22 +75,23 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
 
         // Flag to enable support for the new language APIs for zxing
         coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.6"
+        kotlinCompilerExtensionVersion "1.5.7"
     }
 
     buildFeatures {
+        buildConfig true
         viewBinding true
         compose true
     }
@@ -101,6 +103,15 @@ android {
             excludes += ['META-INF/*.kotlin_module']
         }
     }
+    splits {
+        abi {
+            // can not be defined per flavor, so we use a property to turn this on for F-Droid
+            enable project.hasProperty('splitApk')
+            reset() // Resets the list of ABIs to remove all included by default
+            include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            universalApk false
+        }
+    }
 
     lint {
         abortOnError true
@@ -114,24 +125,24 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation "com.google.android.material:material:$material_version"
     implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
-    implementation "androidx.browser:browser:1.5.0"
+    implementation "androidx.browser:browser:1.7.0"
 
     // Compose
-    implementation platform('androidx.compose:compose-bom:2023.05.00')
+    implementation platform('androidx.compose:compose-bom:2023.10.01')
     implementation 'androidx.compose.material3:material3'
     implementation 'androidx.compose.material:material-icons-extended'
     implementation "androidx.compose.runtime:runtime-livedata"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose"
     implementation "com.google.accompanist:accompanist-themeadapter-material3:0.28.0"
-    implementation 'androidx.activity:activity-compose:1.7.1'
+    implementation 'androidx.activity:activity-compose:1.8.2'
     implementation 'androidx.compose.ui:ui-tooling-preview'
     debugImplementation 'androidx.compose.ui:ui-tooling'
 
     // Lists and Selection
-    implementation "androidx.recyclerview:recyclerview:1.3.0"
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
     implementation "androidx.recyclerview:recyclerview-selection:1.1.0"
 
     // Navigation Library
@@ -144,7 +155,7 @@ dependencies {
     // QR codes
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
     // needed to support zxing library in taler-kotlin-android on API < 24
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     // Nicer ProgressBar
     implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1'
@@ -167,3 +178,20 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
 }
+
+// Map for the version code that gives each ABI a value.
+ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, x86: 3, x86_64: 4]
+// For each APK output variant, override versionCode with a combination of ext.abiCodes + variant.versionCode.
+android.applicationVariants.configureEach { variant ->
+    // Assigns a different version code for each output APK
+    variant.outputs.each { output ->
+        // Stores the value of ext.abiCodes that is associated with the ABI for this variant.
+        def baseAbiVersionCode =
+                // Determines the ABI for this variant and returns the mapped value.
+                project.ext.abiCodes.get(output.getFilter(com.android.build.OutputFile.ABI))
+        if (baseAbiVersionCode != null) {
+            output.versionCodeOverride = 10 * variant.versionCode + baseAbiVersionCode
+        }
+        // leaves version code alone of there's no baseAbiVersionCode
+    }
+}