From 93abfde372953f44aab7bcb28548c1c5a6c8dd9c Mon Sep 17 00:00:00 2001 From: Andrea Gottardo Date: Mon, 15 Apr 2024 12:16:48 -0700 Subject: [PATCH] android: bump OSS and bump version code to 206 Signed-off-by: Andrea Gottardo --- android/build.gradle | 4 ++-- go.mod | 5 +++-- go.sum | 14 ++++++-------- go.toolchain.rev | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d710382..a6dd5b1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -37,8 +37,8 @@ android { defaultConfig { minSdkVersion 26 targetSdkVersion 34 - versionCode 205 - versionName "1.65.4-t7a77a2edf-gfab2f183b34" + versionCode 206 + versionName "1.65.4-t7a77a2edf-gf95428f7fa4" } compileOptions { diff --git a/go.mod b/go.mod index b2c1106..bca14b2 100644 --- a/go.mod +++ b/go.mod @@ -7,13 +7,13 @@ require ( gioui.org v0.0.0-20230206180804-32c6a9b10d0b gioui.org/cmd v0.0.0-20210925100615-41f3a7e74ee6 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e - github.com/tailscale/wireguard-go v0.0.0-20231121184858-cc193a0b3272 + github.com/tailscale/wireguard-go v0.0.0-20240413175505-64040e66467d golang.org/x/exp v0.0.0-20240119083558-1b970713d09a golang.org/x/exp/shiny v0.0.0-20230817173708-d852ddb80c63 golang.org/x/mobile v0.0.0-20240319015410-c58ccf4b0c87 golang.org/x/sys v0.18.0 inet.af/netaddr v0.0.0-20220617031823-097006376321 - tailscale.com v1.65.0-pre.0.20240412190536-7a77a2edf16f + tailscale.com v1.65.0-pre.0.20240415182113-14c8b674eab2 ) require ( @@ -45,6 +45,7 @@ require ( github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e // indirect github.com/fxamacker/cbor/v2 v2.5.0 // indirect github.com/gaissmai/bart v0.4.1 // indirect + github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-text/typesetting v0.0.0-20221214153724-0399769901d5 // indirect github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect diff --git a/go.sum b/go.sum index 69b7a61..9c53dbc 100644 --- a/go.sum +++ b/go.sum @@ -142,6 +142,8 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/github/fakeca v0.1.0 h1:Km/MVOFvclqxPM9dZBC4+QE564nU4gz4iZ0D9pMw28I= github.com/github/fakeca v0.1.0/go.mod h1:+bormgoGMMuamOscx7N91aOuUST7wdaJ2rNjeohylyo= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 h1:ymLjT4f35nQbASLnvxEde4XOBL+Sn7rFuV+FOJqkljg= +github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0/go.mod h1:6daplAwHHGbUGib4990V3Il26O0OC4aRyvewaaAihaA= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -420,8 +422,8 @@ github.com/tailscale/peercred v0.0.0-20240214030740-b535050b2aa4 h1:Gz0rz40FvFVL github.com/tailscale/peercred v0.0.0-20240214030740-b535050b2aa4/go.mod h1:phI29ccmHQBc+wvroosENp1IF9195449VDnFDhJ4rJU= github.com/tailscale/web-client-prebuilt v0.0.0-20240226180453-5db17b287bf1 h1:tdUdyPqJ0C97SJfjB9tW6EylTtreyee9C44de+UBG0g= github.com/tailscale/web-client-prebuilt v0.0.0-20240226180453-5db17b287bf1/go.mod h1:agQPE6y6ldqCOui2gkIh7ZMztTkIQKH049tv8siLuNQ= -github.com/tailscale/wireguard-go v0.0.0-20231121184858-cc193a0b3272 h1:zwsem4CaamMdC3tFoTpzrsUSMDPV0K6rhnQdF7kXekQ= -github.com/tailscale/wireguard-go v0.0.0-20231121184858-cc193a0b3272/go.mod h1:BOm5fXUBFM+m9woLNBoxI9TaBXXhGNP50LX/TGIvGb4= +github.com/tailscale/wireguard-go v0.0.0-20240413175505-64040e66467d h1:IREg0cn4nDyMjnqTgPacjgl66qDYmoOnt1k/vb96ius= +github.com/tailscale/wireguard-go v0.0.0-20240413175505-64040e66467d/go.mod h1:BOm5fXUBFM+m9woLNBoxI9TaBXXhGNP50LX/TGIvGb4= github.com/tailscale/xnet v0.0.0-20240117122442-62b9a7c569f9 h1:81P7rjnikHKTJ75EkjppvbwUfKHDHYk6LJpO5PZy8pA= github.com/tailscale/xnet v0.0.0-20240117122442-62b9a7c569f9/go.mod h1:orPd6JZXXRyuDusYilywte7k094d7dycXXU5YnWsrwg= github.com/tc-hib/winres v0.2.1 h1:YDE0FiP0VmtRaDn7+aaChp1KiF4owBiJa5l964l5ujA= @@ -670,9 +672,5 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k= software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -tailscale.com v1.63.0-pre.0.20240404175649-853e3e29a0a6 h1:olrk8pALH8inlmr4+euszd6cDI1dHhkRiFffxQ+fvpU= -tailscale.com v1.63.0-pre.0.20240404175649-853e3e29a0a6/go.mod h1:6kGByHNxnFfK1i4gVpdtvpdS1HicHohWXnsfwmXy64I= -tailscale.com v1.63.0-pre.0.20240405184358-1fbaf26106ef h1:P6VOuMZ838hOfjEWe+6Om+4LzhXW+OIKYlW1p/+uuO8= -tailscale.com v1.63.0-pre.0.20240405184358-1fbaf26106ef/go.mod h1:6kGByHNxnFfK1i4gVpdtvpdS1HicHohWXnsfwmXy64I= -tailscale.com v1.65.0-pre.0.20240412190536-7a77a2edf16f h1:bEu3BARkgRHRcHzS3fT2FI4Dr/g2J27RDKdMUTzDQVc= -tailscale.com v1.65.0-pre.0.20240412190536-7a77a2edf16f/go.mod h1:6kGByHNxnFfK1i4gVpdtvpdS1HicHohWXnsfwmXy64I= +tailscale.com v1.65.0-pre.0.20240415182113-14c8b674eab2 h1:r28qPCKOVEPDQ/+ENVdDA3VLLm7vss//9LEZq2bmPR8= +tailscale.com v1.65.0-pre.0.20240415182113-14c8b674eab2/go.mod h1:p7jW7hf6RapU3m3/7HfztM1Z6soNO2/+rR+dEUmta6o= diff --git a/go.toolchain.rev b/go.toolchain.rev index 9eb5f82..f446da9 100644 --- a/go.toolchain.rev +++ b/go.toolchain.rev @@ -1 +1 @@ -f86d7c8ef64a0f8a2516fc23652eee28abc8d8e0 +48d71857bf5352daaa10b61dd3e9b1c0dd51e27a