From a2922f9b0fc5010f9f335c85b307cc164b777d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lollipopkit=F0=9F=8F=B3=EF=B8=8F=E2=80=8D=E2=9A=A7?= =?UTF-8?q?=EF=B8=8F?= <10864310+lollipopkit@users.noreply.github.com> Date: Sat, 7 Feb 2026 00:58:56 +0800 Subject: [PATCH] opt.: include core repos via submodules (#1046) * opt.: include core repos via submodules * fix: checkout submodules in analysis workflow * fix: scope analysis to app sources * refactor: move direct-included repos under packages --- .github/workflows/analysis.yml | 3 ++- .gitmodules | 20 ++++++++++++++++++++ packages/dartssh2 | 1 + packages/fl_build | 1 + packages/fl_lib | 1 + packages/server_box_monitor | 1 + packages/xterm | 1 + pubspec.lock | 32 ++++++++++++-------------------- pubspec.yaml | 16 ++++------------ 9 files changed, 43 insertions(+), 33 deletions(-) create mode 100644 .gitmodules create mode 160000 packages/dartssh2 create mode 160000 packages/fl_build create mode 160000 packages/fl_lib create mode 160000 packages/server_box_monitor create mode 160000 packages/xterm diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 07942723..d85ae16e 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -19,6 +19,7 @@ jobs: - uses: actions/checkout@v6 with: fetch-depth: 1 + submodules: recursive - uses: subosito/flutter-action@v2 with: @@ -29,7 +30,7 @@ jobs: # Consider passing '--fatal-infos' for slightly stricter analysis. - name: Analyze project source - run: dart analyze + run: flutter analyze lib test # Your project will need to have tests in test/ and a dependency on # package:test for this step to succeed. Note that Flutter projects will diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..70073946 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,20 @@ +[submodule "dartssh2"] + path = packages/dartssh2 + url = https://github.com/lollipopkit/dartssh2 + branch = master +[submodule "xterm"] + path = packages/xterm + url = https://github.com/lollipopkit/xterm.dart + branch = master +[submodule "fl_lib"] + path = packages/fl_lib + url = https://github.com/lollipopkit/fl_lib + branch = main +[submodule "fl_build"] + path = packages/fl_build + url = https://github.com/lppcg/fl_build.git + branch = main +[submodule "server_box_monitor"] + path = packages/server_box_monitor + url = https://github.com/lollipopkit/server_box_monitor + branch = main diff --git a/packages/dartssh2 b/packages/dartssh2 new file mode 160000 index 00000000..b6c1c7b4 --- /dev/null +++ b/packages/dartssh2 @@ -0,0 +1 @@ +Subproject commit b6c1c7b42f88f146d7b5add4922c80d88d2ce0e2 diff --git a/packages/fl_build b/packages/fl_build new file mode 160000 index 00000000..61ee37ea --- /dev/null +++ b/packages/fl_build @@ -0,0 +1 @@ +Subproject commit 61ee37ea6f082592f5be56340b7746dce4ffbfda diff --git a/packages/fl_lib b/packages/fl_lib new file mode 160000 index 00000000..5a653c5d --- /dev/null +++ b/packages/fl_lib @@ -0,0 +1 @@ +Subproject commit 5a653c5d822e41dd6cb22ec92815b6b1cc012709 diff --git a/packages/server_box_monitor b/packages/server_box_monitor new file mode 160000 index 00000000..81669b48 --- /dev/null +++ b/packages/server_box_monitor @@ -0,0 +1 @@ +Subproject commit 81669b487d820e1d870ac45b2b9e292bd4aa364f diff --git a/packages/xterm b/packages/xterm new file mode 160000 index 00000000..cdd22e4d --- /dev/null +++ b/packages/xterm @@ -0,0 +1 @@ +Subproject commit cdd22e4d0c75064548ea70fa2b1953edcad4ab6c diff --git a/pubspec.lock b/pubspec.lock index 5f20bfb4..de478ee9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -366,11 +366,9 @@ packages: dartssh2: dependency: "direct main" description: - path: "." - ref: "v1.0.293" - resolved-ref: "3eedfd55916eede70aeb28605469a43623a9791b" - url: "https://github.com/lollipopkit/dartssh2" - source: git + path: "packages/dartssh2" + relative: true + source: path version: "2.12.0" dbus: dependency: transitive @@ -479,11 +477,9 @@ packages: fl_build: dependency: "direct dev" description: - path: "." - ref: "v1.0.53" - resolved-ref: "61ee37ea6f082592f5be56340b7746dce4ffbfda" - url: "https://github.com/lppcg/fl_build.git" - source: git + path: "packages/fl_build" + relative: true + source: path version: "1.0.0" fl_chart: dependency: "direct main" @@ -496,11 +492,9 @@ packages: fl_lib: dependency: "direct main" description: - path: "." - ref: "v1.0.363" - resolved-ref: "4b745be6f33b2e7f274d44f26175df440345cefb" - url: "https://github.com/lollipopkit/fl_lib" - source: git + path: "packages/fl_lib" + relative: true + source: path version: "0.0.1" flutter: dependency: "direct main" @@ -1861,11 +1855,9 @@ packages: xterm: dependency: "direct main" description: - path: "." - ref: "v4.0.13" - resolved-ref: "6343b0e5f744d2c11090d34690ad5049ebbc599b" - url: "https://github.com/lollipopkit/xterm.dart" - source: git + path: "packages/xterm" + relative: true + source: path version: "4.0.0" yaml: dependency: transitive diff --git a/pubspec.yaml b/pubspec.yaml index 7dd6be13..2b78ceab 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -40,17 +40,13 @@ dependencies: xml: ^6.4.2 # for parsing nvidia-smi url_launcher: ^6.2.6 dartssh2: - git: - url: https://github.com/lollipopkit/dartssh2 - ref: v1.0.293 + path: packages/dartssh2 circle_chart: git: url: https://github.com/lollipopkit/circle_chart ref: main xterm: - git: - url: https://github.com/lollipopkit/xterm.dart - ref: v4.0.13 + path: packages/xterm computer: git: url: https://github.com/lollipopkit/dart_computer @@ -64,9 +60,7 @@ dependencies: url: https://github.com/lollipopkit/plain_notification_token ref: v1.0.23 fl_lib: - git: - url: https://github.com/lollipopkit/fl_lib - ref: v1.0.363 + path: packages/fl_lib dependency_overrides: # webdav_client_plus: @@ -101,9 +95,7 @@ dev_dependencies: # url: https://github.com/lollipopkit/riverpod_reg # ref: v0.0.2 fl_build: - git: - url: https://github.com/lppcg/fl_build.git - ref: v1.0.53 + path: packages/fl_build flutter: generate: true