conflicts

This commit is contained in:
Vadim 2023-05-16 09:40:12 +02:00
parent 15be1beca5
commit c8ab4a362e
3 changed files with 33 additions and 6 deletions

View file

@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) {
def flutterRoot = localProperties.getProperty('flutter.sdk') def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) { 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') def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
@ -33,6 +33,10 @@ apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
gradle.beforeProject({ project->
project.setProperty("target-platform", "android-arm,android-arm64")
})
android { android {
compileSdkVersion 33 compileSdkVersion 33
ndkVersion flutter.ndkVersion ndkVersion flutter.ndkVersion
@ -53,8 +57,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 33 targetSdkVersion 33
ndk.abiFilters 'arm64-v8a', 'armeabi-v7a' ndk.abiFilters 'armeabi-v7a', 'arm64-v8a'
targetSdkVersion flutter.targetSdkVersion
/// legacy material-lightmeter ap stopped updating after 60022 /// legacy material-lightmeter ap stopped updating after 60022
/// 7xxxx means that it is a new app /// 7xxxx means that it is a new app
versionCode 70000 + flutterVersionCode.toInteger() versionCode 70000 + flutterVersionCode.toInteger()
@ -92,7 +95,31 @@ android {
signingConfig signingConfigs.release signingConfig signingConfigs.release
minifyEnabled true minifyEnabled true
shrinkResources 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
} }
} }
} }

View file

@ -28,6 +28,6 @@ subprojects {
project.evaluationDependsOn(':app') project.evaluationDependsOn(':app')
} }
task clean(type: Delete) { tasks.register("clean", Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }

View file

@ -27,7 +27,7 @@ dependencies:
url: "https://github.com/vodemn/m3_lightmeter_resources" url: "https://github.com/vodemn/m3_lightmeter_resources"
ref: main ref: main
material_color_utilities: 0.2.0 material_color_utilities: 0.2.0
package_info_plus: 3.0.2 package_info_plus: 4.0.0
permission_handler: 10.2.0 permission_handler: 10.2.0
provider: 6.0.4 provider: 6.0.4
shared_preferences: 2.0.15 shared_preferences: 2.0.15