From 46153f60cd66ee3a1f9cb324823634f77970c8f0 Mon Sep 17 00:00:00 2001 From: Taylor McIntyre Date: Fri, 11 Sep 2026 13:12:29 -0500 Subject: [PATCH] android: move to gradle daemon jvm Fixes tailscale/corp#48153 Signed-off-by: Taylor McIntyre --- .github/workflows/android.yml | 6 +++--- android/gradle/gradle-daemon-jvm.properties | 12 ++++++++++++ android/settings.gradle.kts | 4 ++++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 android/gradle/gradle-daemon-jvm.properties diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index e4c7d871ae..78a1d5d4db 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -20,11 +20,11 @@ jobs: - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version-file: "go.mod" - - name: Switch to Java 17 # Note: 17 is pre-installed on ubuntu-latest + - name: Switch to Java 21 uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0 with: distribution: "temurin" - java-version: "17" + java-version: "21" # Clean should essentially be a no-op, but make sure that it works. - name: Clean @@ -32,7 +32,7 @@ jobs: - name: Format check (ktfmt) run: make fmt-check - + - name: Run Go tests run: make go-test diff --git a/android/gradle/gradle-daemon-jvm.properties b/android/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000000..07addd8dad --- /dev/null +++ b/android/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,12 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cb205e54cea236622eee3d62deb2c768/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/452acd2202c1005abda962c6dae7fc5f/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cb205e54cea236622eee3d62deb2c768/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/452acd2202c1005abda962c6dae7fc5f/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/faa59212208d027d066d1bbe337c5da5/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/adf5b89d64773eff73f900e61dd2d632/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cb205e54cea236622eee3d62deb2c768/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/452acd2202c1005abda962c6dae7fc5f/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e0e37f85a97c5f2df685b37b14a25072/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ccc3884e65cd85bb71a09d2223c77229/redirect +toolchainVersion=21 diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index d9ed263897..968d73abc2 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -6,4 +6,8 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} + rootProject.name = "android" \ No newline at end of file