From b92f1520d40f92143bcb0cf8d47ef220fa372cb1 Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <>
Date: Sun, 3 Aug 2025 07:36:50 -0400
Subject: [PATCH] Current fixes to build with Gradle 9.0.0 and JSK 24

---
 android/app/build.gradle                      |  6 +++---
 android/app/capacitor.build.gradle            |  1 +
 android/app/src/main/AndroidManifest.xml      | 21 +++++++++++--------
 android/build.gradle                          |  6 +++++-
 android/capacitor.settings.gradle             |  3 +++
 android/gradle.properties                     |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  3 +--
 7 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index b0cdbc1..37a9873 100755
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.wrenchboard.users"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 51
-        versionName "42.9.4"
+        versionCode 186
+        versionName "46.6.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -50,5 +50,5 @@ try {
         apply plugin: 'com.google.gms.google-services'
     }
 } catch(Exception e) {
-    logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
+    logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work" )
 }
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
index b109cff..4fd83f9 100755
--- a/android/app/capacitor.build.gradle
+++ b/android/app/capacitor.build.gradle
@@ -22,6 +22,7 @@ dependencies {
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-preferences')
     implementation project(':capacitor-status-bar')
+    implementation project(':capawesome-capacitor-file-picker')
     implementation project(':codetrix-studio-capacitor-google-auth')
     implementation "com.onesignal:OneSignal:5.1.6"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10"
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 90e584f..a1b74cb 100755
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:tools="http://schemas.android.com/tools"
->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <application
         android:hardwareAccelerated="true"
         android:allowBackup="true"
@@ -31,19 +29,24 @@ xmlns:tools="http://schemas.android.com/tools"
             <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
         </provider>
 
-    <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
-	<meta-data android:name="com.facebook.sdk.ClientToken" android:value="@string/facebook_client_token"/>
-	<meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyCvsRozdnd1i1KBGWC6ewe1RaJYuGbrk3s"/>
-
+        <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id" />
+        <meta-data android:name="com.facebook.sdk.ClientToken" android:value="@string/facebook_client_token" />
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="AIzaSyCvsRozdnd1i1KBGWC6ewe1RaJYuGbrk3s"
+        />
     </application>
 
     <!-- Permissions -->
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
-    
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature android:name="android.hardware.location.network" android:required="false" />
 </manifest>
diff --git a/android/build.gradle b/android/build.gradle
index e914ead..cede1d1 100755
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,17 +2,21 @@
 
 buildscript {
     
+    ext {
+        agp_version = '8.12.0'
+    }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath "com.android.tools.build:gradle:$agp_version"
         classpath 'com.google.gms:google-services:4.3.15'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
+
 }
 
 apply from: "variables.gradle"
diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
index 7dbf5a2..4196566 100755
--- a/android/capacitor.settings.gradle
+++ b/android/capacitor.settings.gradle
@@ -41,5 +41,8 @@ project(':capacitor-preferences').projectDir = new File('../node_modules/@capaci
 include ':capacitor-status-bar'
 project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
 
+include ':capawesome-capacitor-file-picker'
+project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modules/@capawesome/capacitor-file-picker/android')
+
 include ':codetrix-studio-capacitor-google-auth'
 project(':codetrix-studio-capacitor-google-auth').projectDir = new File('../node_modules/@codetrix-studio/capacitor-google-auth/android')
diff --git a/android/gradle.properties b/android/gradle.properties
index 87840f0..7d4a272 100755
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -9,7 +9,7 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx1536m --enable-native-access=ALL-UNNAMED
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 761b8f0..0cb6729 100755
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
-networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=gradle-9.0.0-bin.zip