From 93770d6f4f3570c3a7cb20c794d8d0febc56ee99 Mon Sep 17 00:00:00 2001 From: fuilloi <219219107+fuilloi@users.noreply.github.com> Date: Tue, 13 Jan 2026 19:56:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4replace=20gvisor=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=20(#176)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * remove gvisor replace Removes to avoid errors during publication. follow upstream gvisor * Remove go get -u and lock There is no need, the upstream will update the dependency. Remove the locked gvisor version. * Update go.mod * Update go.sum --- .github/workflows/tidy.yml | 9 +-------- go.mod | 8 +++----- go.sum | 8 ++++---- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml index e8b4daa..4797be7 100644 --- a/.github/workflows/tidy.yml +++ b/.github/workflows/tidy.yml @@ -66,15 +66,8 @@ jobs: echo "Failed to detect Go version from upstream go.mod" fi - # Lock gvisor version to a specific revision - go mod edit -replace=gvisor.dev/gvisor=gvisor.dev/gvisor@v0.0.0-20250606001031-fa4c4dd86b43 - - # Update specific dependency go get github.com/xtls/xray-core@${{ env.LATEST_TAG_SHA }} - - # Update all other dependencies - go get -u - go get gvisor.dev/gvisor@go + go get golang.org/x/mobile@latest # Clean up and verify module dependencies go mod tidy -v diff --git a/go.mod b/go.mod index effd212..0c59536 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module github.com/2dust/AndroidLibXrayLite -go 1.25 +go 1.25.5 require ( - github.com/xtls/xray-core v0.0.0-20260111142645-14e171ac8e87 + github.com/xtls/xray-core v1.251208.1-0.20260112181802-e742e84ded3e golang.org/x/mobile v0.0.0-20251126181937-5c265dc024c4 ) @@ -48,8 +48,6 @@ require ( google.golang.org/grpc v1.78.0 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gvisor.dev/gvisor v0.0.0-20251208201337-b42c83311c5b // indirect + gvisor.dev/gvisor v0.0.0-20260109181451-4be7c433dae2 // indirect lukechampine.com/blake3 v1.4.1 // indirect ) - -replace gvisor.dev/gvisor => gvisor.dev/gvisor v0.0.0-20250606001031-fa4c4dd86b43 diff --git a/go.sum b/go.sum index 46696dc..550c6b9 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,8 @@ github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zd github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= github.com/xtls/reality v0.0.0-20251116175510-cd53f7d50237 h1:UXjrmniKlY+ZbIqpN91lejB3pszQQQRVu1vqH/p/aGM= github.com/xtls/reality v0.0.0-20251116175510-cd53f7d50237/go.mod h1:vbHCV/3VWUvy1oKvTxxWJRPEWSeR1sYgQHIh6u/JiZQ= -github.com/xtls/xray-core v0.0.0-20260111142645-14e171ac8e87 h1:yGnFrB4462JEOTsrmBANFpdcf6hplizcGv8GM2wvK5Q= -github.com/xtls/xray-core v0.0.0-20260111142645-14e171ac8e87/go.mod h1:xU3ZJfDUAC32q+zxkLVO3V/7Wt0GvHupfmVRQfZDll0= +github.com/xtls/xray-core v1.251208.1-0.20260112181802-e742e84ded3e h1:1NBQonD7WV/BMw5C5omeTMRI+9B5/lZnMi8opoGBGDA= +github.com/xtls/xray-core v1.251208.1-0.20260112181802-e742e84ded3e/go.mod h1:EUeZNN/zljeIJak8SHwDJ6w+94uZYzdlsmwzirlYun0= github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= @@ -134,7 +134,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gvisor.dev/gvisor v0.0.0-20250606001031-fa4c4dd86b43 h1:BEymU11L8DZSC4GNK48JYIR8EcHs+gFxtg9YfYlp68c= -gvisor.dev/gvisor v0.0.0-20250606001031-fa4c4dd86b43/go.mod h1:3r5CMtNQMKIvBlrmM9xWUNamjKBYPOWyXOjmg5Kts3g= +gvisor.dev/gvisor v0.0.0-20260109181451-4be7c433dae2 h1:fr6L00yGG2RP5NMea6njWpdC+bm+cMdFClrSpaicp1c= +gvisor.dev/gvisor v0.0.0-20260109181451-4be7c433dae2/go.mod h1:QkHjoMIBaYtpVufgwv3keYAbln78mBoCuShZrPrer1Q= lukechampine.com/blake3 v1.4.1 h1:I3Smz7gso8w4/TunLKec6K2fn+kyKtDxr/xcQEN84Wg= lukechampine.com/blake3 v1.4.1/go.mod h1:QFosUxmjB8mnrWFSNwKmvxHpfY72bmD2tQ0kBMM3kwo=