Skip to content

Commit 011e8af

Browse files
CodeDoctorDECodeDoctorDE
committed
Update dependencies, add docker
1 parent 240a5fd commit 011e8af

File tree

14 files changed

+1344
-1499
lines changed

14 files changed

+1344
-1499
lines changed

‎.github/workflows/build.yml‎

Lines changed: 111 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: ⬆️ Checkout
2222
uses: actions/checkout@v5
2323
- name: 🔧 Setup java
24-
uses: actions/setup-java@v4
24+
uses: actions/setup-java@v5
2525
with:
2626
java-version: "17"
2727
distribution: "temurin"
@@ -56,30 +56,59 @@ jobs:
5656
run: |
5757
flutter build apk -v --release --flavor nightly --dart-define=flavor=nightly
5858
cp build/app/outputs/flutter-apk/app-nightly-release.apk linwood-setonix-android.apk
59+
- name: 🏭 Build nightly (legacy packaging)
60+
if: ${{ github.ref != 'refs/tags/stable' && (github.event_name != 'release' || github.event.release.prerelease) }}
61+
run: |
62+
USE_LEGACY_PACKAGING=true flutter build apk -v --release --flavor nightly --dart-define=flavor=nightly
63+
cp build/app/outputs/flutter-apk/app-nightly-release.apk linwood-setonix-android-legacy.apk
5964
- name: 🏭 Build production
6065
if: ${{ github.ref == 'refs/tags/stable' || (github.event_name == 'release' && !github.event.release.prerelease) }}
6166
run: |
6267
flutter build apk -v --release --flavor production
6368
cp build/app/outputs/flutter-apk/app-production-release.apk linwood-setonix-android.apk
69+
- name: 🏭 Build production (legacy packaging)
70+
if: ${{ github.ref == 'refs/tags/stable' || (github.event_name == 'release' && !github.event.release.prerelease) }}
71+
run: |
72+
USE_LEGACY_PACKAGING=true flutter build apk -v --release --flavor production
73+
cp build/app/outputs/flutter-apk/app-production-release.apk linwood-setonix-android-legacy.apk
6474
- name: Archive
6575
uses: actions/upload-artifact@v4
6676
with:
6777
name: apk-build
6878
path: app/linwood-setonix-android.apk
79+
- name: Archive (legacy)
80+
uses: actions/upload-artifact@v4
81+
with:
82+
name: apk-build-legacy
83+
path: app/linwood-setonix-android-legacy.apk
6984
- name: 🏭 Build architecture nightly
7085
if: ${{ github.ref != 'refs/tags/stable' && (github.event_name != 'release' || github.event.release.prerelease) }}
7186
run: |
7287
flutter build apk -v --release --target-platform android-arm,android-arm64,android-x64 --split-per-abi --flavor nightly --dart-define=flavor=nightly
7388
cp build/app/outputs/flutter-apk/app-armeabi-v7a-nightly-release.apk linwood-setonix-android-arm.apk
7489
cp build/app/outputs/flutter-apk/app-arm64-v8a-nightly-release.apk linwood-setonix-android-arm64.apk
7590
cp build/app/outputs/flutter-apk/app-x86_64-nightly-release.apk linwood-setonix-android-x86_64.apk
91+
- name: 🏭 Build architecture nightly (legacy packaging)
92+
if: ${{ github.ref != 'refs/tags/stable' && (github.event_name != 'release' || github.event.release.prerelease) }}
93+
run: |
94+
USE_LEGACY_PACKAGING=true flutter build apk -v --release --target-platform android-arm,android-arm64,android-x64 --split-per-abi --flavor nightly --dart-define=flavor=nightly
95+
cp build/app/outputs/flutter-apk/app-armeabi-v7a-nightly-release.apk linwood-setonix-android-arm-legacy.apk
96+
cp build/app/outputs/flutter-apk/app-arm64-v8a-nightly-release.apk linwood-setonix-android-arm64-legacy.apk
97+
cp build/app/outputs/flutter-apk/app-x86_64-nightly-release.apk linwood-setonix-android-x86_64-legacy.apk
7698
- name: 🏭 Build architecture production
7799
if: ${{ github.ref == 'refs/tags/stable' || (github.event_name == 'release' && !github.event.release.prerelease) }}
78100
run: |
79101
flutter build apk -v --release --target-platform android-arm,android-arm64,android-x64 --split-per-abi --flavor production
80102
cp build/app/outputs/flutter-apk/app-armeabi-v7a-production-release.apk linwood-setonix-android-arm.apk
81103
cp build/app/outputs/flutter-apk/app-arm64-v8a-production-release.apk linwood-setonix-android-arm64.apk
82104
cp build/app/outputs/flutter-apk/app-x86_64-production-release.apk linwood-setonix-android-x86_64.apk
105+
- name: 🏭 Build architecture production (legacy packaging)
106+
if: ${{ github.ref == 'refs/tags/stable' || (github.event_name == 'release' && !github.event.release.prerelease) }}
107+
run: |
108+
USE_LEGACY_PACKAGING=true flutter build apk -v --release --target-platform android-arm,android-arm64,android-x64 --split-per-abi --flavor production
109+
cp build/app/outputs/flutter-apk/app-armeabi-v7a-production-release.apk linwood-setonix-android-arm-legacy.apk
110+
cp build/app/outputs/flutter-apk/app-arm64-v8a-production-release.apk linwood-setonix-android-arm64-legacy.apk
111+
cp build/app/outputs/flutter-apk/app-x86_64-production-release.apk linwood-setonix-android-x86_64-legacy.apk
83112
- name: Archive
84113
uses: actions/upload-artifact@v4
85114
with:
@@ -104,6 +133,21 @@ jobs:
104133
with:
105134
name: corepack
106135
path: core.stnx
136+
- name: Archive (legacy arm)
137+
uses: actions/upload-artifact@v4
138+
with:
139+
name: apk-arm-build-legacy
140+
path: app/linwood-setonix-android-arm-legacy.apk
141+
- name: Archive (legacy arm64)
142+
uses: actions/upload-artifact@v4
143+
with:
144+
name: apk-arm64-build-legacy
145+
path: app/linwood-setonix-android-arm64-legacy.apk
146+
- name: Archive (legacy x86_64)
147+
uses: actions/upload-artifact@v4
148+
with:
149+
name: apk-x86_64-build-legacy
150+
path: app/linwood-setonix-android-x86_64-legacy.apk
107151
build-windows:
108152
runs-on: windows-2025
109153
defaults:
@@ -398,9 +442,9 @@ jobs:
398442
- uses: subosito/flutter-action@v2.21.0
399443
with:
400444
flutter-version-file: app/pubspec.yaml
401-
- uses: actions/setup-python@v5
445+
- uses: actions/setup-python@v6
402446
with:
403-
python-version: "3.12"
447+
python-version: "3.13"
404448
- name: ✅ Enable platforms
405449
run: flutter config --enable-macos-desktop
406450
- name: 📦 Get dependencies
@@ -422,7 +466,7 @@ jobs:
422466
working-directory: app/build/macos/Build/Products/Release
423467
run: zip --symlinks -qr linwood-setonix-macos.zip setonix.app
424468
- name: Setup node
425-
uses: actions/setup-node@v4
469+
uses: actions/setup-node@v5
426470
with:
427471
node-version: 24
428472
- name: Install appdmg
@@ -559,6 +603,43 @@ jobs:
559603
with:
560604
name: server-build-${{ matrix.os.label }}
561605
path: server/server-build
606+
# build-docker:
607+
# runs-on: ubuntu-24.04
608+
# if: github.event_name != 'pull_request'
609+
# steps:
610+
# - name: ⬆️ Checkout
611+
# uses: actions/checkout@v5
612+
# - name: Set Docker tag
613+
# id: docker_tag
614+
# run: |
615+
# if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
616+
# echo "tag=latest" >> $GITHUB_ENV
617+
# elif [[ "${GITHUB_REF}" == "refs/heads/develop" ]]; then
618+
# echo "tag=dev" >> $GITHUB_ENV
619+
# elif [[ "${GITHUB_REF}" == refs/tags/v* || "${GITHUB_REF}" == "refs/tags/stable" || "${GITHUB_REF}" == "refs/tags/nightly" ]]; then
620+
# echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
621+
# else
622+
# echo "tag=unknown" >> $GITHUB_ENV
623+
# fi
624+
# - name: Log Docker tag
625+
# run: echo "Docker tag is ${{ env.tag }}"
626+
# - name: Login to Docker Hub
627+
# uses: docker/login-action@v3
628+
# with:
629+
# username: ${{ secrets.DOCKERHUB_USERNAME }}
630+
# password: ${{ secrets.DOCKERHUB_TOKEN }}
631+
# - name: Set up QEMU
632+
# uses: docker/setup-qemu-action@v3
633+
# - name: Set up Docker Buildx
634+
# uses: docker/setup-buildx-action@v3
635+
# - name: Build and push Docker image
636+
# uses: docker/build-push-action@v6
637+
# if: ${{ env.tag != 'unknown' }}
638+
# with:
639+
# context: .
640+
# file: ./Dockerfile
641+
# push: true
642+
# tags: linwooddev/setonix:${{ env.tag }}
562643
deploy:
563644
runs-on: ubuntu-24.04
564645
if: github.event_name != 'pull_request'
@@ -604,6 +685,18 @@ jobs:
604685
- uses: actions/download-artifact@v5
605686
with:
606687
name: apk-x86_64-build
688+
- uses: actions/download-artifact@v5
689+
with:
690+
name: apk-build-legacy
691+
- uses: actions/download-artifact@v5
692+
with:
693+
name: apk-arm-build-legacy
694+
- uses: actions/download-artifact@v5
695+
with:
696+
name: apk-arm64-build-legacy
697+
- uses: actions/download-artifact@v5
698+
with:
699+
name: apk-x86_64-build-legacy
607700
- uses: actions/download-artifact@v5
608701
with:
609702
name: windows-build
@@ -737,6 +830,10 @@ jobs:
737830
linwood-setonix-android-arm.apk
738831
linwood-setonix-android-arm64.apk
739832
linwood-setonix-android-x86_64.apk
833+
linwood-setonix-android-legacy.apk
834+
linwood-setonix-android-arm-legacy.apk
835+
linwood-setonix-android-arm64-legacy.apk
836+
linwood-setonix-android-x86_64-legacy.apk
740837
linwood-setonix-ios.ipa
741838
checksums.txt
742839
env:
@@ -773,6 +870,10 @@ jobs:
773870
linwood-setonix-android-arm.apk
774871
linwood-setonix-android-arm64.apk
775872
linwood-setonix-android-x86_64.apk
873+
linwood-setonix-android-legacy.apk
874+
linwood-setonix-android-arm-legacy.apk
875+
linwood-setonix-android-arm64-legacy.apk
876+
linwood-setonix-android-x86_64-legacy.apk
776877
linwood-setonix-ios.ipa
777878
checksums.txt
778879
env:
@@ -807,6 +908,10 @@ jobs:
807908
linwood-setonix-android-arm.apk
808909
linwood-setonix-android-arm64.apk
809910
linwood-setonix-android-x86_64.apk
911+
linwood-setonix-android-legacy.apk
912+
linwood-setonix-android-arm-legacy.apk
913+
linwood-setonix-android-arm64-legacy.apk
914+
linwood-setonix-android-x86_64-legacy.apk
810915
linwood-setonix-ios.ipa
811916
checksums.txt
812917
env:
@@ -840,7 +945,7 @@ jobs:
840945
if [[ -n "$KEY_JKS" ]] ; then echo "$KEY_JKS" | base64 --decode > key.jks ; fi
841946
echo "$PLAY_STORE_CREDENTIALS" | base64 --decode > play-store-credentials.json
842947
- name: 🔧 Setup java
843-
uses: actions/setup-java@v4
948+
uses: actions/setup-java@v5
844949
with:
845950
java-version: "17"
846951
distribution: "temurin"
@@ -861,7 +966,7 @@ jobs:
861966
- name: Setup Fastlane
862967
uses: ruby/setup-ruby@v1
863968
with:
864-
ruby-version: "3.4.5"
969+
ruby-version: "3.4.6"
865970
bundler-cache: true
866971
working-directory: app/android
867972
- name: 🚀 Deploy to Play Store

‎api/pubspec.lock‎

Lines changed: 21 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ packages:
55
dependency: transitive
66
description:
77
name: _fe_analyzer_shared
8-
sha256: f7bac1065b51df46b2291296e1c1b3616a47aeb735aea46a8ca3dcb7bb700ee7
8+
sha256: dd3d2ad434b9510001d089e8de7556d50c834481b9abc2891a0184a8493a19dc
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "86.0.0"
11+
version: "89.0.0"
1212
analyzer:
1313
dependency: transitive
1414
description:
1515
name: analyzer
16-
sha256: "4001e2de7c9d125af9504b4c4f64ebba507c9cb9c712caf02ac1d4c37824f58c"
16+
sha256: c22b6e7726d1f9e5db58c7251606076a71ca0dbcf76116675edfadbec0c9e875
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "8.0.0"
19+
version: "8.2.0"
2020
ansicolor:
2121
dependency: transitive
2222
description:
@@ -61,10 +61,10 @@ packages:
6161
dependency: transitive
6262
description:
6363
name: build
64-
sha256: ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d
64+
sha256: "5b887c55a0f734b433b3b2d89f9cd1f99eb636b17e268a5b4259258bc916504b"
6565
url: "https://pub.dev"
6666
source: hosted
67-
version: "3.1.0"
67+
version: "4.0.0"
6868
build_config:
6969
dependency: transitive
7070
description:
@@ -81,30 +81,14 @@ packages:
8181
url: "https://pub.dev"
8282
source: hosted
8383
version: "4.0.4"
84-
build_resolvers:
85-
dependency: transitive
86-
description:
87-
name: build_resolvers
88-
sha256: d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46
89-
url: "https://pub.dev"
90-
source: hosted
91-
version: "3.0.3"
9284
build_runner:
9385
dependency: "direct dev"
9486
description:
9587
name: build_runner
96-
sha256: b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30
88+
sha256: "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b"
9789
url: "https://pub.dev"
9890
source: hosted
99-
version: "2.7.1"
100-
build_runner_core:
101-
dependency: transitive
102-
description:
103-
name: build_runner_core
104-
sha256: "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b"
105-
url: "https://pub.dev"
106-
source: hosted
107-
version: "9.3.1"
91+
version: "2.8.0"
10892
built_collection:
10993
dependency: transitive
11094
description:
@@ -133,10 +117,10 @@ packages:
133117
dependency: transitive
134118
description:
135119
name: code_builder
136-
sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
120+
sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243"
137121
url: "https://pub.dev"
138122
source: hosted
139-
version: "4.10.1"
123+
version: "4.11.0"
140124
collection:
141125
dependency: "direct main"
142126
description:
@@ -182,18 +166,18 @@ packages:
182166
dependency: "direct main"
183167
description:
184168
name: dart_mappable
185-
sha256: "15f41a35da8ee690bbfa0059fa241edeeaea73f89a2ba685b354ece07cd8ada6"
169+
sha256: "0e219930c9f7b9e0f14ae7c1de931c401875110fd5c67975b6b9492a6d3a531b"
186170
url: "https://pub.dev"
187171
source: hosted
188-
version: "4.6.0"
172+
version: "4.6.1"
189173
dart_mappable_builder:
190174
dependency: "direct dev"
191175
description:
192176
name: dart_mappable_builder
193-
sha256: "1116c70d9923e85e78a9339a67934949334a4190c8a6f46e1fbc908341ce424c"
177+
sha256: "50154ae053de29b81987604d4d04bb40818bce86574325699f43612eeb0c0b1c"
194178
url: "https://pub.dev"
195179
source: hosted
196-
version: "4.6.0"
180+
version: "4.6.1"
197181
dart_style:
198182
dependency: transitive
199183
description:
@@ -310,8 +294,8 @@ packages:
310294
dependency: "direct main"
311295
description:
312296
path: "packages/lw_file_system_api"
313-
ref: "2ecf53489240f055c841d7c8f92fe374cc6a27ae"
314-
resolved-ref: "2ecf53489240f055c841d7c8f92fe374cc6a27ae"
297+
ref: ddd0761c3ed5a48108bddd0448df76d77eeb9da0
298+
resolved-ref: ddd0761c3ed5a48108bddd0448df76d77eeb9da0
315299
url: "https://github.com/LinwoodDev/dart_pkgs.git"
316300
source: git
317301
version: "1.0.0"
@@ -368,10 +352,10 @@ packages:
368352
dependency: transitive
369353
description:
370354
name: pool
371-
sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
355+
sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
372356
url: "https://pub.dev"
373357
source: hosted
374-
version: "1.5.1"
358+
version: "1.5.2"
375359
posix:
376360
dependency: transitive
377361
description:
@@ -416,10 +400,10 @@ packages:
416400
dependency: transitive
417401
description:
418402
name: source_gen
419-
sha256: "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3"
403+
sha256: ccf30b0c9fbcd79d8b6f5bfac23199fb354938436f62475e14aea0f29ee0f800
420404
url: "https://pub.dev"
421405
source: hosted
422-
version: "3.1.0"
406+
version: "4.0.1"
423407
source_span:
424408
dependency: transitive
425409
description:
@@ -476,14 +460,6 @@ packages:
476460
url: "https://pub.dev"
477461
source: hosted
478462
version: "0.7.7"
479-
timing:
480-
dependency: transitive
481-
description:
482-
name: timing
483-
sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
484-
url: "https://pub.dev"
485-
source: hosted
486-
version: "1.0.2"
487463
type_plus:
488464
dependency: transitive
489465
description:
@@ -541,4 +517,4 @@ packages:
541517
source: hosted
542518
version: "3.1.3"
543519
sdks:
544-
dart: ">=3.8.0 <4.0.0"
520+
dart: ">=3.9.0 <4.0.0"

‎api/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
lw_file_system_api:
1515
git:
1616
url: https://github.com/LinwoodDev/dart_pkgs.git
17-
ref: 2ecf53489240f055c841d7c8f92fe374cc6a27ae
17+
ref: ddd0761c3ed5a48108bddd0448df76d77eeb9da0
1818
path: packages/lw_file_system_api
1919
networker:
2020
git:

0 commit comments

Comments
 (0)