2026-02-23-1

android/app/build.gradle

@@ -45,29 +45,43 @@ android {
         applicationId = "com.Intaleq.intaleq"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = 23
+        minSdkVersion = 24
         targetSdk = 36
-        versionCode = 58
-        versionName = '1.1.58'
+        versionCode = 59
+        versionName = '1.1.59'
         multiDexEnabled = true
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"
         }
+        // استدعاء المفتاح من ملف key.properties
+        manifestPlaceholders += [mapsApiKey: keystoreProperties['mapsApiKey'] ?: ""]
+    
     }
 
-    signingConfigs {
+     signingConfigs {
         release {
-            // Check if properties are defined before using them
-            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword = keystoreProperties['storePassword']
-            keyAlias = keystoreProperties['keyAlias']
-            keyPassword = keystoreProperties['keyPassword']
+            // Defensively check if properties exist to avoid NullPointerException in BundleTool
+            if (keystoreProperties.isEmpty()) {
+                println "BUILD_LOG: ERROR - No properties found in key.properties. Release build will fail."
+            } else {
+                storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+                storePassword = keystoreProperties['storePassword']
+                keyAlias = keystoreProperties['keyAlias']
+                keyPassword = keystoreProperties['keyPassword']
+                
+                // Final check to ensure no crucial signing variable is null
+                if (!storeFile || !storePassword || !keyAlias || !keyPassword) {
+                    println "BUILD_LOG: ERROR - One or more signing properties are NULL. Check key.properties."
+                }
+            }
         }
     }
 
     buildTypes {
         release {
+            // Only assign signingConfig if the release config is valid
             signingConfig signingConfigs.release
+            
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -86,4 +100,4 @@ dependencies {
     implementation 'com.stripe:paymentsheet:21.4.2'
     implementation 'com.scottyab:rootbeer-lib:0.1.0'
     implementation 'com.google.android.gms:play-services-safetynet:18.1.0'
-}
+}