From d4f0ac0b58c836b61b08c4a361d5643f1929e226 Mon Sep 17 00:00:00 2001 From: Denton Gentry Date: Wed, 22 Feb 2023 16:37:27 -0800 Subject: [PATCH] go.mod: 1.36.2 and update gioui Upstream Gio fixed https://todo.sr.ht/~eliasnaur/gio/473, which we run into in https://github.com/tailscale/tailscale/issues/7255 Update to Tailscale 1.36.2. Skip over build numbers used for unstable builds. Signed-off-by: Denton Gentry --- android/build.gradle | 2 +- go.mod | 4 ++-- go.sum | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index ae00cc7..bad02f8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -26,7 +26,7 @@ android { defaultConfig { minSdkVersion 22 targetSdkVersion 31 - versionCode 152 + versionCode 154 versionName "1.36.1-t576b08e5e-g28a435b67d6" } compileOptions { diff --git a/go.mod b/go.mod index 522d790..3f29a66 100644 --- a/go.mod +++ b/go.mod @@ -4,14 +4,14 @@ go 1.19 require ( eliasnaur.com/font v0.0.0-20220124212145-832bb8fc08c3 - gioui.org v0.0.0-20230114155955-af7afea5a380 + 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-20221219190806-4fa124729667 golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91 golang.org/x/sys v0.4.0 inet.af/netaddr v0.0.0-20220617031823-097006376321 - tailscale.com v1.36.1 + tailscale.com v1.36.2 ) require ( diff --git a/go.sum b/go.sum index b89d251..412aad5 100644 --- a/go.sum +++ b/go.sum @@ -9,6 +9,8 @@ filippo.io/mkcert v1.4.3 h1:axpnmtrZMM8u5Hf4N3UXxboGemMOV+Tn+e+pkHM6E3o= gioui.org v0.0.0-20210910062418-d5d0a75a9bcb/go.mod h1:BTldRXnY5mrUrYZCdWyDwyMzyUzpfZN1cF4MMRrOt9w= gioui.org v0.0.0-20230114155955-af7afea5a380 h1:1eD20Z5i3apIOLBHW/X1SFqDC9rjYxkECjWRtkk8miw= gioui.org v0.0.0-20230114155955-af7afea5a380/go.mod h1:3lLo7xMHYnnHTrgKNNctBjEKKH3wQCO2Sn7ti5Jy8mU= +gioui.org v0.0.0-20230206180804-32c6a9b10d0b h1:ghRvtb24ItyA7QffjaG38gH5f7bzagcz0OPq3T3FyHI= +gioui.org v0.0.0-20230206180804-32c6a9b10d0b/go.mod h1:3lLo7xMHYnnHTrgKNNctBjEKKH3wQCO2Sn7ti5Jy8mU= gioui.org/cmd v0.0.0-20210925100615-41f3a7e74ee6 h1:SkAdohDhTUjl+ZtM417Xeu+uFd7SQubwR9uAyqJqC8c= gioui.org/cmd v0.0.0-20210925100615-41f3a7e74ee6/go.mod h1:qrH3h4nt/PyIqx/XabL/eJ5cXQnQ0ERHqC3VEXx/Rmg= gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ= @@ -671,3 +673,5 @@ tailscale.com v1.36.0 h1:wJXQMp6DB8Y+HHSbDuHYckmeqiqZ3dU/lWg2/MRd6uM= tailscale.com v1.36.0/go.mod h1:YIVXRZAr+Bzm3pICntGE6KjXzkQP5xOiliA8DrGW5W4= tailscale.com v1.36.1 h1:kLmV9EIcEEiONVPsCw7NJEuYENAz3IHDIrilyHOJAZM= tailscale.com v1.36.1/go.mod h1:jtamNns5Y+yuYjOCXvITnP3HemrkHs0gRc/ChTTIPq0= +tailscale.com v1.36.2 h1:tro0nLCFYekdpj2U1G4ru9s8clvpUn2cku1GarGfWds= +tailscale.com v1.36.2/go.mod h1:jtamNns5Y+yuYjOCXvITnP3HemrkHs0gRc/ChTTIPq0=