diff --git a/.flutter b/.flutter index 05db968..a402d9a 160000 --- a/.flutter +++ b/.flutter @@ -1 +1 @@ -Subproject commit 05db9689081f091050f01aed79f04dce0c750154 +Subproject commit a402d9a4376add5bc2d6b1e33e53edaae58c07f8 diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index a684a7f..256320a 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -1,6 +1,7 @@ import java.io.FileInputStream import java.util.Properties import com.android.build.api.variant.FilterConfiguration.FilterType.* +import com.android.build.gradle.internal.api.ApkVariantOutputImpl plugins { id("com.android.application") @@ -86,18 +87,17 @@ android { val abiCodes = mapOf("x86_64" to 1, "armeabi-v7a" to 2, "arm64-v8a" to 3) -androidComponents { - onVariants { variant -> - variant.outputs.forEach { output -> - val name = output.filters.find { it.filterType == ABI }?.identifier - val baseAbiCode = abiCodes[name] ?: 0 - if (baseAbiCode != null) { - output.versionCode.set(baseAbiCode + ((output.versionCode.get() ?: 0) * 10)) - } +android.applicationVariants.configureEach { + val variant = this + variant.outputs.forEach { output -> + val abiVersionCode = abiCodes[output.filters.find { it.filterType == "ABI" }?.identifier] + if (abiVersionCode != null) { + (output as ApkVariantOutputImpl).versionCodeOverride = variant.versionCode * 10 + abiVersionCode } } } + dependencies { coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5") } diff --git a/pubspec.lock b/pubspec.lock index b687398..3a0ed90 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -232,10 +232,10 @@ packages: dependency: "direct main" description: name: dynamic_color - sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d + sha256: "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c" url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.8.1" easy_localization: dependency: "direct main" description: @@ -288,10 +288,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: e7e16c9d15c36330b94ca0e2ad8cb61f93cd5282d0158c09805aed13b5452f22 + sha256: f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f url: "https://pub.dev" source: hosted - version: "10.3.2" + version: "10.3.3" fixnum: dependency: transitive description: @@ -572,10 +572,10 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "11.0.1" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: @@ -1059,10 +1059,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "69ee86740f2847b9a4ba6cffa74ed12ce500bbe2b07f3dc1e643439da60637b7" + sha256: "07cffecb7d68cbc6437cd803d5f11a86fe06736735c3dfe46ff73bcb0f958eed" url: "https://pub.dev" source: hosted - version: "6.3.18" + version: "6.3.21" url_launcher_ios: dependency: transitive description: @@ -1155,10 +1155,10 @@ packages: dependency: transitive description: name: webview_flutter_android - sha256: "9a25f6b4313978ba1c2cda03a242eea17848174912cfb4d2d8ee84a556f248e3" + sha256: "3c4eb4fcc252b40c2b5ce7be20d0481428b70f3ff589b0a8b8aaeb64c6bed701" url: "https://pub.dev" source: hosted - version: "4.10.1" + version: "4.10.2" webview_flutter_platform_interface: dependency: transitive description: @@ -1209,4 +1209,4 @@ packages: version: "6.3.0" sdks: dart: ">=3.9.0 <4.0.0" - flutter: ">=3.29.0" + flutter: ">=3.35.0"