From 54decbe937ddcb0e3a8922babdc5f1d805fd42c0 Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Wed, 12 Jul 2023 14:59:51 +0200 Subject: Set the correct testLauncher property in workflows (#3064) --- build-logic/src/main/kotlin/org/jetbrains/DokkaBuildProperties.kt | 2 +- .../src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'build-logic') diff --git a/build-logic/src/main/kotlin/org/jetbrains/DokkaBuildProperties.kt b/build-logic/src/main/kotlin/org/jetbrains/DokkaBuildProperties.kt index 57e20acd..84eb626e 100644 --- a/build-logic/src/main/kotlin/org/jetbrains/DokkaBuildProperties.kt +++ b/build-logic/src/main/kotlin/org/jetbrains/DokkaBuildProperties.kt @@ -12,7 +12,7 @@ import javax.inject.Inject * This is an extension created by the [org.jetbrains.conventions.Base_gradle] convention plugin. * * Default values are set in the root `gradle.properties`, and can be overridden via - * [CLI args, system properties, and environment variables](https://docs.gradle.org/current/userguide/build_environment.html#sec:project_properties) + * [project properties](https://docs.gradle.org/current/userguide/build_environment.html#sec:project_properties) */ abstract class DokkaBuildProperties @Inject constructor( private val providers: ProviderFactory, diff --git a/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts index c5b90e81..a4ed0ede 100644 --- a/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts +++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts @@ -27,7 +27,6 @@ tasks.withType().configureEach { } else { (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1 } - javaLauncher.set(javaToolchains.launcherFor { languageVersion.set(dokkaBuild.testJavaLauncherVersion) }) -- cgit