From ff5ec1b7de9c15c14d9e7108051aabb135261f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Thu, 8 Dec 2022 20:30:37 +0100 Subject: [PATCH] fix: podpora pro apk split + aktualizace knihovny --- CHANGELOG.md | 3 +++ android/app/build.gradle | 11 +++++++++++ metadata/cs-CZ/changelogs/24.txt | 2 ++ metadata/en-US/changelogs/24.txt | 2 ++ pubspec.lock | 2 +- pubspec.yaml | 4 ++-- 6 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 metadata/cs-CZ/changelogs/24.txt create mode 100644 metadata/en-US/changelogs/24.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e2c84f..9a6408d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.5.1 +- aktualizovat knihovnu canteenlib +- přidat podporu pro splitování APK podle ABI # 1.5.0 - umožnit ukládat více dnů offline - chyba při ukládání offline vás nyní již nevyhodí ale zobrazí pouze zprávu diff --git a/android/app/build.gradle b/android/app/build.gradle index 508c17f..93069f7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -83,3 +83,14 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.3.1' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' } + +ext.abiCodes = ["x86_64": 1, "armeabi-v7a": 2, "arm64-v8a": 3] +import com.android.build.OutputFile +android.applicationVariants.all { variant -> + variant.outputs.each { output -> + def abiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI)) + if (abiVersionCode != null) { + output.versionCodeOverride = variant.versionCode * 10 + abiVersionCode + } + } +} \ No newline at end of file diff --git a/metadata/cs-CZ/changelogs/24.txt b/metadata/cs-CZ/changelogs/24.txt new file mode 100644 index 0000000..56153c2 --- /dev/null +++ b/metadata/cs-CZ/changelogs/24.txt @@ -0,0 +1,2 @@ +- aktualizace knihovny canteenlib +- splitování APK \ No newline at end of file diff --git a/metadata/en-US/changelogs/24.txt b/metadata/en-US/changelogs/24.txt new file mode 100644 index 0000000..41a1846 --- /dev/null +++ b/metadata/en-US/changelogs/24.txt @@ -0,0 +1,2 @@ +- updated canteenlib library +- added support for APK splitting \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 48f9862..556b2c2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -28,7 +28,7 @@ packages: name: canteenlib url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.1.0-alpha.1" characters: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index cd456bf..d258dce 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: 'none' # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 # followed by an optional build number separated by a +. -version: 1.5.0+23 +version: 1.5.1+24 environment: sdk: ">=2.16.1 <3.0.0" @@ -16,7 +16,7 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - canteenlib: ^1.0.1 + canteenlib: ^1.1.0-alpha.1 flutter_secure_storage: 5.0.2 url_launcher: ^6.0.20 path_provider: ^2.0.9