From df61b001fc4d89c20ae80f8a452dc55fd1e728e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 16:16:21 +0800
Subject: [PATCH 01/13] chore: test

---
 actions/setup-flutter/action.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 4c8c6dc..7688241 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -34,7 +34,7 @@ runs:
       shell: bash
       run: |
         set -e
-
+        echo "Setting up AOP registry for Flutter packages..."
         patch_url="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/main/patch_flutter/"
         flutter_version=$(flutter --version | head -n 1 | awk '{print $2}')
         major_version=$(echo $flutter_version | cut -d. -f1)
@@ -73,6 +73,9 @@ runs:
 
         # 进入 Flutter SDK 目录
         cd "${{ env.FLUTTER_ROOT }}"
+        git status
+        git pull
+        git status
 
         # 下载补丁
         echo "Downloading patch: $patch_url$patch_file"

From d6526ff4ac7b20568d2671cd13b0d0fdabd826c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 16:37:52 +0800
Subject: [PATCH 02/13] test

---
 actions/setup-flutter/action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 7688241..a9aaf18 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -62,6 +62,7 @@ runs:
             patch_file="2.2~3.10.patch"
           fi
         fi
+        echo "Determined patch file: $patch_file"
 
         if [ -z "$patch_file" ]; then
           echo "No matching patch file found for Flutter version: $flutter_version"

From ef99e9c65fbad8c2df6f48792cbafcb039946c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 16:45:43 +0800
Subject: [PATCH 03/13] D

---
 actions/setup-flutter/action.yml | 59 --------------------------------
 1 file changed, 59 deletions(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index a9aaf18..3545258 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -35,62 +35,3 @@ runs:
       run: |
         set -e
         echo "Setting up AOP registry for Flutter packages..."
-        patch_url="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/main/patch_flutter/"
-        flutter_version=$(flutter --version | head -n 1 | awk '{print $2}')
-        major_version=$(echo $flutter_version | cut -d. -f1)
-        minor_version=$(echo $flutter_version | cut -d. -f2)
-
-        # 确定适用的补丁文件
-        # 2.2~3.10.patch, 3.13~3.16.patch, 3.19~3.22.patch, 3.24~3.32.patch, 3.35~infinity.patch
-        patch_file=""
-        if [ "$major_version" -gt 3 ]; then
-          patch_file="3.35~infinity.patch"
-        elif [ "$major_version" -eq 3 ]; then
-          if [ "$minor_version" -ge 35 ]; then
-            patch_file="3.35~infinity.patch"
-          elif [ "$minor_version" -ge 24 ] && [ "$minor_version" -le 32 ]; then
-            patch_file="3.24~3.32.patch"
-          elif [ "$minor_version" -ge 19 ] && [ "$minor_version" -le 22 ]; then
-            patch_file="3.19~3.22.patch"
-          elif [ "$minor_version" -ge 13 ] && [ "$minor_version" -le 16 ]; then
-            patch_file="3.13~3.16.patch"
-          elif [ "$minor_version" -ge 0 ] && [ "$minor_version" -le 10 ]; then
-            patch_file="2.2~3.10.patch"
-          fi
-        elif [ "$major_version" -eq 2 ]; then
-          if [ "$minor_version" -ge 2 ]; then
-            patch_file="2.2~3.10.patch"
-          fi
-        fi
-        echo "Determined patch file: $patch_file"
-
-        if [ -z "$patch_file" ]; then
-          echo "No matching patch file found for Flutter version: $flutter_version"
-          exit 0
-        fi
-
-        echo "Flutter version: $flutter_version"
-        echo "Selected patch: $patch_file"
-
-        # 进入 Flutter SDK 目录
-        cd "${{ env.FLUTTER_ROOT }}"
-        git status
-        git pull
-        git status
-
-        # 下载补丁
-        echo "Downloading patch: $patch_url$patch_file"
-        patch_content=$(curl -fsSL "$patch_url$patch_file")
-
-        # 检查补丁是否已应用
-        if echo "$patch_content" | git apply --reverse --check 2>/dev/null; then
-          echo "Patch already applied, cleaning up old patch..."
-          echo "$patch_content" | git apply --reverse --verbose
-          echo "Old patch removed"
-        fi
-
-        # 应用新补丁
-        echo "Applying patch..."
-        echo "$patch_content" | git apply --verbose
-
-        echo "✓ Patch applied successfully"

From b14b47c4e251e489b1d0fd004e2bb2df4bc1264a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 17:03:59 +0800
Subject: [PATCH 04/13] d

---
 actions/setup-flutter/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 3545258..5f38312 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -9,7 +9,7 @@ inputs:
   channel:
     description: The Flutter channel to use
     required: false
-    default: stable
+    default: master
   cache:
     description: Enable caching for Flutter SDK and packages
     required: false

From 7ea1538b0c0f890148b95338fd467d856575d193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 17:08:06 +0800
Subject: [PATCH 05/13] d

---
 actions/setup-flutter/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 5f38312..3545258 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -9,7 +9,7 @@ inputs:
   channel:
     description: The Flutter channel to use
     required: false
-    default: master
+    default: stable
   cache:
     description: Enable caching for Flutter SDK and packages
     required: false

From 85d4361215edf9bdacd98598e68730f7708ea740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 17:43:27 +0800
Subject: [PATCH 06/13] d

---
 actions/setup-flutter/action.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 3545258..592df11 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -35,3 +35,6 @@ runs:
       run: |
         set -e
         echo "Setting up AOP registry for Flutter packages..."
+        flutter --version
+        cd ${{ env.FLUTTER_ROOT }}
+        git status

From c0e630ee15dfaf040c5b64e45b9a295971a94acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 17:47:52 +0800
Subject: [PATCH 07/13] d

---
 actions/setup-flutter/action.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 592df11..1af8b2e 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -38,3 +38,33 @@ runs:
         flutter --version
         cd ${{ env.FLUTTER_ROOT }}
         git status
+
+        patch_url="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/main/patch_flutter/"
+        flutter_version=$(flutter --version | head -n 1 | awk '{print $2}')
+        major_version=$(echo $flutter_version | cut -d. -f1)
+        minor_version=$(echo $flutter_version | cut -d. -f2)
+
+        # 确定适用的补丁文件
+        # 2.2~3.10.patch, 3.13~3.16.patch, 3.19~3.22.patch, 3.24~3.32.patch, 3.35~infinity.patch
+        patch_file=""
+        if [ "$major_version" -gt 3 ]; then
+          patch_file="3.35~infinity.patch"
+        elif [ "$major_version" -eq 3 ]; then
+          if [ "$minor_version" -ge 35 ]; then
+            patch_file="3.35~infinity.patch"
+          elif [ "$minor_version" -ge 24 ] && [ "$minor_version" -le 32 ]; then
+            patch_file="3.24~3.32.patch"
+          elif [ "$minor_version" -ge 19 ] && [ "$minor_version" -le 22 ]; then
+            patch_file="3.19~3.22.patch"
+          elif [ "$minor_version" -ge 13 ] && [ "$minor_version" -le 16 ]; then
+            patch_file="3.13~3.16.patch"
+          elif [ "$minor_version" -ge 0 ] && [ "$minor_version" -le 10 ]; then
+            patch_file="2.2~3.10.patch"
+          fi
+        elif [ "$major_version" -eq 2 ]; then
+          if [ "$minor_version" -ge 2 ]; then
+            patch_file="2.2~3.10.patch"
+          fi
+        fi
+
+        echo "Determined patch file: $patch_file"

From d1db4ff8af5ec1abe8f2e086550842b4eefd6602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 17:55:06 +0800
Subject: [PATCH 08/13] d

---
 actions/setup-flutter/action.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 1af8b2e..0b79c5c 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -39,32 +39,34 @@ runs:
         cd ${{ env.FLUTTER_ROOT }}
         git status
 
-        patch_url="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/main/patch_flutter/"
+        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/main/patch_flutter/"
         flutter_version=$(flutter --version | head -n 1 | awk '{print $2}')
         major_version=$(echo $flutter_version | cut -d. -f1)
         minor_version=$(echo $flutter_version | cut -d. -f2)
 
         # 确定适用的补丁文件
         # 2.2~3.10.patch, 3.13~3.16.patch, 3.19~3.22.patch, 3.24~3.32.patch, 3.35~infinity.patch
-        patch_file=""
+        patch_name=""
         if [ "$major_version" -gt 3 ]; then
-          patch_file="3.35~infinity.patch"
+          patch_name="3.35~infinity.patch"
         elif [ "$major_version" -eq 3 ]; then
           if [ "$minor_version" -ge 35 ]; then
-            patch_file="3.35~infinity.patch"
+            patch_name="3.35~infinity.patch"
           elif [ "$minor_version" -ge 24 ] && [ "$minor_version" -le 32 ]; then
-            patch_file="3.24~3.32.patch"
+            patch_name="3.24~3.32.patch"
           elif [ "$minor_version" -ge 19 ] && [ "$minor_version" -le 22 ]; then
-            patch_file="3.19~3.22.patch"
+            patch_name="3.19~3.22.patch"
           elif [ "$minor_version" -ge 13 ] && [ "$minor_version" -le 16 ]; then
-            patch_file="3.13~3.16.patch"
+            patch_name="3.13~3.16.patch"
           elif [ "$minor_version" -ge 0 ] && [ "$minor_version" -le 10 ]; then
-            patch_file="2.2~3.10.patch"
+            patch_name="2.2~3.10.patch"
           fi
         elif [ "$major_version" -eq 2 ]; then
           if [ "$minor_version" -ge 2 ]; then
-            patch_file="2.2~3.10.patch"
+            patch_name="2.2~3.10.patch"
           fi
         fi
-
-        echo "Determined patch file: $patch_file"
+        echo "patch_name: $patch_name"
+        patch_url="$patch_prefix$patch_name"
+        echo "patch_url: $patch_url"
+        wget $patch_url

From 6e019db6dc4afff4937abf568d02eed954dc98f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 17:55:22 +0800
Subject: [PATCH 09/13] d

---
 actions/setup-flutter/action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 0b79c5c..e0b46ef 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -70,3 +70,4 @@ runs:
         patch_url="$patch_prefix$patch_name"
         echo "patch_url: $patch_url"
         wget $patch_url
+        git status

From 60009b94625709f3b5c075c69471bcbfdbffc2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 17:57:04 +0800
Subject: [PATCH 10/13] d

---
 actions/setup-flutter/action.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index e0b46ef..341d1a5 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -71,3 +71,6 @@ runs:
         echo "patch_url: $patch_url"
         wget $patch_url
         git status
+        git apply $patch_name
+        git status
+        echo "AOP registry setup completed."

From d3c899b1936871157952f2446d5fa980d89e8f6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 18:01:24 +0800
Subject: [PATCH 11/13] d

---
 actions/setup-flutter/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 341d1a5..a0d82c2 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -33,7 +33,7 @@ runs:
       if: ${{ inputs.aop-registry }}
       shell: bash
       run: |
-        set -e
+        set -eu
         echo "Setting up AOP registry for Flutter packages..."
         flutter --version
         cd ${{ env.FLUTTER_ROOT }}

From 6289a0a8e62dc4a3cbb1cca033ef77008d37f176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 18:10:44 +0800
Subject: [PATCH 12/13] d

---
 actions/setup-flutter/action.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index a0d82c2..bcf7c74 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -38,6 +38,9 @@ runs:
         flutter --version
         cd ${{ env.FLUTTER_ROOT }}
         git status
+        git restore .
+        git clean -fdx
+        git status
 
         patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/main/patch_flutter/"
         flutter_version=$(flutter --version | head -n 1 | awk '{print $2}')

From 1091dab947b2029bd0d921f311840f6801d14b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 27 Nov 2025 18:12:59 +0800
Subject: [PATCH 13/13] d

---
 actions/setup-flutter/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index bcf7c74..030ce9f 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -39,7 +39,7 @@ runs:
         cd ${{ env.FLUTTER_ROOT }}
         git status
         git restore .
-        git clean -fdx
+        git clean -fd
         git status
 
         patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/main/patch_flutter/"