2026-04-03-pre map libra

android/app/build.gradle

@@ -20,39 +20,57 @@ android {
     compileSdk = 36
     ndkVersion "29.0.14033849"
 
-    externalNativeBuild {
-        cmake {
-            path "src/main/cpp/CMakeLists.txt"
-            // Using a common, stable version. Your CMakeLists.txt requests 3.10.2, 
-            // but your old gradle file had 3.22.1 and 3.31.5. Let's use a stable one.
-            version "3.22.1" 
-        }
-    }
-
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
         coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_17
+    }
+
+    externalNativeBuild {
+        cmake {
+            path "src/main/cpp/CMakeLists.txt"
+            version "3.22.1"
+        }
+    }
+
+    // تمت الإضافة: توجيه مسار المكتبات الأصلية لمطابقة تطبيق الراكب
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['src/main/jniLibs']
+        }
     }
 
-    // Merged the two defaultConfig sections into one. This is the correct way.
     defaultConfig {
         applicationId = "com.intaleq_driver"
-        minSdkVersion = flutter.minSdkVersion
+        minSdkVersion = flutter.minSdkVersion 
         targetSdk = 36
-        versionCode = 59
-        versionName = '1.1.59' // I've used the higher version name
+        versionCode = 61
+        versionName = '1.1.61' 
         multiDexEnabled = true
 
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a"  // Keep these!
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
+        
         manifestPlaceholders += [mapsApiKey: keystoreProperties['mapsApiKey'] ?: ""]
 
+        // تمت الإضافة: تمرير تعليمات 16 KB لمترجم C++
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+            }
+        }
+    }
+
+    // تمت الإضافة: منع ضغط المكتبات لتتوافق مع متطلبات نظام التشغيل
+    packaging {
+        jniLibs {
+            useLegacyPackaging = false
+        }
     }
 
     signingConfigs {
@@ -80,9 +98,17 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    // تمت الترقية لتطابق تطبيق الراكب
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
+    
+    // تمت الترقية لتطابق تطبيق الراكب (لتجنب ملفات 4KB القديمة)
+    implementation "com.stripe:stripe-android:21.4.2"
+    implementation 'com.stripe:paymentsheet:21.4.2'
+    
     implementation 'com.scottyab:rootbeer-lib:0.1.0'
-    implementation 'com.stripe:paymentsheet:20.52.2'
-    implementation "androidx.concurrent:concurrent-futures:1.2.0" // Added this from your first file, it was missing
-    implementation 'com.google.android.gms:play-services-safetynet:18.0.1'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
-}
+    
+    // تمت الترقية لتطابق تطبيق الراكب
+    implementation 'com.google.android.gms:play-services-safetynet:18.1.0'
+    
+    implementation "androidx.concurrent:concurrent-futures:1.2.0" 
+}

android/build.gradle

@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = '2.1.0'
+    ext.kotlin_version = '2.3.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.13.2'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
@@ -22,10 +22,29 @@ rootProject.buildDir = '../build'
 
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-
-subprojects {
     project.evaluationDependsOn(':app')
+
+    def setupAndroid = {
+        if (project.plugins.hasPlugin('com.android.library') || project.plugins.hasPlugin('com.android.application')) {
+            project.android {
+                if (namespace == null || namespace == "") {
+                    namespace = project.group
+                }
+                compileSdk 36
+                defaultConfig {
+                    targetSdk 36
+                }
+            }
+        }
+    }
+
+    if (project.state.executed) {
+        setupAndroid()
+    } else {
+        project.afterEvaluate {
+            setupAndroid()
+        }
+    }
 }
 
 tasks.register("clean", Delete) {

android/build/ios/XCBuildData/PIFCache/target/TARGET@v11_hash=e6e6b41d63ea49cfd09482e786f18c0f-json

@@ -0,0 +1 @@
+{"buildConfigurations":[{"baseConfigurationFileReference":"bfdfe7dc352907fc980b868725387e98713093b836ed941f0ae441b0f84ea767","buildSettings":{"ASSETCATALOG_COMPILER_APPICON_NAME":"AppIcon","ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME":"AccentColor","CLANG_ENABLE_OBJC_WEAK":"NO","ENABLE_USER_SCRIPT_SANDBOXING":"NO","EXCLUDED_ARCHS[sdk=iphonesimulator*]":"arm64","IPHONEOS_DEPLOYMENT_TARGET":"14.0","LD_RUNPATH_SEARCH_PATHS":"$(inherited) @executable_path/Frameworks","ONLY_ACTIVE_ARCH":"NO","SDKROOT":"iphoneos","TARGETED_DEVICE_FAMILY":"1,2"},"guid":"bfdfe7dc352907fc980b868725387e980bc977b873df9b0e01b3c822e5c77429","name":"Debug"},{"baseConfigurationFileReference":"bfdfe7dc352907fc980b868725387e982a75f557648c19374fbba760cc62794a","buildSettings":{"ASSETCATALOG_COMPILER_APPICON_NAME":"AppIcon","ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME":"AccentColor","CLANG_ENABLE_OBJC_WEAK":"NO","ENABLE_USER_SCRIPT_SANDBOXING":"NO","EXCLUDED_ARCHS[sdk=iphonesimulator*]":"arm64","IPHONEOS_DEPLOYMENT_TARGET":"14.0","LD_RUNPATH_SEARCH_PATHS":"$(inherited) @executable_path/Frameworks","SDKROOT":"iphoneos","TARGETED_DEVICE_FAMILY":"1,2","VALIDATE_PRODUCT":"YES"},"guid":"bfdfe7dc352907fc980b868725387e98b75274b69084014a6a5ac37ea7a9d4bc","name":"Profile"},{"baseConfigurationFileReference":"bfdfe7dc352907fc980b868725387e982a75f557648c19374fbba760cc62794a","buildSettings":{"ASSETCATALOG_COMPILER_APPICON_NAME":"AppIcon","ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME":"AccentColor","CLANG_ENABLE_OBJC_WEAK":"NO","ENABLE_USER_SCRIPT_SANDBOXING":"NO","EXCLUDED_ARCHS[sdk=iphonesimulator*]":"arm64","IPHONEOS_DEPLOYMENT_TARGET":"14.0","LD_RUNPATH_SEARCH_PATHS":"$(inherited) @executable_path/Frameworks","SDKROOT":"iphoneos","TARGETED_DEVICE_FAMILY":"1,2","VALIDATE_PRODUCT":"YES"},"guid":"bfdfe7dc352907fc980b868725387e988b8e6347e534cb57e9bb1b22dc47b716","name":"Release"}],"buildPhases":[],"buildRules":[],"dependencies":[],"guid":"bfdfe7dc352907fc980b868725387e989da425bb6d6d5d8dbb95e4afffb82217","name":"Flutter","provisioningSourceData":[{"bundleIdentifierFromInfoPlist":"","configurationName":"Debug","provisioningStyle":0},{"bundleIdentifierFromInfoPlist":"","configurationName":"Profile","provisioningStyle":0},{"bundleIdentifierFromInfoPlist":"","configurationName":"Release","provisioningStyle":0}],"type":"aggregate"}

android/build/ios/XCBuildData/PIFCache/workspace/WORKSPACE@v11_hash=(null)_subobjects=8844399cdd03df5fa0102d432062b68f-json

@@ -0,0 +1 @@
+{"guid":"dc4b70c03e8043e50e38f2068887b1d4","name":"Pods","path":"/Users/hamzaaleghwairyeen/development/App/intaleq_driver/ios/Pods/Pods.xcodeproj/project.xcworkspace","projects":["PROJECT@v11_mod=8a8e73429c1ecbff8f5eafafe69e0e09_hash=bfdfe7dc352907fc980b868725387e98plugins=1OJSG6M1FOV3XYQCBH7Z29RZ0FPR9XDE1"]}

android/settings.gradle

@@ -16,9 +16,9 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.11.0' apply false
-    id "com.google.gms.google-services" version "4.3.10" apply false
-    id "org.jetbrains.kotlin.android" version "2.1.0" apply false // Updated version
+    id "com.android.application" version '8.13.2' apply false
+    id "com.google.gms.google-services" version "4.3.15" apply false
+    id "org.jetbrains.kotlin.android" version "2.3.10" apply false 
 }
 
 include ":app"