diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 77c8fe9b..b929e77d 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v7 with: - go-version: 1.27.0 + go-version: 1.27.1 cache-dependency-path: "library/core/go.sum" - name: Setup Go Mobile # https://github.com/golang/mobile/blob/c31d5b91ecc32c0d598b8fe8457d244ca0b4e815/cmd/gomobile/init.go#L83 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04862c16..50966d0b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v7 with: - go-version: 1.27.0 + go-version: 1.27.1 cache-dependency-path: "library/core/go.sum" - name: Setup Go Mobile # https://github.com/golang/mobile/blob/c31d5b91ecc32c0d598b8fe8457d244ca0b4e815/cmd/gomobile/init.go#L83 diff --git a/app/src/main/aboutlibraries/aboutlibraries.json b/app/src/main/aboutlibraries/aboutlibraries.json index 704b4612..3759b8a0 100644 --- a/app/src/main/aboutlibraries/aboutlibraries.json +++ b/app/src/main/aboutlibraries/aboutlibraries.json @@ -402,7 +402,7 @@ }, { "uniqueId": "com.google.protobuf:protobuf-java", - "artifactVersion": "4.36.0" + "artifactVersion": "4.36.1" }, { "uniqueId": "com.google.zxing:core", @@ -494,7 +494,7 @@ }, { "uniqueId": "org.yaml:snakeyaml", - "artifactVersion": "2.6" + "artifactVersion": "2.7" } ] } \ No newline at end of file diff --git a/app/src/main/aboutlibraries/aboutlibraries_legacy.json b/app/src/main/aboutlibraries/aboutlibraries_legacy.json index 60ab6b69..9b2e02b0 100644 --- a/app/src/main/aboutlibraries/aboutlibraries_legacy.json +++ b/app/src/main/aboutlibraries/aboutlibraries_legacy.json @@ -354,7 +354,7 @@ }, { "uniqueId": "com.google.protobuf:protobuf-java", - "artifactVersion": "4.36.0" + "artifactVersion": "4.36.1" }, { "uniqueId": "com.google.zxing:core", @@ -430,7 +430,7 @@ }, { "uniqueId": "org.yaml:snakeyaml", - "artifactVersion": "2.6" + "artifactVersion": "2.7" } ] } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b22e112b..8fb3a12a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,8 +36,8 @@ material = { module = "com.google.android.material:material", version = "1.14.0" gson = { module = "com.google.code.gson:gson", version = "2.14.0" } bouncycastle = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.85" } zxing-core = { module = "com.google.zxing:core", version = "3.5.4" } -protobuf-java = { module = "com.google.protobuf:protobuf-java", version = "4.36.0" } -snakeyaml = { module = "org.yaml:snakeyaml", version = "2.6" } +protobuf-java = { module = "com.google.protobuf:protobuf-java", version = "4.36.1" } +snakeyaml = { module = "org.yaml:snakeyaml", version = "2.7" } material-about-library = { module = "com.github.daniel-stoneuk:material-about-library", version = "3.2.0-rc01" } process-phoenix = { module = "com.jakewharton:process-phoenix", version = "3.0.0" } kryo = { module = "com.esotericsoftware:kryo", version = "5.6.2" } diff --git a/library/core/go.mod b/library/core/go.mod index a0c7c75a..c5076f72 100644 --- a/library/core/go.mod +++ b/library/core/go.mod @@ -2,7 +2,7 @@ module libexclavecore go 1.26.0 -require github.com/exclavenetwork/libexclavecore v0.0.0-20260901141744-801b59a22f87 +require github.com/exclavenetwork/libexclavecore v0.0.0-20260902160856-9c92e0c5de6a require ( filippo.io/age v1.3.2 // indirect @@ -16,11 +16,11 @@ require ( github.com/dgryski/go-camellia v0.0.0-20191119043421-69a8a13fb23d // indirect github.com/dgryski/go-metro v0.0.0-20250106013310-edb8663e5e33 // indirect github.com/enfein/mieru/v3 v3.36.0 // indirect - github.com/exclavenetwork/exclave-core/v5 v5.50.1-0.20260901141241-37e81eb126a8 // indirect + github.com/exclavenetwork/exclave-core/v5 v5.50.1-0.20260902160805-30073e114e69 // indirect github.com/exclavenetwork/go-stun v0.1.7-0.20260811120819-d09f4628f065 // indirect github.com/exclavenetwork/hysteria/core/v2 v2.12.2-1 // indirect github.com/exclavenetwork/hysteria/extras/v2 v2.12.2-1 // indirect - github.com/exclavenetwork/sing-juicity v0.3.0-beta.2 // indirect + github.com/exclavenetwork/sing-juicity v0.3.0 // indirect github.com/exclavenetwork/sing-shadowquic v0.0.0-20260828154517-83f88a9ce329 // indirect github.com/gofrs/uuid/v5 v5.5.1 // indirect github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259 // indirect @@ -28,7 +28,7 @@ require ( github.com/google/btree v1.1.3 // indirect github.com/gorilla/websocket v1.5.3 // indirect github.com/hashicorp/yamux v0.1.2 // indirect - github.com/klauspost/compress v1.19.2 // indirect + github.com/klauspost/compress v1.20.0 // indirect github.com/klauspost/cpuid/v2 v2.4.0 // indirect github.com/lunixbochs/struc v0.0.0-20241101090106-8d528fa2c543 // indirect github.com/metacubex/cpu v0.1.1 // indirect @@ -46,12 +46,12 @@ require ( github.com/refraction-networking/utls v1.8.3-0.20260802151714-23b1dac19c06 // indirect github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect github.com/sagernet/quic-go v0.61.0-sing-box-mod.7 // indirect - github.com/sagernet/sing v0.9.0-beta.4 // indirect + github.com/sagernet/sing v0.9.0 // indirect github.com/sagernet/sing-mux v0.3.5 // indirect - github.com/sagernet/sing-quic v0.7.0-beta.4 // indirect + github.com/sagernet/sing-quic v0.7.0 // indirect github.com/sagernet/sing-shadowsocks v0.2.9 // indirect github.com/sagernet/sing-shadowsocks2 v0.2.2 // indirect - github.com/sagernet/sing-snell v0.0.0-20260829071736-20f2eaec77c3 // indirect + github.com/sagernet/sing-snell v0.0.0-20260902142643-ae4518fa003f // indirect github.com/sagernet/smux v1.5.50-sing-box-mod.1 // indirect github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 // indirect github.com/v2fly/BrowserBridge v0.0.0-20210430233438-0570fc1d7d08 // indirect @@ -68,7 +68,7 @@ require ( golang.org/x/time v0.15.0 // indirect golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect golang.zx2c4.com/wireguard v0.0.0-20260522210424-ecfc5a8d5446 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260825221802-da73d73af1c5 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260831171406-18b4a7587f8a // indirect google.golang.org/grpc v1.83.2 // indirect google.golang.org/protobuf v1.36.12 // indirect gvisor.dev/gvisor v0.0.0-20250503011706-39ed1f5ac29c // indirect diff --git a/library/core/go.sum b/library/core/go.sum index 644ee7a6..3fd1750a 100644 --- a/library/core/go.sum +++ b/library/core/go.sum @@ -63,18 +63,18 @@ github.com/dgryski/go-metro v0.0.0-20250106013310-edb8663e5e33/go.mod h1:c9O8+fp github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/enfein/mieru/v3 v3.36.0 h1:kTXfBSV6Dajk09yBYMeI1r4WAuAtMCKqZ42X5BrQZV8= github.com/enfein/mieru/v3 v3.36.0/go.mod h1:zJBUCsi5rxyvHM8fjFf+GLaEl4OEjjBXr1s5F6Qd3hM= -github.com/exclavenetwork/exclave-core/v5 v5.50.1-0.20260901141241-37e81eb126a8 h1:5Ren4i/sMBzIvXxQtOHw+txT+YNPstrk9vC8ioS8Dws= -github.com/exclavenetwork/exclave-core/v5 v5.50.1-0.20260901141241-37e81eb126a8/go.mod h1:4ZXvWUoeA83RhR5sZ4g6SIbeQKhtjxc92uLyOztMW9Q= +github.com/exclavenetwork/exclave-core/v5 v5.50.1-0.20260902160805-30073e114e69 h1:o0bJaRxP6xShVLzrzJ2zZDDOH3KX8mASb8WP8LoMAeI= +github.com/exclavenetwork/exclave-core/v5 v5.50.1-0.20260902160805-30073e114e69/go.mod h1:z/PsjC53yEus2+WSdvf1WwYtvNd7ASPGAjY/im/SfOI= github.com/exclavenetwork/go-stun v0.1.7-0.20260811120819-d09f4628f065 h1:ZAtO0tq9eSEphwM8m6DwIvm1fphmgcR+ZjNfGINuQq0= github.com/exclavenetwork/go-stun v0.1.7-0.20260811120819-d09f4628f065/go.mod h1:ObmiKQNMk51Fks7eGBg1scssRkcoCs25W0UHDjeYavk= github.com/exclavenetwork/hysteria/core/v2 v2.12.2-1 h1:zglF+7VgjHVO6guUPO+AHuZdJq2u6JrZ9OYIHwiyz4E= github.com/exclavenetwork/hysteria/core/v2 v2.12.2-1/go.mod h1:R5Uz48F3GDpNQaQOL8CWr6HONzkQUnecFZyMoAxXPk4= github.com/exclavenetwork/hysteria/extras/v2 v2.12.2-1 h1:FL3ItGsQFE/037i1f86I9Bd5gPGN1R7PS9c3qvPN+rM= github.com/exclavenetwork/hysteria/extras/v2 v2.12.2-1/go.mod h1:IKo1/vSm5na6Sd/4PCoB3j49rlC04i0j1v+OTCMDwrk= -github.com/exclavenetwork/libexclavecore v0.0.0-20260901141744-801b59a22f87 h1:FwcES1sIycva360V+pWfY+PLDzvyr8x6M/RD5OapYxY= -github.com/exclavenetwork/libexclavecore v0.0.0-20260901141744-801b59a22f87/go.mod h1:HzZfkvahHNz+Z0W+7OZX3escRwWcZ12pLc41ZX4uGMw= -github.com/exclavenetwork/sing-juicity v0.3.0-beta.2 h1:4x8X8vQsK8w6I0tegJoWLjQMqEnaRehmd6s4wqVCOWo= -github.com/exclavenetwork/sing-juicity v0.3.0-beta.2/go.mod h1:nvOG91JHNrsYkNAtPG9zG3/flKpNm1EFW5k8IIfBaLk= +github.com/exclavenetwork/libexclavecore v0.0.0-20260902160856-9c92e0c5de6a h1:vErKPsztG+Is0na3E2IEjmiiEvIDWI40042ojiXwvQc= +github.com/exclavenetwork/libexclavecore v0.0.0-20260902160856-9c92e0c5de6a/go.mod h1:VUpqNK8QVKo2l24IrGwXHhH8tBM1GpSxAtxezv2lxSg= +github.com/exclavenetwork/sing-juicity v0.3.0 h1:DE9dAg82VR61MWXdrXUoNVKuRpkyfnbNOw8DxGyinCc= +github.com/exclavenetwork/sing-juicity v0.3.0/go.mod h1:SNBD9qD+SR1RubUcIO6HXbx+5kvIu7ieEFeuAndzX/8= github.com/exclavenetwork/sing-shadowquic v0.0.0-20260828154517-83f88a9ce329 h1:og9mvkdpljwOBs1XTJ0FabQdXAwQtbVDBEHKDrOvh3g= github.com/exclavenetwork/sing-shadowquic v0.0.0-20260828154517-83f88a9ce329/go.mod h1:dnogioLE7ZFypHbYHMFo2NMvzUniEdhht0qKlN0IlIM= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -162,8 +162,8 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.19.2 h1:hMRETovs/pu/dVWN7zIT1PGG8t509MwT6bO7XSi26R8= -github.com/klauspost/compress v1.19.2/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= +github.com/klauspost/compress v1.20.0 h1:a3C1ke2ohxFymNlb2HWAHjDeKCI90scRskErZkR0ezA= +github.com/klauspost/compress v1.20.0/go.mod h1:LUdAzn7YLVvxLpc7y3V1m40wESHTgc1422pwwBSKYuI= github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -244,18 +244,18 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sagernet/quic-go v0.61.0-sing-box-mod.7 h1:sW2O+DoNF+my1PGlSZ3zG2N+fdxLR3DC0l4sXCM0lBE= github.com/sagernet/quic-go v0.61.0-sing-box-mod.7/go.mod h1:hmLC8GJPp+BrpBgrgJnacvI4fZGIhasuy1ROJJ8GR4E= -github.com/sagernet/sing v0.9.0-beta.4 h1:DYoEzb3FeCZ9bA66hJmL0NFDXckZpa4oYF/VpbFJEkE= -github.com/sagernet/sing v0.9.0-beta.4/go.mod h1:K3Owt3xPhHugvlnlPPxZJ/exXdaJfEPOTNorGk4AXjo= +github.com/sagernet/sing v0.9.0 h1:NQvJxtYEl+2uIh/Bkxf5cqAZfZuFCQKQe2z85Pbfxag= +github.com/sagernet/sing v0.9.0/go.mod h1:K3Owt3xPhHugvlnlPPxZJ/exXdaJfEPOTNorGk4AXjo= github.com/sagernet/sing-mux v0.3.5 h1:RHnhVEc+SFqkrK4xMygYjDwwLhzp2Bj3lztSukONfhI= github.com/sagernet/sing-mux v0.3.5/go.mod h1:QvlKMyNBNrQoyX4x+gq028uPbLM2XeRpWtDsWBJbFSk= -github.com/sagernet/sing-quic v0.7.0-beta.4 h1:frzDiZqUbT0yLVaVfgaLtoVQ/zGa3xIsDTHP+aSM/W8= -github.com/sagernet/sing-quic v0.7.0-beta.4/go.mod h1:rJFeVxbEej2iuyeCJ3drKW+p5rOgtLIW3XhZ6ty7Fig= +github.com/sagernet/sing-quic v0.7.0 h1:dgbJdRYsa9DXbgjchnuVf2xhAvjY4/jylWdNNVZWmRU= +github.com/sagernet/sing-quic v0.7.0/go.mod h1:rJFeVxbEej2iuyeCJ3drKW+p5rOgtLIW3XhZ6ty7Fig= github.com/sagernet/sing-shadowsocks v0.2.9 h1:Paep5zCszRKsEn8587O0MnhFWKJwDW1Y4zOYYlIxMkM= github.com/sagernet/sing-shadowsocks v0.2.9/go.mod h1:TE/Z6401Pi8tgr0nBZcM/xawAI6u3F6TTbz4nH/qw+8= github.com/sagernet/sing-shadowsocks2 v0.2.2 h1:GUN6ttP3NSJL/bFJJZZezp9/o6DQdG9qWyQdRvOy2LY= github.com/sagernet/sing-shadowsocks2 v0.2.2/go.mod h1:ZAYv1VFjvnMK4QQJltuvoN52biUN76TdNwzyDjSRrzc= -github.com/sagernet/sing-snell v0.0.0-20260829071736-20f2eaec77c3 h1:wjEw0lmCSC+oqh7GD4rbMB/dk7+hZ2VopUj4xM5/Jrc= -github.com/sagernet/sing-snell v0.0.0-20260829071736-20f2eaec77c3/go.mod h1:et8Lws4f5QbOrY65DmjevHGup3mijJkhswkto6cwciM= +github.com/sagernet/sing-snell v0.0.0-20260902142643-ae4518fa003f h1:YxQyOQ/96maJu+VFulWZXcz/F/k4K7lM8jKAugMqzZs= +github.com/sagernet/sing-snell v0.0.0-20260902142643-ae4518fa003f/go.mod h1:et8Lws4f5QbOrY65DmjevHGup3mijJkhswkto6cwciM= github.com/sagernet/smux v1.5.50-sing-box-mod.1 h1:XkJcivBC9V4wBjiGXIXZ229aZCU1hzcbp6kSkkyQ478= github.com/sagernet/smux v1.5.50-sing-box-mod.1/go.mod h1:NjhsCEWedJm7eFLyhuBgIEzwfhRmytrUoiLluxs5Sk8= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= @@ -464,8 +464,8 @@ google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260825221802-da73d73af1c5 h1:1VUiZAXyC+zmiFYi+WLtBzr68Cj8wOofHjjrA/kkizc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260825221802-da73d73af1c5/go.mod h1:DjtHYE8FKJLivXcBEjGwndXfIC23G0VpXiXKqG179uA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260831171406-18b4a7587f8a h1:3Dnd1cDaZlB68lziofO+bJXpjOy8UfRv8Unt+yH8tQ4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260831171406-18b4a7587f8a/go.mod h1:DjtHYE8FKJLivXcBEjGwndXfIC23G0VpXiXKqG179uA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/library/proto-stub/build.gradle.kts b/library/proto-stub/build.gradle.kts index 0a9ce225..9c5d7d0e 100644 --- a/library/proto-stub/build.gradle.kts +++ b/library/proto-stub/build.gradle.kts @@ -23,7 +23,7 @@ android { protobuf { protoc { - artifact = "com.google.protobuf:protoc:4.36.0" + artifact = "com.google.protobuf:protoc:4.36.1" } generateProtoTasks { all().forEach {