From 499fcd383dabf423e5b7fea5f5c41356abb3cc8f Mon Sep 17 00:00:00 2001
From: Alfreedom <00tango.bromine@icloud.com>
Date: Fri, 29 Sep 2023 10:21:56 +0200
Subject: [PATCH] updated gradle and kotlin versions

---
 example/dapp/android/app/build.gradle                       | 1 +
 example/dapp/android/app/src/debug/AndroidManifest.xml      | 3 +--
 example/dapp/android/app/src/main/AndroidManifest.xml       | 3 +--
 example/dapp/android/app/src/profile/AndroidManifest.xml    | 3 +--
 example/dapp/android/build.gradle                           | 6 +++---
 example/dapp/android/gradle.properties                      | 3 +++
 .../dapp/android/gradle/wrapper/gradle-wrapper.properties   | 2 +-
 example/wallet/android/app/build.gradle                     | 1 +
 example/wallet/android/app/src/debug/AndroidManifest.xml    | 3 +--
 example/wallet/android/app/src/main/AndroidManifest.xml     | 3 +--
 example/wallet/android/app/src/profile/AndroidManifest.xml  | 3 +--
 example/wallet/android/build.gradle                         | 4 ++--
 example/wallet/android/gradle.properties                    | 3 +++
 .../wallet/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 14 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/example/dapp/android/app/build.gradle b/example/dapp/android/app/build.gradle
index c8bcc3af..db2ca1aa 100644
--- a/example/dapp/android/app/build.gradle
+++ b/example/dapp/android/app/build.gradle
@@ -60,6 +60,7 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    namespace 'com.example.dapp'
 }
 
 flutter {
diff --git a/example/dapp/android/app/src/debug/AndroidManifest.xml b/example/dapp/android/app/src/debug/AndroidManifest.xml
index 88b6a7e5..399f6981 100644
--- a/example/dapp/android/app/src/debug/AndroidManifest.xml
+++ b/example/dapp/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.dapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/example/dapp/android/app/src/main/AndroidManifest.xml b/example/dapp/android/app/src/main/AndroidManifest.xml
index 7c62f8ec..577d92aa 100644
--- a/example/dapp/android/app/src/main/AndroidManifest.xml
+++ b/example/dapp/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.dapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="dapp"
         android:name="${applicationName}"
diff --git a/example/dapp/android/app/src/profile/AndroidManifest.xml b/example/dapp/android/app/src/profile/AndroidManifest.xml
index 88b6a7e5..399f6981 100644
--- a/example/dapp/android/app/src/profile/AndroidManifest.xml
+++ b/example/dapp/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.dapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/example/dapp/android/build.gradle b/example/dapp/android/build.gradle
index 83ae2200..482db1b0 100644
--- a/example/dapp/android/build.gradle
+++ b/example/dapp/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/example/dapp/android/gradle.properties b/example/dapp/android/gradle.properties
index 94adc3a3..b9a9a246 100644
--- a/example/dapp/android/gradle.properties
+++ b/example/dapp/android/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/example/dapp/android/gradle/wrapper/gradle-wrapper.properties b/example/dapp/android/gradle/wrapper/gradle-wrapper.properties
index cb24abda..8bc9958a 100644
--- a/example/dapp/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/dapp/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
diff --git a/example/wallet/android/app/build.gradle b/example/wallet/android/app/build.gradle
index f4ffa57b..2c257f48 100644
--- a/example/wallet/android/app/build.gradle
+++ b/example/wallet/android/app/build.gradle
@@ -60,6 +60,7 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    namespace 'com.example.wallet'
 }
 
 flutter {
diff --git a/example/wallet/android/app/src/debug/AndroidManifest.xml b/example/wallet/android/app/src/debug/AndroidManifest.xml
index 8a83588b..399f6981 100644
--- a/example/wallet/android/app/src/debug/AndroidManifest.xml
+++ b/example/wallet/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.wallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/example/wallet/android/app/src/main/AndroidManifest.xml b/example/wallet/android/app/src/main/AndroidManifest.xml
index 2c74ef06..1e77c952 100644
--- a/example/wallet/android/app/src/main/AndroidManifest.xml
+++ b/example/wallet/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.wallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="wallet"
         android:name="${applicationName}"
diff --git a/example/wallet/android/app/src/profile/AndroidManifest.xml b/example/wallet/android/app/src/profile/AndroidManifest.xml
index 8a83588b..399f6981 100644
--- a/example/wallet/android/app/src/profile/AndroidManifest.xml
+++ b/example/wallet/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.wallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/example/wallet/android/build.gradle b/example/wallet/android/build.gradle
index 3cdaac95..482db1b0 100644
--- a/example/wallet/android/build.gradle
+++ b/example/wallet/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/example/wallet/android/gradle.properties b/example/wallet/android/gradle.properties
index 94adc3a3..b9a9a246 100644
--- a/example/wallet/android/gradle.properties
+++ b/example/wallet/android/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/example/wallet/android/gradle/wrapper/gradle-wrapper.properties b/example/wallet/android/gradle/wrapper/gradle-wrapper.properties
index cb24abda..8bc9958a 100644
--- a/example/wallet/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/wallet/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip