Update dependencies (#74)

* Update main.yml * Update main.yml * Update main.yml * Update main.yml * Update main.yml * Update main.yml * Update go.mod * Update go.sum * Update go.mod
2dust · Dec 24, 2024 · 436d27a · 436d27a
1 parent d0a1b50
commit 436d27a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,12 +19,24 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version-file: 'go.mod'
+
+    - name: Patch Go use 600296
+      if: steps.cache-libv2ray-restore.outputs.cache-hit != 'true'
+      #https://go-review.googlesource.com/c/go/+/600296
+      run: |
+       cd "$(go env GOROOT)"
+       curl "https://go-review.googlesource.com/changes/go~600296/revisions/5/patch" | base64 -d | patch --verbose -p 1
+
+    - name: Install gomobile
+      run: |
+        go install golang.org/x/mobile/cmd/gomobile@latest
+        export PATH=$PATH:~/go/bin
       
-    - name: Setup JDK
+    - name: Setup Java
       uses: actions/setup-java@v4
       with:
-        java-version: 21
         distribution: 'temurin'
+        java-version: '21'
 
     - name: Setup Android SDK Tools
       uses: android-actions/setup-android@v3.2.2
@@ -36,10 +48,6 @@ jobs:
       with:
         ndk-version: 'r27b'
         link-to-sdk: true
-    - name: Setup Go Mobile
-      run: |
-        go install golang.org/x/mobile/cmd/gomobile@latest
-        export PATH=$PATH:~/go/bin
 
     - name: Build
       run: |

diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
 	github.com/onsi/ginkgo/v2 v2.22.0 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/pires/go-proxyproto v0.8.0 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
 	github.com/quic-go/quic-go v0.48.2 // indirect

diff --git a/go.sum b/go.sum
@@ -36,8 +36,8 @@ github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg
 github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
 github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
 github.com/pires/go-proxyproto v0.8.0 h1:5unRmEAPbHXHuLjDg01CxJWf91cw3lKHc/0xzKpXEe0=
 github.com/pires/go-proxyproto v0.8.0/go.mod h1:iknsfgnH8EkjrMeMyvfKByp9TiBZCKZM0jx2xmKqnVY=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=