From 813b770cdf770b019f21a5b161ae4bca7075c161 Mon Sep 17 00:00:00 2001 From: Denton Gentry Date: Sat, 11 Feb 2023 16:23:16 -0800 Subject: [PATCH] go.mod: update Gio, finish Go 1.20 support Upstream Gio fixed https://todo.sr.ht/~eliasnaur/gio/473, which we run into in https://github.com/tailscale/tailscale/issues/7255 https://github.com/tailscale/tailscale has moved to Go 1.20 - update go.mod to go 1.20 - go mod tidy -compat=1.20 - update go4.org/unsafe/assume-no-moving-gc Skip over the build numbers used for 1.36.x Fixes https://github.com/tailscale/tailscale/issues/7255 Signed-off-by: Denton Gentry --- Makefile | 2 +- android/build.gradle | 2 +- go.mod | 6 +++--- go.sum | 7 ++++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 91ec86f..d94335c 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ tag_release: bumposs: toolchain GOPROXY=direct go get tailscale.com@main - go mod tidy -compat=1.19 + go mod tidy -compat=1.20 toolchain: ifneq ($(TOOLCHAINWANT),$(TOOLCHAINSUM)) diff --git a/android/build.gradle b/android/build.gradle index 430d586..67bc342 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -26,7 +26,7 @@ android { defaultConfig { minSdkVersion 22 targetSdkVersion 31 - versionCode 151 + versionCode 153 versionName "1.35.165-t2df38b1fe-gf643488f7a1" } compileOptions { diff --git a/go.mod b/go.mod index f6b27c9..f76e9ac 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ module github.com/tailscale/tailscale-android -go 1.19 +go 1.20 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 @@ -57,7 +57,7 @@ require ( go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect go4.org/mem v0.0.0-20210711025021-927187094b94 // indirect go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf // indirect - go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect + go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760 // indirect golang.org/x/crypto v0.3.0 // indirect golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect golang.org/x/image v0.0.0-20220722155232-062f8c9fd539 // indirect diff --git a/go.sum b/go.sum index 21977b0..6a85bb1 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmG filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= 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= @@ -447,8 +447,9 @@ go4.org/mem v0.0.0-20210711025021-927187094b94/go.mod h1:reUoABIJ9ikfM5sgtSF3Wus go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf h1:IdwJUzqoIo5lkr2EOyKoe5qipUaEjbOKKY5+fzPBZ3A= go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf/go.mod h1:+QXzaoURFd0rGDIjDNpyIkv+F9R7EmeKorvlKRnhqgA= go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4= go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= +go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760 h1:gH0IO5GDYAcawu+ThKrvAofVTgJjYaoOZ5rrC4pS2Xw= +go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=