diff --git a/android/app/build.gradle b/android/app/build.gradle index 4892b16..e584a55 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -31,6 +31,7 @@ if (flutterVersionName == null) { android { namespace = "com.cloud.solutions.mowater.ksa.provider" compileSdkVersion 36 + ndkVersion = "28.2.13676358" compileOptions { coreLibraryDesugaringEnabled true diff --git a/android/build.gradle b/android/build.gradle index 05e2434..bbfe4ca 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -32,14 +32,14 @@ buildscript { - ext.kotlin_version = '2.0.21' + ext.kotlin_version = '2.3.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.9.1' + classpath 'com.android.tools.build:gradle:8.11.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.4.2' } diff --git a/android/gradle.properties b/android/gradle.properties index 94adc3a..eac5ff9 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,7 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e2847c8..ca025c8 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/settings.gradle b/android/settings.gradle index fdab6c8..950469e 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '8.9.1' apply false - id "org.jetbrains.kotlin.android" version "2.0.21" apply false + id "com.android.application" version '8.11.1' apply false + id "org.jetbrains.kotlin.android" version "2.3.10" apply false } diff --git a/lib/main.dart b/lib/main.dart index 1c5dad1..ed0cf99 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -69,14 +69,9 @@ Future main() async { ProviderAppRoutes.routes.addAll(AppRoutes.routes); runApp(MultiProvider( providers: [ - ChangeNotifierProvider( - create: (_) => BaseVM(), - ), + ChangeNotifierProvider(create: (_) => BaseVM()), ChangeNotifierProvider( - create: (_) => DashboardVMProvider( - userRepo: injector.get(), - commonServices: injector.get(), - ), + create: (_) => DashboardVMProvider(userRepo: injector.get(), commonServices: injector.get()), ), ChangeNotifierProvider( create: (_) => UserVM( diff --git a/pubspec.yaml b/pubspec.yaml index 0c68fb6..51370d5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,9 +39,9 @@ dependencies: # path: C:/Users/mirza.shafique/AndroidStudioProjects/mc_common_app mc_common_app: - # path: D:\Development\car_common_app - # path: /Users/faizhashmi/Development/Projects/MyProjects/CloudSolutions/car_common_app - path: /Volumes/Data/Projects/Flutter_Projects/mowater_apps/car_common_app + path: /Users/faiz-hashmi/StudioProjects/mowater_apps/car_common_app + + # path: /Volumes/Data/Projects/Flutter_Projects/mowater_apps/car_common_app # path: /Users/aamir/StudioProjects/car_common_app