From ac4607371af3b7dd4336a492dc95323bc8139de0 Mon Sep 17 00:00:00 2001
From: GT610 <79314033+GT-610@users.noreply.github.com>
Date: Sat, 28 Feb 2026 20:21:55 +0800
Subject: [PATCH] refactor (dep): Introduce more submodules and update fl_lib
 submodule (#1060)

* refactor (dep): Introduce more submodules and update fl_lib submodule

* chore: Add default branch configuration for submodules
---
 .gitmodules                       | 12 ++++++++++++
 packages/circle_chart             |  1 +
 packages/fl_lib                   |  2 +-
 packages/plain_notification_token |  1 +
 packages/watch_connectivity       |  1 +
 pubspec.lock                      | 24 +++++++++---------------
 pubspec.yaml                      | 14 +++-----------
 7 files changed, 28 insertions(+), 27 deletions(-)
 create mode 160000 packages/circle_chart
 create mode 160000 packages/plain_notification_token
 create mode 160000 packages/watch_connectivity

diff --git a/.gitmodules b/.gitmodules
index 70073946..56e043b0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,3 +18,15 @@
 	path = packages/server_box_monitor
 	url = https://github.com/lollipopkit/server_box_monitor
 	branch = main
+[submodule "circle_chart"]
+	path = packages/circle_chart
+	url = https://github.com/lollipopkit/circle_chart
+	branch = main
+[submodule "plain_notification_token"]
+	path = packages/plain_notification_token
+	url = https://github.com/lollipopkit/plain_notification_token
+	branch = master
+[submodule "watch_connectivity"]
+	path = packages/watch_connectivity
+	url = https://github.com/lollipopkit/watch_connectivity
+	branch = master
diff --git a/packages/circle_chart b/packages/circle_chart
new file mode 160000
index 00000000..449a3fa7
--- /dev/null
+++ b/packages/circle_chart
@@ -0,0 +1 @@
+Subproject commit 449a3fa7e886869e87ea10ab56f99be3f16f2c1f
diff --git a/packages/fl_lib b/packages/fl_lib
index 9e2269ad..c1d32f89 160000
--- a/packages/fl_lib
+++ b/packages/fl_lib
@@ -1 +1 @@
-Subproject commit 9e2269adcd2afb8650323361a697a62b7f337441
+Subproject commit c1d32f89cd3f4bd7291d948226dda59674cadbe7
diff --git a/packages/plain_notification_token b/packages/plain_notification_token
new file mode 160000
index 00000000..5f56dc56
--- /dev/null
+++ b/packages/plain_notification_token
@@ -0,0 +1 @@
+Subproject commit 5f56dc56a6670e2533b0caa7d09d31d16e6c7663
diff --git a/packages/watch_connectivity b/packages/watch_connectivity
new file mode 160000
index 00000000..13e42750
--- /dev/null
+++ b/packages/watch_connectivity
@@ -0,0 +1 @@
+Subproject commit 13e42750a8f8dbf9a6c7890198b0dd18283a0692
diff --git a/pubspec.lock b/pubspec.lock
index 112bb3e0..822bb3c6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -244,11 +244,9 @@ packages:
   circle_chart:
     dependency: "direct main"
     description:
-      path: "."
-      ref: main
-      resolved-ref: "449a3fa7e886869e87ea10ab56f99be3f16f2c1f"
-      url: "https://github.com/lollipopkit/circle_chart"
-    source: git
+      path: "packages/circle_chart"
+      relative: true
+    source: path
     version: "0.0.3"
   cli_config:
     dependency: transitive
@@ -1168,11 +1166,9 @@ packages:
   plain_notification_token:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "v1.0.23"
-      resolved-ref: "5f56dc56a6670e2533b0caa7d09d31d16e6c7663"
-      url: "https://github.com/lollipopkit/plain_notification_token"
-    source: git
+      path: "packages/plain_notification_token"
+      relative: true
+    source: path
     version: "0.0.4"
   platform:
     dependency: transitive
@@ -1766,11 +1762,9 @@ packages:
   watch_connectivity:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "v1.0.85"
-      resolved-ref: "13e42750a8f8dbf9a6c7890198b0dd18283a0692"
-      url: "https://github.com/lollipopkit/watch_connectivity"
-    source: git
+      path: "packages/watch_connectivity"
+      relative: true
+    source: path
     version: "0.1.5"
   watcher:
     dependency: transitive
diff --git a/pubspec.yaml b/pubspec.yaml
index 3b29ac68..32773c6a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -42,9 +42,7 @@ dependencies:
   dartssh2:
     path: packages/dartssh2
   circle_chart:
-    git:
-      url: https://github.com/lollipopkit/circle_chart
-      ref: main
+    path: packages/circle_chart
   xterm:
     path: packages/xterm
   computer:
@@ -52,21 +50,15 @@ dependencies:
       url: https://github.com/lollipopkit/dart_computer
       ref: v1.0.88
   watch_connectivity:
-    git:
-      url: https://github.com/lollipopkit/watch_connectivity
-      ref: v1.0.85
+    path: packages/watch_connectivity
   plain_notification_token:
-    git:
-      url: https://github.com/lollipopkit/plain_notification_token
-      ref: v1.0.23
+    path: packages/plain_notification_token
   fl_lib:
     path: packages/fl_lib
 
 dependency_overrides:
   # webdav_client_plus:
   #   path: ../webdav_client
-  # fl_build:
-  #   path: ../fl_build
   gtk: # TODO: remove it after fixed in upstream
     git:
       url: https://github.com/lollipopkit/gtk.dart