From 09e55cf2d25a39197387e6e117a9277cb7243bb6 Mon Sep 17 00:00:00 2001 From: metacubex Date: Wed, 2 Nov 2022 14:58:21 +0800 Subject: [PATCH] chore:update --- build.gradle.kts | 4 +- core/src/foss/golang/go.mod | 73 ++++++++++++++++++++----------------- 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7056326b..70e10a2e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -40,8 +40,8 @@ subprojects { minSdk = 21 targetSdk = 31 - versionName = "2.5.11-pre03" - versionCode = 205011 + versionName = "2.5.12-pre01" + versionCode = 205012 resValue("string", "release_name", "v$versionName") resValue("integer", "release_code", "$versionCode") diff --git a/core/src/foss/golang/go.mod b/core/src/foss/golang/go.mod index 094b9259..b3673515 100644 --- a/core/src/foss/golang/go.mod +++ b/core/src/foss/golang/go.mod @@ -1,63 +1,68 @@ module foss -go 1.18 +go 1.19 require cfa v0.0.0 require ( - cfa/blob v0.0.0 // indirect github.com/Dreamacro/clash v1.7.1 // indirect github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34 // indirect github.com/cheekybits/genny v1.0.0 // indirect - github.com/coreos/go-iptables v0.6.0 // indirect - github.com/dlclark/regexp2 v1.4.0 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect - github.com/gofrs/uuid v4.2.0+incompatible // indirect - github.com/google/gopacket v1.1.19 // indirect - github.com/gorilla/websocket v1.5.0 // indirect - github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f // indirect - github.com/klauspost/cpuid/v2 v2.0.12 // indirect - github.com/lucas-clemente/quic-go v0.27.2 // indirect - github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect + github.com/klauspost/cpuid/v2 v2.1.1 // indirect + github.com/kr/pretty v0.3.0 // indirect github.com/marten-seemann/qpack v0.2.1 // indirect github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect github.com/marten-seemann/qtls-go1-17 v0.1.2 // indirect github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect - github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect - github.com/miekg/dns v1.1.49 // indirect + github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/onsi/ginkgo v1.16.5 // indirect - github.com/oschwald/geoip2-golang v1.7.0 // indirect - github.com/oschwald/maxminddb-golang v1.9.0 // indirect - github.com/sagernet/sing v0.0.0-20220627234642-a817f7084d9c // indirect - github.com/sagernet/sing-shadowsocks v0.0.0-20220627234717-689e0165ef2c // indirect - github.com/sagernet/sing-vmess v0.0.0-20220616051646-3d3fc5d01eec // indirect - github.com/sirupsen/logrus v1.8.1 // indirect + github.com/oschwald/maxminddb-golang v1.10.0 // indirect github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect - github.com/xtls/go v0.0.0-20210920065950-d4af136d3672 // indirect - go.etcd.io/bbolt v1.3.6 // indirect - go.uber.org/atomic v1.9.0 // indirect - golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect - golang.org/x/exp v0.0.0-20220608143224-64259d1afd70 // indirect - golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect - golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect - golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect - golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/text v0.3.8-0.20220124021120-d1c84af989ab // indirect - golang.org/x/tools v0.1.10 // indirect - golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect - google.golang.org/protobuf v1.28.0 // indirect + golang.org/x/tools v0.1.12 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/blake3 v1.1.7 // indirect ) +require ( + cfa/blob v0.0.0 // indirect + github.com/coreos/go-iptables v0.6.0 // indirect + github.com/dlclark/regexp2 v1.7.0 // indirect + github.com/gofrs/uuid v4.3.0+incompatible // indirect + github.com/google/gopacket v1.1.19 // indirect + github.com/gorilla/websocket v1.5.0 // indirect + github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c // indirect + github.com/lucas-clemente/quic-go v0.29.1 // indirect + github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect + github.com/miekg/dns v1.1.50 // indirect + github.com/oschwald/geoip2-golang v1.8.0 // indirect + github.com/sagernet/sing v0.0.0-20220929000216-9a83e35b7186 // indirect + github.com/sagernet/sing-shadowsocks v0.0.0-20220819002358-7461bb09a8f6 // indirect + github.com/sagernet/sing-vmess v0.0.0-20220921140858-b6a1bdee672f // indirect + github.com/sirupsen/logrus v1.9.0 // indirect + github.com/xtls/go v0.0.0-20220914232946-0441cf4cf837 // indirect + go.etcd.io/bbolt v1.3.6 // indirect + go.uber.org/atomic v1.10.0 // indirect + golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect + golang.org/x/exp v0.0.0-20220930202632-ec3f01382ef9 // indirect + golang.org/x/net v0.0.0-20221004154528-8021a29435af // indirect + golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 // indirect + golang.org/x/sys v0.0.0-20221006211917-84dc82d7e875 // indirect + google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +replace github.com/vishvananda/netlink => github.com/MetaCubeX/netlink v1.2.0-beta.0.20220529072258-d6853f887820 + +replace github.com/lucas-clemente/quic-go => github.com/tobyxdd/quic-go v0.28.1-0.20220706211558-7780039ad599 + replace cfa => ../../main/golang replace github.com/Dreamacro/clash => ./clash replace cfa/blob => ../../../build/intermediates/golang_blob - -replace github.com/lucas-clemente/quic-go => github.com/tobyxdd/quic-go v0.28.1-0.20220706211558-7780039ad599