diff --git a/android/app/build.gradle b/android/app/build.gradle index a751e7b..d12ef09 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,3 +1,14 @@ +plugins { + id "com.android.application" + // START: FlutterFire Configuration + id 'com.google.gms.google-services' + // END: FlutterFire Configuration + id "kotlin-android" + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id "dev.flutter.flutter-gradle-plugin" +} + + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -21,8 +32,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" def keystoreProperties = new Properties() def keystorePropertiesFile = rootProject.file('key.properties') @@ -31,12 +40,24 @@ if (keystorePropertiesFile.exists()) { } android { + namespace = "com.mokkon.fcs.fcs" + compileSdkVersion 34 + ndkVersion = "27.0.12077973" + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + coreLibraryDesugaringEnabled true + } + + kotlinOptions { + jvmTarget = 17 + } + lintOptions { checkReleaseBuilds false } - compileSdkVersion 34 - defaultConfig { minSdkVersion 23 targetSdkVersion 34 @@ -92,8 +113,6 @@ flutter { } dependencies { - implementation 'com.android.support:multidex:1.0.3' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} - -apply plugin: 'com.google.gms.google-services' + implementation "androidx.multidex:multidex:2.0.1" + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2' +} \ No newline at end of file diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index e5bd26c..f880684 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/android/app/src/dev/AndroidManifest.xml b/android/app/src/dev/AndroidManifest.xml index 0cb64eb..48ad6f0 100644 --- a/android/app/src/dev/AndroidManifest.xml +++ b/android/app/src/dev/AndroidManifest.xml @@ -1,5 +1,4 @@ - +