From ae2df120327384b322141d4e81152204e7e22122 Mon Sep 17 00:00:00 2001 From: Denton Gentry Date: Sat, 21 Aug 2021 21:17:48 -0700 Subject: [PATCH] Update from Tailscale OSS. Skip release 61. Signed-off-by: Denton Gentry --- android/build.gradle | 2 +- go.mod | 6 ++++-- go.sum | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 65fe542..597b32c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,7 +25,7 @@ android { defaultConfig { minSdkVersion 22 targetSdkVersion 29 - versionCode 60 + versionCode 61 versionName "1.13.53-t8bdf87883-g30324736c98" } compileOptions { diff --git a/go.mod b/go.mod index 14db671..0ff263e 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,10 @@ require ( gioui.org v0.0.0-20210821091628-c9970cb8e3aa gioui.org/cmd v0.0.0-20210727125650-ea38195e2ef3 golang.org/x/exp v0.0.0-20210722180016-6781d3edade3 - golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c + golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 + golang.org/x/tools v0.1.2 // indirect golang.zx2c4.com/wireguard v0.0.0-20210624150102-15b24b6179e0 inet.af/netaddr v0.0.0-20210721214506-ce7a8ad02cc1 - tailscale.com v1.1.1-0.20210806185611-8bdf87883298 + rsc.io/goversion v1.2.0 // indirect + tailscale.com v1.1.1-0.20210822031551-0ac213059062 ) diff --git a/go.sum b/go.sum index d768857..35a1622 100644 --- a/go.sum +++ b/go.sum @@ -832,6 +832,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo= +golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY= @@ -1008,3 +1010,5 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= tailscale.com v1.1.1-0.20210806185611-8bdf87883298 h1:/mTAsPl7g+wJ9WSqLkX96bjWH3R0i/LbMty+gqBCcEQ= tailscale.com v1.1.1-0.20210806185611-8bdf87883298/go.mod h1:OncqzHFSS0eEOuI1wdvR4clvQQUmmZdAzemWzPFBYYs= +tailscale.com v1.1.1-0.20210822031551-0ac213059062 h1:IkIbB/Er9S7e5S6gt2WdWjzYhOiB1D7qeojcRmw5Txc= +tailscale.com v1.1.1-0.20210822031551-0ac213059062/go.mod h1:WbJAb2AwrBO8jGQgxZ8E2mj3l628a3ysdPV7bJHBKlY=