Skip to content

Commit c5e5ded

Browse files
committed
Feat: Gradle Daemon JVM criteria
Signed-off-by: imknown <imknown@qq.com>
1 parent 7f4d9ad commit c5e5ded

6 files changed

Lines changed: 29 additions & 21 deletions

File tree

.github/workflows/android-ci.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,6 @@ jobs:
1616
# https://github.com/actions/checkout
1717
- uses: actions/checkout@v6
1818

19-
# region [JDK]
20-
# https://github.com/actions/setup-java
21-
- name: Set up JDK
22-
uses: actions/setup-java@v5
23-
with:
24-
java-version: '25'
25-
distribution: 'temurin'
26-
cache: gradle
27-
# endregion [JDK]
28-
2919
# region [Android SDK]
3020
# https://github.com/android-actions/setup-android
3121
- name: Setup Android SDK

.github/workflows/dependency-submission.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@ jobs:
2525
- name: Set up Gradle
2626
uses: gradle/actions/setup-gradle@v5
2727

28-
# region [JDK]
29-
# https://github.com/actions/setup-java
30-
- name: Set up JDK
31-
uses: actions/setup-java@v5
32-
with:
33-
java-version: '25'
34-
distribution: 'temurin'
35-
cache: gradle
36-
# endregion [JDK]
37-
3828
# region [Android SDK]
3929
# https://github.com/android-actions/setup-android
4030
- name: Setup Android SDK

build-logic/convention/src/main/kotlin/net/imknown/android/forefrontinfo/android/KotlinAndroid.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import net.imknown.android.forefrontinfo.ext.buildVersion
77
import net.imknown.android.forefrontinfo.ext.libsAndroid
88
import net.imknown.android.forefrontinfo.ext.testImplementation
99
import org.gradle.api.Project
10+
import org.gradle.jvm.toolchain.JavaLanguageVersion
11+
import org.gradle.jvm.toolchain.JvmVendorSpec
1012
import org.gradle.kotlin.dsl.configure
1113
import org.gradle.kotlin.dsl.dependencies
1214
import org.jetbrains.kotlin.gradle.dsl.HasConfigurableKotlinCompilerOptions
@@ -91,7 +93,12 @@ inline fun <reified T : KotlinBaseExtension> Project.configureKotlin() = configu
9193
// https://developer.android.com/build/jdks
9294
// https://kotlinlang.org/docs/gradle-configure-project.html
9395
// https://docs.gradle.org/current/userguide/toolchains.html
94-
jvmToolchain(buildVersion("javaToolchain").toInt())
96+
jvmToolchain {
97+
val version = buildVersion("javaToolchain").toInt()
98+
languageVersion.set(JavaLanguageVersion.of(version))
99+
100+
vendor.set(JvmVendorSpec.ADOPTIUM)
101+
}
95102

96103
val compilerOptions = (this as HasConfigurableKotlinCompilerOptions<*>).compilerOptions
97104
compilerOptions.apply {

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ org.gradle.configuration-cache.integrity-check=true
3030
# org.gradle.logging.level=info
3131
org.gradle.logging.stacktrace=all
3232
org.gradle.warning.mode=all
33+
#
34+
# https://docs.gradle.org/current/userguide/toolchains.html#sub:disable_auto_provision
35+
org.gradle.java.installations.auto-download=false
3336
# endregion [Gradle]
3437
#
3538
# region [Android]
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e1118b4c7c2858d28154d086dbff010e/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/faa12903720d410b387cc69ccafb1a74/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
10+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b96cb7670c095245220e7d01d5927b58/redirect
11+
toolchainVendor=ADOPTIUM
12+
toolchainVersion=25

settings.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@ include(":app")
5959
plugins {
6060
// https://plugins.gradle.org/plugin/com.gradle.develocity
6161
id("com.gradle.develocity") version "4.3.2"
62+
63+
// https://docs.gradle.org/current/userguide/gradle_daemon.html#sec:configuring_daemon_jvm
64+
// ./gradlew -q javaToolchains
65+
// ./gradlew updateDaemonJvm --jvm-version=25 --jvm-vendor=adoptium
66+
// https://plugins.gradle.org/plugin/org.gradle.toolchains.foojay-resolver-convention
67+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
6268
}
6369

6470
develocity {

0 commit comments

Comments
 (0)