From 4756abf7a418ab8a81808c57299d916e0a49f501 Mon Sep 17 00:00:00 2001 From: CodeDoctorDE Date: Mon, 11 Nov 2024 11:10:45 +0100 Subject: [PATCH 1/4] Update version --- SECURITY.md | 2 +- api/pubspec.yaml | 2 +- app/AppImageBuilder.yml | 2 +- app/android/settings.gradle | 2 +- app/linux/debian/DEBIAN/control | 2 +- app/pubspec.lock | 2 +- app/pubspec.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index daa7dd1d3794..b6f97d81a1c2 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -5,7 +5,7 @@ | Version | Supported | | | --------- | ------------------ | -------------------------------------------------------------------------------------------------------------------------------- | | 2.2.2-dev | :warning: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.2-rc.1) | -| 2.2.1 | :white_check_mark: | [Docs](https://butterfly.linwood.dev/docs/2.2/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.1) | +| 2.2.2 | :white_check_mark: | [Docs](https://butterfly.linwood.dev/docs/2.2/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.2) | | 2.1.1 | :x: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.1.1) | | 2.0.3 | :x: | [Docs](https://butterfly.linwood.dev/docs/2.0/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.0.3) | | 1.6.1 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.6/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.6.1) | diff --git a/api/pubspec.yaml b/api/pubspec.yaml index 85db2a2a697b..a16740634661 100644 --- a/api/pubspec.yaml +++ b/api/pubspec.yaml @@ -1,6 +1,6 @@ name: butterfly_api description: The Linwood Butterfly API -version: 2.2.2-rc.2 +version: 2.2.2 publish_to: none environment: diff --git a/app/AppImageBuilder.yml b/app/AppImageBuilder.yml index 00dcabdfc3fb..3d4bd6bf47c8 100644 --- a/app/AppImageBuilder.yml +++ b/app/AppImageBuilder.yml @@ -14,7 +14,7 @@ AppDir: id: dev.linwood.butterfly name: Linwood Butterfly icon: dev.linwood.butterfly - version: 2.2.2-rc.2 + version: 2.2.2 exec: butterfly exec_args: $@ apt: diff --git a/app/android/settings.gradle b/app/android/settings.gradle index 3a2c549d8cc6..f1a0fd207e7b 100644 --- a/app/android/settings.gradle +++ b/app/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '8.7.1' apply false + id "com.android.application" version '8.7.2' apply false id "org.jetbrains.kotlin.android" version "1.9.22" apply false } diff --git a/app/linux/debian/DEBIAN/control b/app/linux/debian/DEBIAN/control index 3dcf7548fcb1..eb31d4e77e8d 100644 --- a/app/linux/debian/DEBIAN/control +++ b/app/linux/debian/DEBIAN/control @@ -1,5 +1,5 @@ Package: linwood-butterfly -Version: 2.2.2-rc.2 +Version: 2.2.2 Section: base Priority: optional Homepage: https://github.com/LinwoodDev/butterfly diff --git a/app/pubspec.lock b/app/pubspec.lock index 55ee6e954f76..4cb3821bb58a 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -172,7 +172,7 @@ packages: path: "../api" relative: true source: path - version: "2.2.2-rc.2" + version: "2.2.2" camera: dependency: "direct main" description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index eeba2a3b5443..c5ab65a75770 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -13,7 +13,7 @@ publish_to: none # 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: 2.2.2-rc.2+122 +version: 2.2.2+122 environment: sdk: ">=3.4.0 <4.0.0" From 3722027f6b53292d9923514b79bd41d1b7f321e2 Mon Sep 17 00:00:00 2001 From: Linwood CI Date: Mon, 11 Nov 2024 10:39:41 +0000 Subject: [PATCH 2/4] Add changelog of v2.2.2 --- CHANGELOG.md | 9 +++++++++ .../usr/share/metainfo/dev.linwood.butterfly.appdata.xml | 1 + 2 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62b5b78d2ddf..e7ce00a37399 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ +## 2.2.2 (2024-11-11) + +* Fix loading screen showing after error +* Fix packs dialog file system operations +* Downgrade pdfjs on web + +This is a stable release, it includes all the changes from the 2.2.2 nightly releases. +Read more here: https://linwood.dev/butterfly/2.2.2 + ## 2.2.2-rc.1 (2024-11-04) * Add checksums to release assets ([#753](https://github.com/LinwoodDev/Butterfly/issues/753)) diff --git a/app/linux/debian/usr/share/metainfo/dev.linwood.butterfly.appdata.xml b/app/linux/debian/usr/share/metainfo/dev.linwood.butterfly.appdata.xml index 60d003006460..495e4c8c9916 100644 --- a/app/linux/debian/usr/share/metainfo/dev.linwood.butterfly.appdata.xml +++ b/app/linux/debian/usr/share/metainfo/dev.linwood.butterfly.appdata.xml @@ -38,6 +38,7 @@ dev.linwood.butterfly.desktop + From 5e9aa570dff2e1fb3d007b81338a356636f912e8 Mon Sep 17 00:00:00 2001 From: Linwood CI Date: Mon, 11 Nov 2024 10:48:12 +0000 Subject: [PATCH 3/4] Update Version to 2.3.0-beta.0 --- api/pubspec.yaml | 2 +- app/AppImageBuilder.yml | 2 +- app/linux/debian/DEBIAN/control | 2 +- app/pubspec.lock | 2 +- app/pubspec.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/pubspec.yaml b/api/pubspec.yaml index a16740634661..464ca39b8a91 100644 --- a/api/pubspec.yaml +++ b/api/pubspec.yaml @@ -1,6 +1,6 @@ name: butterfly_api description: The Linwood Butterfly API -version: 2.2.2 +version: 2.3.0-beta.0 publish_to: none environment: diff --git a/app/AppImageBuilder.yml b/app/AppImageBuilder.yml index 3d4bd6bf47c8..fd12b7a0ee9e 100644 --- a/app/AppImageBuilder.yml +++ b/app/AppImageBuilder.yml @@ -14,7 +14,7 @@ AppDir: id: dev.linwood.butterfly name: Linwood Butterfly icon: dev.linwood.butterfly - version: 2.2.2 + version: 2.3.0-beta.0 exec: butterfly exec_args: $@ apt: diff --git a/app/linux/debian/DEBIAN/control b/app/linux/debian/DEBIAN/control index eb31d4e77e8d..cde1c9002ab4 100644 --- a/app/linux/debian/DEBIAN/control +++ b/app/linux/debian/DEBIAN/control @@ -1,5 +1,5 @@ Package: linwood-butterfly -Version: 2.2.2 +Version: 2.3.0-beta.0 Section: base Priority: optional Homepage: https://github.com/LinwoodDev/butterfly diff --git a/app/pubspec.lock b/app/pubspec.lock index 4cb3821bb58a..b1f28f5a7aae 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -172,7 +172,7 @@ packages: path: "../api" relative: true source: path - version: "2.2.2" + version: "2.3.0-beta.0" camera: dependency: "direct main" description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index c5ab65a75770..cebf5392d6d6 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -13,7 +13,7 @@ publish_to: none # 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: 2.2.2+122 +version: 2.3.0-beta.0+123 environment: sdk: ">=3.4.0 <4.0.0" From 6a33eaa84b9e04074b0896c7d4095bf906d40e12 Mon Sep 17 00:00:00 2001 From: Linwood CI Date: Mon, 11 Nov 2024 10:51:56 +0000 Subject: [PATCH 4/4] Bump version --- app/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/pubspec.yaml b/app/pubspec.yaml index c5ab65a75770..bb74ec41722e 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -13,7 +13,7 @@ publish_to: none # 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: 2.2.2+122 +version: 2.2.2+123 environment: sdk: ">=3.4.0 <4.0.0"