12/24/1

android/app/build.gradle

@@ -59,22 +59,13 @@ android {
         applicationId = "com.mobileapp.store.ride"
         // 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.
-<<<<<<< HEAD
-        minSdkVersion 23
-        targetSdkVersion 34
-        versionCode 65
-        versionName '1.5.65'
-        multiDexEnabled =true
-        // manifestPlaceholders = [mapsApiKey: 'android/app/src/main/AndroidManifest.xml']
-=======
         minSdk = 23
         targetSdk = flutter.targetSdkVersion
-        versionCode = 108
-        versionName = '1.6.108'
+        versionCode = 109
+        versionName = '1.6.109'
         multiDexEnabled =true
 
         // manifestPlaceholders can be specified here if needed
->>>>>>> 8813b4d
     }
 
     signingConfigs {
@@ -89,9 +80,9 @@ android {
     buildTypes {
         release {
             signingConfig signingConfigs.release
-//            minifyEnabled true
-//            shrinkResources true
-//            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 }
@@ -102,11 +93,11 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
     // Optional dependencies like Firebase can be uncommented if needed
     // implementation platform('com.google.firebase:firebase-bom:32.1.1')
-    implementation "com.stripe:stripe-android:20.47.0"
-    implementation 'com.stripe:paymentsheet:20.47.0'
+    implementation "com.stripe:stripe-android:20.52.2"
+    implementation 'com.stripe:paymentsheet:20.52.2'
 
 
     // If push provisioning is needed, make sure you have the correct version:

android/app/proguard-rules.pro

@@ -28,3 +28,5 @@
 # Keep rules for Stripe
 -keep class com.stripe.android.** { *; }
 -keep class com.stripe.android.pushProvisioning.** { *; }
+-keep class com.yalantis.ucrop.** { *; }
+-keep class com.yalantis.ucrop.util.** { *; }

android/gradle.properties

@@ -4,3 +4,5 @@ android.enableJetifier=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+
+android.enableR8.fullMode=true