From dfc5772b9303005f09572a33d460f966e49a7fba Mon Sep 17 00:00:00 2001 From: Varakh Date: Fri, 1 Dec 2023 19:08:16 +0100 Subject: [PATCH 1/2] Prepare release of 1.6.2+20 #noissue --- CHANGELOG.md | 3 ++- README.md | 2 +- android/app/build.gradle | 4 ++-- android/fastlane/Fastfile | 2 +- android/fastlane/README.md | 4 ++-- pubspec.lock | 8 ++++---- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8358f70..af24538 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ # CHANGELOG -## 1.6.2+20 - UNRELEASED +## 1.6.2+20 * Updated internal dependencies * Moved progress indicator of _Show Configuration_ into the underlying button * Bumped Android minSdk to `30` (Android 11) +* Bumped Android targetSdk to `34` (Android 14) * Fixed permission service not handling Android SDK 33 correctly * Fixed permission service not being started during application start diff --git a/README.md b/README.md index 6854525..d9d643a 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ bundle exec fastlane android beta bundle exec fastlane android deploy # deploy (build signed fdroid large bundle [no target and abi split]) -bundle exec fastlane android build_production_froid +bundle exec fastlane android build_production_fdroid ``` ##### iOS diff --git a/android/app/build.gradle b/android/app/build.gradle index 79db66a..8d20657 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -31,7 +31,7 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdkVersion 33 + compileSdkVersion 34 lintOptions { disable 'InvalidPackage' @@ -40,7 +40,7 @@ android { defaultConfig { applicationId "de.varakh.fbmobile" minSdkVersion 30 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index 2962bc5..9138a00 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -12,7 +12,7 @@ platform :android do end desc "Build Production fdroid" - lane :build_production_froid do + lane :build_production_fdroid do sh("#{ENV['PWD']}/fastlane/buildAndroidProductionFdroid.sh") end diff --git a/android/fastlane/README.md b/android/fastlane/README.md index 156b973..5b28be7 100644 --- a/android/fastlane/README.md +++ b/android/fastlane/README.md @@ -31,10 +31,10 @@ Build Debug Build Production -### android build_production_froid +### android build_production_fdroid ```sh -[bundle exec] fastlane android build_production_froid +[bundle exec] fastlane android build_production_fdroid ``` Build Production fdroid diff --git a/pubspec.lock b/pubspec.lock index fca9b68..33d2962 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -173,10 +173,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" + sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e url: "https://pub.dev" source: hosted - version: "0.3.3+7" + version: "0.3.3+8" crypto: dependency: transitive description: @@ -1006,10 +1006,10 @@ packages: dependency: transitive description: name: win32 - sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f" + sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.1.1" win32_registry: dependency: transitive description: From 8b96610fa624653e454057a57841bc4366648cad Mon Sep 17 00:00:00 2001 From: Varakh Date: Fri, 1 Dec 2023 19:20:13 +0100 Subject: [PATCH 2/2] Prepare next dev cycle #noissue --- CHANGELOG.md | 3 +++ pubspec.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af24538..68ee551 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # CHANGELOG +## 1.6.3+21 - UNRELEASED +* ... + ## 1.6.2+20 * Updated internal dependencies * Moved progress indicator of _Show Configuration_ into the underlying button diff --git a/pubspec.yaml b/pubspec.yaml index 47f959e..8ee3ca9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: A mobile client for FileBin. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.6.2+20 +version: 1.6.3+21 environment: sdk: '>=3.2.0 <4.0.0'