Skip to content

Commit 414e1ea

Browse files
committed
Gradle 8.13. Enable daemon toolchain auto-provisioning.
1 parent c8fda31 commit 414e1ea

File tree

7 files changed

+13
-16
lines changed

7 files changed

+13
-16
lines changed

build-logic/build.gradle.kts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@ plugins {
77
alias(libs.plugins.detekt)
88
}
99

10-
kotlin {
11-
jvmToolchain {
12-
languageVersion.set(JavaLanguageVersion.of(23))
13-
vendor.set(JvmVendorSpec.AZUL)
14-
}
15-
}
16-
1710
tasks.withType<KotlinCompile>().configureEach {
1811
compilerOptions {
1912
jvmTarget.set(JvmTarget.JVM_11)

build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import org.gradle.accessors.dm.LibrariesForLibs
1111
import org.gradle.api.Plugin
1212
import org.gradle.api.Project
1313
import org.gradle.api.tasks.testing.Test
14-
import org.gradle.jvm.toolchain.JavaLanguageVersion
15-
import org.gradle.jvm.toolchain.JvmVendorSpec
1614
import org.gradle.kotlin.dsl.configure
1715
import org.gradle.kotlin.dsl.creating
1816
import org.gradle.kotlin.dsl.getValue
@@ -123,10 +121,6 @@ private fun KotlinMultiplatformExtension.configureTargets(project: Project) {
123121
}
124122
}
125123
}
126-
jvmToolchain {
127-
languageVersion.set(JavaLanguageVersion.of(23))
128-
vendor.set(JvmVendorSpec.AZUL)
129-
}
130124
project.tasks.withType<KotlinJvmCompile>().configureEach {
131125
compilerOptions {
132126
jvmTarget.set(JvmTarget.JVM_11)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
11
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4492b83eb925a18914319ce444a64c2c/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/da7291ce1013cb02b2e7a7a99ecdda4a/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4492b83eb925a18914319ce444a64c2c/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/da7291ce1013cb02b2e7a7a99ecdda4a/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5405a8a1fda39173306085b034fae12/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/7cf39a6d24d385813a5661630f974d51/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4492b83eb925a18914319ce444a64c2c/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/da7291ce1013cb02b2e7a7a99ecdda4a/redirect
10+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/32cc98ecfdb44230e9385eb46a0da918/redirect
11+
toolchainVendor=AZUL
212
toolchainVersion=23

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
kotlin = "2.1.0"
33
dokka = "2.0.0"
44
binaryCompabilityValidator = "0.17.0"
5-
toolchainsResolver = "0.8.0"
5+
toolchainsResolver = "0.9.0"
66
detekt = "1.23.7"
77
mavenPublish = "0.30.0"
88
coroutines = "1.10.1"

gradle/wrapper/gradle-wrapper.jar

122 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ fi
205205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206206

207207
# Collect all arguments for the java command:
208-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209209
# and any embedded shellness will be escaped.
210210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211211
# treated as '${Hostname}' itself on the command line.

0 commit comments

Comments
 (0)