Merge branch 'develop' into feature/plugin-system

Author: CodeDoctorDE

.github/workflows/build.yml

@@ -2,6 +2,20 @@
 
 <!--ENTER CHANGELOG HERE-->
 
+## 0.3.0 (2025-01-27)
+
+* Add editor
+* Fix importing of packs
+* Fix packs not available on singleplayer
+* Rework packs dialog
+* Upgrade to flutter 3.27
+* Use minSdkVersion 23 instead of 21 (The minimum version of android is 6.0 (Marshmallow))
+* Upgrade to agb 8.8
+* Fix reproducable builds again
+* Add linux arm
+
+Read more here: https://linwood.dev/setonix/0.3.0
+
 ## 0.2.0 (2024-11-25)
 
 * Add protection to cells if they are hidden

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 | Version | Supported |                                                                                                                  |
 | ------- | --------- | ---------------------------------------------------------------------------------------------------------------- |
+| 0.3.0   | :warning: | [Docs](https://setonix.world/docs/v1/intro) [Release](https://github.com/LinwoodDev/Setonix/releases/tag/v0.3.0) |
 | 0.2.0   | :warning: | [Docs](https://setonix.world/docs/v1/intro) [Release](https://github.com/LinwoodDev/Setonix/releases/tag/v0.2.0) |
 | 0.1.1   | :x:       | [Docs](https://setonix.world/docs/v1/intro) [Release](https://github.com/LinwoodDev/Setonix/releases/tag/v0.1.1) |
 

SECURITY.md

@@ -235,10 +235,10 @@ packages:
     dependency: transitive
     description:
       name: glob
-      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   graphs:
     dependency: transitive
     description:
@@ -533,10 +533,10 @@ packages:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   yaml:
     dependency: transitive
     description:

api/pubspec.lock

@@ -1,6 +1,6 @@
 name: setonix_api
 description: The Linwood Setonix API
-version: 0.2.0
+version: 0.3.1
 publish_to: none
 # repository: https://github.com/my_org/my_repo
 

api/pubspec.yaml

@@ -14,7 +14,7 @@ AppDir:
     id: dev.linwood.setonix
     name: Linwood Setonix
     icon: dev.linwood.setonix
-    version: 0.2.0
+    version: 0.3.1
     exec: setonix
     exec_args: $@
   apt:

app/AppImageBuilder.yml

@@ -187,4 +187,4 @@ const isNightly =
     flavor == 'nightly' || flavor == 'dev' || flavor == 'development';
 const shortApplicationName = isNightly ? 'Setonix Nightly' : 'Setonix';
 const applicationName = 'Linwood $shortApplicationName';
-const applicationMinorVersion = '0.2';
+const applicationMinorVersion = '0.3';

app/lib/main.dart

@@ -1,5 +1,5 @@
 Package: linwood-setonix
-Version: 0.2.0
+Version: 0.3.1
 Section: base
 Priority: optional
 Homepage: https://github.com/LinwoodDev/Setonix

app/linux/debian/DEBIAN/control

@@ -41,6 +41,7 @@
 	</description>
 	<launchable type="desktop-id">dev.linwood.setonix.desktop</launchable>
 	<releases>
+		<release version="0.3.0" date="2025-01-27" />
 		<release version="0.2.0" date="2024-11-25" />
 		<release version="0.1.1" date="2024-10-21" />
 		<release version="0.1.0" date="2024-10-21" />

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

@@ -2,7 +2,7 @@ Name:           linwood-setonix
 Version:        1.0.0
 Release:        1%{?dist}
 Summary:        Play games everywhere you like
-BuildArch:      x86_64
+BuildArch:      %{_target_cpu}
 URL:            https://github.com/LinwoodDev/Setonix
 License:        AGPLv3
 Source0:        %{name}-%{version}.tar.gz
@@ -20,11 +20,17 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
+
+# Copy binaries and architecture-specific files
 cp %{name} $RPM_BUILD_ROOT/%{_datadir}/%{name}
 cp -R lib $RPM_BUILD_ROOT/%{_datadir}/%{name}
 cp -R data $RPM_BUILD_ROOT/%{_datadir}/%{name}
+
+# Create symlink for the binary
 ln -s %{_datadir}/%{name}/%{name} $RPM_BUILD_ROOT/%{_bindir}/%{name}
-desktop-file-install %{name}.desktop
+
+# Install the desktop file
+desktop-file-install --dir=$RPM_BUILD_ROOT/usr/share/applications %{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -33,3 +39,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 /usr/share/applications/
+
+%changelog

app/linux/rpm/linwood-setonix.spec

@@ -58,26 +58,26 @@ packages:
     dependency: "direct main"
     description:
       name: barcode
-      sha256: ab180ce22c6555d77d45f0178a523669db67f95856e3378259ef2ffeb43e6003
+      sha256: "7b6729c37e3b7f34233e2318d866e8c48ddb46c1f7ad01ff7bb2a8de1da2b9f4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.8"
+    version: "2.2.9"
   bloc:
     dependency: transitive
     description:
       name: bloc
-      sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"
+      sha256: "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.4"
+    version: "9.0.0"
   bloc_concurrency:
     dependency: "direct main"
     description:
       name: bloc_concurrency
-      sha256: "456b7a3616a7c1ceb975c14441b3f198bf57d81cb95b7c6de5cb0c60201afcd8"
+      sha256: "86b7b17a0a78f77fca0d7c030632b59b593b22acea2d96972588f40d4ef53a94"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.5"
+    version: "0.3.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -386,10 +386,11 @@ packages:
   flame_bloc:
     dependency: "direct main"
     description:
-      name: flame_bloc
-      sha256: "7a6cacd9b4d7ddfbe72d3e9facd49c164b084e85dfdd4c2b5a7192bd1da066bb"
-      url: "https://pub.dev"
-    source: hosted
+      path: "packages/flame_bloc"
+      ref: "2d76592b9d40007ede2dc0cb9c87858e1ec50bb5"
+      resolved-ref: "2d76592b9d40007ede2dc0cb9c87858e1ec50bb5"
+      url: "https://github.com/CodeDoctorDE/flame.git"
+    source: git
     version: "1.12.5"
   flame_tiled:
     dependency: "direct main"
@@ -424,10 +425,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_bloc
-      sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
+      sha256: "153856bdaac302bbdc58a1d1403d50c40557254aa05eaeed40515d88a25a526b"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.6"
+    version: "9.0.0"
   flutter_driver:
     dependency: transitive
     description: flutter
@@ -561,18 +562,18 @@ packages:
     dependency: transitive
     description:
       name: glob
-      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   go_router:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "7c2d40b59890a929824f30d442e810116caf5088482629c894b9e4478c67472d"
+      sha256: daf3ff5570f55396b2d2c9bf8136d7db3a8acf208ac0cef92a3ae2beb9a81550
       url: "https://pub.dev"
     source: hosted
-    version: "14.6.3"
+    version: "14.7.1"
   graphs:
     dependency: transitive
     description:
@@ -1043,17 +1044,17 @@ packages:
     dependency: transitive
     description:
       name: sembast
-      sha256: b3dde17154b2233d039fe3c386871d2ccddb4f31e058502c4036b03858e2ff5f
+      sha256: "6cf9acde19bd88dba9ea8090d3e50725cdc70fc7cf1c117c26e79c257884b04b"
       url: "https://pub.dev"
     source: hosted
-    version: "3.8.1+1"
+    version: "3.8.2"
   setonix_api:
     dependency: "direct main"
     description:
       path: "../api"
       relative: true
     source: path
-    version: "0.2.0"
+    version: "0.3.1"
   setonix_plugin:
     dependency: "direct main"
     description:
@@ -1081,18 +1082,18 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a
+      sha256: c59819dacc6669a1165d54d2735a9543f136f9b3cec94ca65cea6ab8dffc422e
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.5"
+    version: "2.4.0"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "138b7bbbc7f59c56236e426c37afb8f78cbc57b094ac64c440e0bb90e380a4f5"
+      sha256: "986dc7b7d14f38064bfa85ace28df1f1a66d4fba32e4b1079d4ea537d9541b01"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.3"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -1246,9 +1247,9 @@ packages:
     dependency: "direct overridden"
     description:
       path: "packages/tiled"
-      ref: "581391cf4b4e5a504b42324e353876e9e7afbb75"
-      resolved-ref: "581391cf4b4e5a504b42324e353876e9e7afbb75"
-      url: "https://github.com/flame-engine/tiled.dart.git"
+      ref: c4fa680778ba36c4cb53f6e49474ea3881b69552
+      resolved-ref: c4fa680778ba36c4cb53f6e49474ea3881b69552
+      url: "https://github.com/CodeDoctorDE/tiled.dart.git"
     source: git
     version: "0.10.2"
   timing:
@@ -1415,10 +1416,10 @@ packages:
     dependency: "direct main"
     description:
       name: web_socket_channel
-      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   webdriver:
     dependency: transitive
     description:
@@ -1431,10 +1432,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29"
+      sha256: daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e
       url: "https://pub.dev"
     source: hosted
-    version: "5.10.0"
+    version: "5.10.1"
   win32_registry:
     dependency: transitive
     description:
@@ -1477,4 +1478,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.6.0 <4.0.0"
-  flutter: ">=3.27.2"
+  flutter: ">=3.27.3"

app/pubspec.lock

@@ -11,12 +11,12 @@ description: Play games without internet
 # 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: 0.2.0+4
+version: 0.3.1+5
 publish_to: none
 
 environment:
   sdk: ">=3.5.0 <4.0.0"
-  flutter: 3.27.2
+  flutter: 3.27.3
 
 dependencies:
   flutter:
@@ -43,10 +43,14 @@ dependencies:
   # Generation
   barcode: ^2.2.7
   # Internal
-  flutter_bloc: ^8.1.3
+  flutter_bloc: ^9.0.0
   rxdart: ^0.28.0
   collection: ^1.18.0
-  flame_bloc: ">=1.12.2 <1.13.0"
+  flame_bloc:
+    git:
+      url: https://github.com/CodeDoctorDE/flame.git
+      ref: 2d76592b9d40007ede2dc0cb9c87858e1ec50bb5
+      path: packages/flame_bloc
   flame: ">=1.23.0 <1.24.0"
   flame_tiled: ">=1.21.1 <1.22.0"
   # Networking
@@ -87,7 +91,7 @@ dependencies:
   archive: ^4.0.2
   flutter_markdown: ^0.7.3+1
   markdown: ^7.2.2
-  bloc_concurrency: ^0.2.5
+  bloc_concurrency: ^0.3.0
   idb_shim: ^2.6.1+7
   rust_lib_setonix_plugin:
     path: rust_builder
@@ -97,8 +101,8 @@ dependencies:
 dependency_overrides:
   tiled:
     git:
-      url: https://github.com/flame-engine/tiled.dart.git
-      ref: 581391cf4b4e5a504b42324e353876e9e7afbb75
+      url: https://github.com/CodeDoctorDE/tiled.dart.git
+      ref: c4fa680778ba36c4cb53f6e49474ea3881b69552
       path: packages/tiled
 dev_dependencies:
   flutter_test: