12/17/2

android/app/build.gradle

@@ -26,18 +26,24 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 // apply plugin: 'com.google.gms.google-services'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
-
+if (keystorePropertiesFile.exists()) {
+    keystorePropertiesFile.withReader('UTF-8') { reader ->
+        keystoreProperties.load(reader)
+    }
+}
 
 android {
     namespace "com.mobileapp.store.ride"
-    compileSdkVersion 34
-    ndkVersion flutter.ndkVersion
+    compileSdk 35
+    ndkVersion "26.1.10909125"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
@@ -49,33 +55,45 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.mobileapp.store.ride"
+        // Specify your unique Application ID
+        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'
+        multiDexEnabled =true
+
+        // manifestPlaceholders can be specified here if needed
+>>>>>>> 8813b4d
     }
 
-   signingConfigs {
-       release {
-           keyAlias keystoreProperties['keyAlias']
-           keyPassword keystoreProperties['keyPassword']
-           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-           storePassword keystoreProperties['storePassword']
-       }
-   }
-   buildTypes {
-       release {
-           signingConfig signingConfigs.release
-       }
-   }
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
+        }
+    }
 
-     
+    buildTypes {
+        release {
+            signingConfig signingConfigs.release
+//            minifyEnabled true
+//            shrinkResources true
+//            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
 }
 
 flutter {
@@ -84,6 +102,14 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
+    // 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'
+
+
+    // If push provisioning is needed, make sure you have the correct version:
+//    implementation "com.stripe:stripe-android-pushprovisioning:VERSION" // Replace VERSION with the correct one.
+
+}