archive
/
tailscale-android
mirror of https://github.com/tailscale/tailscale-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

android: fix versioning and bump oss (#490)

Browse Source 
* android: update docker image names for go 1.23

updates #cleanup

We need to regenerate the docker images, we'll
denote the new ones with a go1.23 extension.

This also sets the TS_USE_TOOLCHAIN flag so
we're using the corp toolchain which fixes some
versioning script issues.

Signed-off-by: Jonathan Nobels <jonathan@tailscale.com>

* android: bumping OSS

OSS and Version updated to 1.73.104-te7b5e8c8c-g161457b99b5

Signed-off-by: Jonathan Nobels <jonathan@tailscale.com>

---------

Signed-off-by: Jonathan Nobels <jonathan@tailscale.com>
pull/491/head
Jonathan Nobels 2 months ago committed by GitHub
parent fb8a4f51dc
commit ab7ab73736
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File

3
Makefile
Unescape Escape View File

@ -8,7 +8,8 @@
# The docker image to use for the build environment. Changing this # The docker image to use for the build environment. Changing this
# will force a rebuild of the docker image. If there is an existing image # will force a rebuild of the docker image. If there is an existing image
# with this name, it will be used. # with this name, it will be used.
DOCKER_IMAGE=tailscale-android-build-amd64 DOCKER_IMAGE=tailscale-android-build-amd64-go1.23
export TS_USE_TOOLCHAIN=1
DEBUG_APK=tailscale-debug.apk DEBUG_APK=tailscale-debug.apk
RELEASE_AAB=tailscale-release.aab RELEASE_AAB=tailscale-release.aab

2
android/build.gradle
Unescape Escape View File

@ -38,7 +38,7 @@ android {
minSdkVersion 26 minSdkVersion 26
targetSdkVersion 34 targetSdkVersion 34
versionCode 241 versionCode 241
versionName "1.73.73-t959285e0c-ge437c2d917e" versionName "1.73.104-te7b5e8c8c-g161457b99b5"
} }
compileOptions { compileOptions {

8
go.mod
Unescape Escape View File

@ -1,14 +1,12 @@
module github.com/tailscale/tailscale-android module github.com/tailscale/tailscale-android
go 1.23 go 1.23.0
toolchain go1.23.0
require ( require (
github.com/tailscale/wireguard-go v0.0.0-20240731203015-71393c576b98 github.com/tailscale/wireguard-go v0.0.0-20240905161824-799c1978fafc
golang.org/x/mobile v0.0.0-20240806205939-81131f6468ab golang.org/x/mobile v0.0.0-20240806205939-81131f6468ab
inet.af/netaddr v0.0.0-20220617031823-097006376321 inet.af/netaddr v0.0.0-20220617031823-097006376321
tailscale.com v1.73.0-pre.0.20240829222721-959285e0c540 tailscale.com v1.73.0-pre.0.20240905180038-e7b5e8c8cd9f
) )
require ( require (

8
go.sum
Unescape Escape View File

@ -156,8 +156,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/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 h1:tdUdyPqJ0C97SJfjB9tW6EylTtreyee9C44de+UBG0g=
github.com/tailscale/web-client-prebuilt v0.0.0-20240226180453-5db17b287bf1/go.mod h1:agQPE6y6ldqCOui2gkIh7ZMztTkIQKH049tv8siLuNQ= github.com/tailscale/web-client-prebuilt v0.0.0-20240226180453-5db17b287bf1/go.mod h1:agQPE6y6ldqCOui2gkIh7ZMztTkIQKH049tv8siLuNQ=
github.com/tailscale/wireguard-go v0.0.0-20240731203015-71393c576b98 h1:RNpJrXfI5u6e+uzyIzvmnXbhmhdRkVf//90sMBH3lso= github.com/tailscale/wireguard-go v0.0.0-20240905161824-799c1978fafc h1:cezaQN9pvKVaw56Ma5qr/G646uKIYP0yQf+OyWN/okc=
github.com/tailscale/wireguard-go v0.0.0-20240731203015-71393c576b98/go.mod h1:BOm5fXUBFM+m9woLNBoxI9TaBXXhGNP50LX/TGIvGb4= github.com/tailscale/wireguard-go v0.0.0-20240905161824-799c1978fafc/go.mod h1:BOm5fXUBFM+m9woLNBoxI9TaBXXhGNP50LX/TGIvGb4=
github.com/tailscale/xnet v0.0.0-20240729143630-8497ac4dab2e h1:zOGKqN5D5hHhiYUp091JqK7DPCqSARyUfduhGUY8Bek= github.com/tailscale/xnet v0.0.0-20240729143630-8497ac4dab2e h1:zOGKqN5D5hHhiYUp091JqK7DPCqSARyUfduhGUY8Bek=
github.com/tailscale/xnet v0.0.0-20240729143630-8497ac4dab2e/go.mod h1:orPd6JZXXRyuDusYilywte7k094d7dycXXU5YnWsrwg= github.com/tailscale/xnet v0.0.0-20240729143630-8497ac4dab2e/go.mod h1:orPd6JZXXRyuDusYilywte7k094d7dycXXU5YnWsrwg=
github.com/tc-hib/winres v0.2.1 h1:YDE0FiP0VmtRaDn7+aaChp1KiF4owBiJa5l964l5ujA= github.com/tc-hib/winres v0.2.1 h1:YDE0FiP0VmtRaDn7+aaChp1KiF4owBiJa5l964l5ujA=
@ -256,5 +256,5 @@ inet.af/netaddr v0.0.0-20220617031823-097006376321 h1:B4dC8ySKTQXasnjDTMsoCMf1sQ
inet.af/netaddr v0.0.0-20220617031823-097006376321/go.mod h1:OIezDfdzOgFhuw4HuWapWq2e9l0H9tK4F1j+ETRtF3k= inet.af/netaddr v0.0.0-20220617031823-097006376321/go.mod h1:OIezDfdzOgFhuw4HuWapWq2e9l0H9tK4F1j+ETRtF3k=
software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k= 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= software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI=
tailscale.com v1.73.0-pre.0.20240829222721-959285e0c540 h1:nike4kuThT/9ehqnIkGlx3zWeRyx1aJe3E7iUyed0ng= tailscale.com v1.73.0-pre.0.20240905180038-e7b5e8c8cd9f h1:6nKO3Qt1da0I2XiK06I7cI4SYY4iSKxGHRFWoqB7YCA=
tailscale.com v1.73.0-pre.0.20240829222721-959285e0c540/go.mod h1:PdTJH9Hv0Bn2PguIZh1vfqiKmcRgp6MoE2PnxET1B3E= tailscale.com v1.73.0-pre.0.20240905180038-e7b5e8c8cd9f/go.mod h1:8e0mb1njzhKGS7DXY1q0PhVGrlFjZYW+eNQkC6Mb2BE=

3
version/tailscale-version.sh
Unescape Escape View File

@ -9,6 +9,9 @@
set -euo pipefail set -euo pipefail
# use the go toolchain from the tailscale.com
export TS_USE_TOOLCHAIN=1
go_list=$(go list -m tailscale.com) go_list=$(go list -m tailscale.com)
# go list outputs `tailscale.com <version>`. Extract the version. # go list outputs `tailscale.com <version>`. Extract the version.
mod_version=${go_list#tailscale.com} mod_version=${go_list#tailscale.com}

Write Preview
Loading…
Cancel
Save