[taler-taler-android] branch master updated (0f32834 -> 2e1f7e8)

[gnunet]

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a change to branch master
in repository taler-android.

    from 0f32834  [wallet] support withdraw-exchange URI
     new 6eaa1b8  [wallet] add option to create ABI split APKs
     new 2e1f7e8  [wallet] release 0.9.4

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 wallet/build.gradle | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/wallet/build.gradle b/wallet/build.gradle
index 23c8a0b..0af7256 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -41,8 +41,8 @@ android {
         applicationId "net.taler.wallet"
         minSdkVersion 24
         targetSdkVersion 33
-        versionCode 36
-        versionName "0.9.3+p10"
+        versionCode 37
+        versionName "0.9.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -60,6 +60,8 @@ android {
         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"
@@ -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
@@ -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
+    }
+}

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.