Simplify access to JavaToolchainService

Author: marcphilipp

junit-platform-commons/junit-platform-commons.gradle.kts

@@ -19,7 +19,7 @@ tasks.jar {
 	val release9ClassesDir = sourceSets.mainRelease9.get().output.classesDirs.singleFile
 	inputs.dir(release9ClassesDir).withPathSensitivity(PathSensitivity.RELATIVE)
 	doLast(objects.newInstance(ExecJarAction::class).apply {
-		javaLauncher.set(project.the<JavaToolchainService>().launcherFor(java.toolchain))
+		javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
 		args.addAll(
 			"--update",
 			"--file", archiveFile.get().asFile.absolutePath,

junit-platform-console/junit-platform-console.gradle.kts

@@ -39,7 +39,7 @@ tasks {
 		}
 		from(sourceSets.mainRelease9.get().output.classesDirs)
 		doLast(objects.newInstance(org.junit.gradle.java.ExecJarAction::class).apply {
-			javaLauncher.set(project.the<JavaToolchainService>().launcherFor(java.toolchain))
+			javaLauncher.set(project.javaToolchains.launcherFor(java.toolchain))
 			args.addAll(
 				"--update",
 				"--file", archiveFile.get().asFile.absolutePath,

junit-platform-jfr/junit-platform-jfr.gradle.kts

@@ -21,7 +21,7 @@ javaLibrary {
 
 tasks {
 	compileJava {
-		javaCompiler.set(project.the<JavaToolchainService>().compilerFor {
+		javaCompiler.set(project.javaToolchains.compilerFor {
 			languageVersion.set(JavaLanguageVersion.of(8))
 		})
 	}

junit-vintage-engine/junit-vintage-engine.gradle.kts

@@ -28,7 +28,7 @@ dependencies {
 
 tasks {
 	compileTestFixturesGroovy {
-		javaLauncher.set(project.the<JavaToolchainService>().launcherFor {
+		javaLauncher.set(project.javaToolchains.launcherFor {
 			// Groovy 2.x (used for Spock tests) does not support current JDKs
 			languageVersion.set(JavaLanguageVersion.of(8))
 		})

platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts

@@ -128,7 +128,7 @@ class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgume
 	val javaLauncher: Property<JavaLauncher> = project.objects.property<JavaLauncher>()
 			.value(project.provider {
 				try {
-					project.the<JavaToolchainService>().launcherFor {
+					project.javaToolchains.launcherFor {
 						languageVersion.set(JavaLanguageVersion.of(version))
 					}.get()
 				} catch (e: NoToolchainAvailableException) {