From 22e5e8034d2891f04568e724baa8b5c95660b897 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Mon, 16 May 2022 16:26:36 +0200
Subject: -upgrade gradle

---
 .idea/gradle.xml                                  |  2 +-
 anastasis-ui/build.gradle                         |  3 +--
 anastasis-ui/src/main/AndroidManifest.xml         |  3 +--
 build.gradle                                      |  4 ++--
 cashier/build.gradle                              | 13 +++++++------
 cashier/src/main/AndroidManifest.xml              |  3 +--
 gradle/wrapper/gradle-wrapper.properties          |  2 +-
 merchant-lib/build.gradle                         |  3 +--
 merchant-lib/src/main/AndroidManifest.xml         |  3 +--
 merchant-terminal/build.gradle                    | 18 +++++++++---------
 merchant-terminal/src/main/AndroidManifest.xml    |  3 +--
 taler-kotlin-android/build.gradle                 |  9 +++++----
 taler-kotlin-android/src/main/AndroidManifest.xml |  3 +--
 wallet/build.gradle                               | 17 ++++++++++-------
 wallet/src/main/AndroidManifest.xml               |  3 +--
 15 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f7de5ff..caf1ba4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -20,7 +21,6 @@
             <option value="$PROJECT_DIR$/wallet" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/anastasis-ui/build.gradle b/anastasis-ui/build.gradle
index 4a66366..62b226d 100644
--- a/anastasis-ui/build.gradle
+++ b/anastasis-ui/build.gradle
@@ -26,8 +26,6 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1
-        versionName "0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -52,6 +50,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace 'org.gnu.anastasis.ui'
 }
 
 dependencies {
diff --git a/anastasis-ui/src/main/AndroidManifest.xml b/anastasis-ui/src/main/AndroidManifest.xml
index 9340508..2827271 100644
--- a/anastasis-ui/src/main/AndroidManifest.xml
+++ b/anastasis-ui/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
   ~ GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.gnu.anastasis.ui">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
diff --git a/build.gradle b/build.gradle
index 8967f1f..7c7f3a4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext.kotlin_version = '1.5.31'
     ext.ktor_version = "1.6.3"
-    ext.nav_version = "2.3.5"
+    ext.nav_version = '2.4.1'
     ext.material_version = "1.4.0"
     ext.lifecycle_version = "2.4.0"
     ext.constraintlayout_version = "2.1.2"
@@ -15,7 +15,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
diff --git a/cashier/build.gradle b/cashier/build.gradle
index ae7a5a9..1c9c2b6 100644
--- a/cashier/build.gradle
+++ b/cashier/build.gradle
@@ -58,18 +58,19 @@ android {
     buildFeatures {
         viewBinding = true
     }
-
     packagingOptions {
-        exclude("META-INF/*.kotlin_module")
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
     }
 
-    lintOptions {
+    lint {
         abortOnError true
+        ignore 'WrongConstant'
         ignoreWarnings false
-        // TODO remove once com.google.android.material fixed this
-        //      https://github.com/material-components/material-components-android/issues/504
-        ignore "WrongConstant"
     }
+    namespace 'net.taler.cashier'
+
 }
 
 dependencies {
diff --git a/cashier/src/main/AndroidManifest.xml b/cashier/src/main/AndroidManifest.xml
index 1d8b810..3093358 100644
--- a/cashier/src/main/AndroidManifest.xml
+++ b/cashier/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.taler.cashier">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7a0ef64..581797b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Aug 27 15:56:47 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/merchant-lib/build.gradle b/merchant-lib/build.gradle
index f53baa2..d388b27 100644
--- a/merchant-lib/build.gradle
+++ b/merchant-lib/build.gradle
@@ -28,8 +28,6 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1
-        versionName "0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -50,6 +48,7 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+    namespace 'net.taler.merchantlib'
 }
 
 dependencies {
diff --git a/merchant-lib/src/main/AndroidManifest.xml b/merchant-lib/src/main/AndroidManifest.xml
index 1408b33..40b4a25 100644
--- a/merchant-lib/src/main/AndroidManifest.xml
+++ b/merchant-lib/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
   ~ GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.taler.merchantlib">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle
index 5354da5..19b0136 100644
--- a/merchant-terminal/build.gradle
+++ b/merchant-terminal/build.gradle
@@ -48,19 +48,19 @@ android {
             includeAndroidResources = true
         }
     }
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/common.kotlin_module', 'META-INF/*.kotlin_module']
+        }
+    }
+
 
-    lintOptions {
+    lint {
         abortOnError true
+        ignore 'WrongConstant'
         ignoreWarnings false
-        // TODO remove once com.google.android.material fixed this
-        //      https://github.com/material-components/material-components-android/issues/504
-        ignore "WrongConstant"
-    }
-
-    packagingOptions {
-        exclude 'META-INF/common.kotlin_module'
-        exclude 'META-INF/*.kotlin_module'
     }
+    namespace 'net.taler.merchantpos'
 }
 
 dependencies {
diff --git a/merchant-terminal/src/main/AndroidManifest.xml b/merchant-terminal/src/main/AndroidManifest.xml
index 1518293..eb7940f 100644
--- a/merchant-terminal/src/main/AndroidManifest.xml
+++ b/merchant-terminal/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.taler.merchantpos">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.NFC" />
 
diff --git a/taler-kotlin-android/build.gradle b/taler-kotlin-android/build.gradle
index 4661b09..e45a3a1 100644
--- a/taler-kotlin-android/build.gradle
+++ b/taler-kotlin-android/build.gradle
@@ -28,8 +28,6 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1
-        versionName "0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -49,11 +47,14 @@ android {
     buildFeatures {
         viewBinding = true
     }
-
     packagingOptions {
-        exclude("META-INF/*.kotlin_module")
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
     }
 
+    namespace 'net.taler.common'
+
 }
 
 dependencies {
diff --git a/taler-kotlin-android/src/main/AndroidManifest.xml b/taler-kotlin-android/src/main/AndroidManifest.xml
index f74aae6..c1f6146 100644
--- a/taler-kotlin-android/src/main/AndroidManifest.xml
+++ b/taler-kotlin-android/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.taler.common">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 4bc22b9..2aaea01 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -99,19 +99,22 @@ android {
         viewBinding true
         compose true
     }
-
     packagingOptions {
-        doNotStrip '**/*.so'
-        exclude("META-INF/*.kotlin_module")
+        jniLibs {
+            keepDebugSymbols += ['**/*.so']
+        }
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
     }
 
-    lintOptions {
+    lint {
         abortOnError true
+        ignore 'WrongConstant'
         ignoreWarnings false
-        // TODO remove once com.google.android.material fixed this
-        //      https://github.com/material-components/material-components-android/issues/504
-        ignore "WrongConstant"
     }
+    namespace 'net.taler.wallet'
+
 }
 
 dependencies {
diff --git a/wallet/src/main/AndroidManifest.xml b/wallet/src/main/AndroidManifest.xml
index 963032c..285908a 100644
--- a/wallet/src/main/AndroidManifest.xml
+++ b/wallet/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.taler.wallet">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-- 
cgit v1.2.3