Merge branch 'develop' of https://github.com/LinwoodDev/Butterfly int…

…o develop

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 <!--ENTER CHANGELOG HERE-->
 
+## 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))

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)      |

api/pubspec.yaml

@@ -1,6 +1,6 @@
 name: butterfly_api
 description: The Linwood Butterfly API
-version: 2.2.2-rc.2
+version: 2.3.0-beta.0
 publish_to: none
 
 environment:

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.3.0-beta.0
     exec: butterfly
     exec_args: $@
   apt:

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
 }
 

app/linux/debian/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: linwood-butterfly
-Version: 2.2.2-rc.2
+Version: 2.3.0-beta.0
 Section: base
 Priority: optional
 Homepage: https://github.com/LinwoodDev/butterfly

app/linux/debian/usr/share/metainfo/dev.linwood.butterfly.appdata.xml

@@ -38,6 +38,7 @@
 	</screenshots>
 	<launchable type="desktop-id">dev.linwood.butterfly.desktop</launchable>
 	<releases>
+		<release version="2.2.2" date="2024-11-11" />
 		<release version="2.2.1" date="2024-10-17" />
 		<release version="2.2.0" date="2024-09-28" />
 		<release version="2.1.1" date="2024-06-10" />

app/pubspec.lock

@@ -172,7 +172,7 @@ packages:
       path: "../api"
       relative: true
     source: path
-    version: "2.2.2-rc.2"
+    version: "2.3.0-beta.0"
   camera:
     dependency: "direct main"
     description:

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.3.0-beta.0+123
 
 environment:
   sdk: ">=3.4.0 <4.0.0"