From 6250b55ad4127b7a5ad1175751a3d4e397131271 Mon Sep 17 00:00:00 2001
From: Eric Windmill <ewindmill@google.com>
Date: Thu, 26 Sep 2024 15:05:29 -0400
Subject: [PATCH] rebuild Android

---
 compass_app/app/.metadata                     | 32 +++++++++----------
 compass_app/app/android/.gitignore            |  2 +-
 compass_app/app/android/app/build.gradle      | 28 ++++------------
 compass_app/app/android/gradle.properties     |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 compass_app/app/android/settings.gradle       |  4 +--
 6 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/compass_app/app/.metadata b/compass_app/app/.metadata
index cbf1dc0e0..925b67f88 100644
--- a/compass_app/app/.metadata
+++ b/compass_app/app/.metadata
@@ -4,8 +4,8 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "a14f74ff3a1cbd521163c5f03d68113d50af93d3"
-  channel: "stable"
+  revision: "ee624bc4fd41413cbb89099b0701a42287643d9a"
+  channel: "beta"
 
 project_type: app
 
@@ -13,26 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
-      base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
+      create_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
+      base_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
     - platform: android
-      create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
-      base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
+      create_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
+      base_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
     - platform: ios
-      create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
-      base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
+      create_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
+      base_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
     - platform: linux
-      create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
-      base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
+      create_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
+      base_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
     - platform: macos
-      create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
-      base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
+      create_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
+      base_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
     - platform: web
-      create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
-      base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
+      create_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
+      base_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
     - platform: windows
-      create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
-      base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
+      create_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
+      base_revision: ee624bc4fd41413cbb89099b0701a42287643d9a
 
   # User provided section
 
diff --git a/compass_app/app/android/.gitignore b/compass_app/app/android/.gitignore
index 6f568019d..55afd919c 100644
--- a/compass_app/app/android/.gitignore
+++ b/compass_app/app/android/.gitignore
@@ -7,7 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks
diff --git a/compass_app/app/android/app/build.gradle b/compass_app/app/android/app/build.gradle
index 7bbd3cc91..fb8c978b6 100644
--- a/compass_app/app/android/app/build.gradle
+++ b/compass_app/app/android/app/build.gradle
@@ -5,24 +5,6 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
 }
 
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file("local.properties")
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader("UTF-8") { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
-if (flutterVersionCode == null) {
-    flutterVersionCode = "1"
-}
-
-def flutterVersionName = localProperties.getProperty("flutter.versionName")
-if (flutterVersionName == null) {
-    flutterVersionName = "1.0"
-}
-
 android {
     namespace = "com.example.compass_app"
     compileSdk = flutter.compileSdkVersion
@@ -33,15 +15,19 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "com.example.compass_app"
         // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
-        versionCode = flutterVersionCode.toInteger()
-        versionName = flutterVersionName
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
 
     buildTypes {
diff --git a/compass_app/app/android/gradle.properties b/compass_app/app/android/gradle.properties
index 3b5b324f6..259717082 100644
--- a/compass_app/app/android/gradle.properties
+++ b/compass_app/app/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/compass_app/app/android/gradle/wrapper/gradle-wrapper.properties b/compass_app/app/android/gradle/wrapper/gradle-wrapper.properties
index e1ca574ef..7bb2df6ba 100644
--- a/compass_app/app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/compass_app/app/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.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/compass_app/app/android/settings.gradle b/compass_app/app/android/settings.gradle
index 7e64ce60d..b9e43bd37 100644
--- a/compass_app/app/android/settings.gradle
+++ b/compass_app/app/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.0" apply false
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"