diff --git a/android/app/build.gradle b/android/app/build.gradle index c05be18..420c8b7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,3 +1,10 @@ +plugins { + id "com.android.application" + id "com.google.gms.google-services" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -21,15 +28,9 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'com.google.gms.google-services' - -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace = "com.cloud.solutions.mowater.ksa.customer" - compileSdkVersion 34 + compileSdkVersion 36 compileOptions { coreLibraryDesugaringEnabled true @@ -48,7 +49,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.cloud.solutions.mowater.ksa.customer" - minSdkVersion 23 + minSdkVersion flutter.minSdkVersion targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -74,5 +75,3 @@ dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2' // implementation 'com.google.firebase:firebase-analytics' } - - diff --git a/android/build.gradle b/android/build.gradle index 9c9c726..3b298a1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,13 +1,12 @@ - buildscript { - ext.kotlin_version = '1.8.0' + ext.kotlin_version = '2.0.21' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.7.0' + classpath 'com.android.tools.build:gradle:8.9.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.4.2' } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 09523c0..e2847c8 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.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/settings.gradle b/android/settings.gradle index f86bddf..fdab6c8 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.7.0' apply false - id "org.jetbrains.kotlin.android" version "1.8.22" apply false + id "com.android.application" version '8.9.1' apply false + id "org.jetbrains.kotlin.android" version "2.0.21" apply false } diff --git a/pubspec.yaml b/pubspec.yaml index 489d68c..9b031a6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,13 +36,18 @@ dependencies: cupertino_icons: ^1.0.2 mc_common_app: - path: /Volumes/Data/Projects/Flutter/car_common_app +# path: /Volumes/Data/Projects/Flutter/car_common_app + path: /Users/faizhashmi/Development/Projects/MyProjects/CloudSolutions/car_common_app # path: /Users/aamir/StudioProjects/car_common_app dev_dependencies: flutter_test: sdk: flutter +dependency_overrides: + web: ^1.0.0 + + # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your