From c8ab4a362e11c2da8e10a81e1e540bc3659f4dc8 Mon Sep 17 00:00:00 2001
From: Vadim <vadim.turko@gmail.com>
Date: Tue, 16 May 2023 09:40:12 +0200
Subject: [PATCH] conflicts

---
 android/app/build.gradle | 35 +++++++++++++++++++++++++++++++----
 android/build.gradle     |  2 +-
 pubspec.yaml             |  2 +-
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 76d7f8b..c43ab93 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) {
 
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+    throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
@@ -33,6 +33,10 @@ apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+gradle.beforeProject({ project->
+    project.setProperty("target-platform", "android-arm,android-arm64")
+})
+
 android {
     compileSdkVersion 33
     ndkVersion flutter.ndkVersion
@@ -53,8 +57,7 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 33
-        ndk.abiFilters 'arm64-v8a', 'armeabi-v7a'
-        targetSdkVersion flutter.targetSdkVersion
+        ndk.abiFilters 'armeabi-v7a', 'arm64-v8a'
         /// legacy material-lightmeter ap stopped updating after 60022
         /// 7xxxx means that it is a new app
         versionCode 70000 + flutterVersionCode.toInteger()
@@ -92,7 +95,31 @@ android {
             signingConfig signingConfigs.release
             minifyEnabled true
             shrinkResources true
-            ndk.abiFilters 'arm64-v8a', 'armeabi-v7a'
+            ndk.abiFilters 'armeabi-v7a', 'arm64-v8a'
+        }
+    }
+
+    // Instead, use the bundle block to control which types of configuration APKs
+    // you want your app bundle to support.
+    bundle {
+        language {
+            // This property is set to true by default.
+            // You can specify `false` to turn off
+            // generating configuration APKs for language resources.
+            // These resources are instead packaged with each base and
+            // feature APK.
+            // Continue reading below to learn about situations when an app
+            // might change setting to `false`, otherwise consider leaving
+            // the default on for more optimized downloads.
+            enableSplit = false
+        }
+        density {
+            // This property is set to true by default.
+            enableSplit = true
+        }
+        abi {
+            // This property is set to true by default.
+            enableSplit = true
         }
     }
 }
diff --git a/android/build.gradle b/android/build.gradle
index e0630bc..2a1e6ed 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -28,6 +28,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 742dde6..85e08b9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -27,7 +27,7 @@ dependencies:
       url: "https://github.com/vodemn/m3_lightmeter_resources"
       ref: main
   material_color_utilities: 0.2.0
-  package_info_plus: 3.0.2
+  package_info_plus: 4.0.0
   permission_handler: 10.2.0
   provider: 6.0.4
   shared_preferences: 2.0.15