From 8d16a66e36902fabee2845c78d0f4cddea4df7e4 Mon Sep 17 00:00:00 2001 From: Roman Elizarov Date: Thu, 5 Nov 2020 16:42:22 +0300 Subject: [PATCH 1/2] Remove platform-specific dependencies on JavaFx artifacts Fixes #2360 --- ui/kotlinx-coroutines-javafx/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/kotlinx-coroutines-javafx/build.gradle.kts b/ui/kotlinx-coroutines-javafx/build.gradle.kts index 112441e0ed..2571666a9c 100644 --- a/ui/kotlinx-coroutines-javafx/build.gradle.kts +++ b/ui/kotlinx-coroutines-javafx/build.gradle.kts @@ -3,13 +3,13 @@ */ plugins { - id("org.openjfx.javafxplugin") + id("org.openjfx.javafxplugin") version "0.0.9" } javafx { version = version("javafx") modules = listOf("javafx.controls") - configuration = "compile" + configuration = "compileOnly" } val JDK_18: String? by lazy { From d188147b58762e9e7978d5d997cfd9283a3f949f Mon Sep 17 00:00:00 2001 From: Roman Elizarov Date: Fri, 6 Nov 2020 11:40:23 +0300 Subject: [PATCH 2/2] ~ fixed test deps --- ui/kotlinx-coroutines-javafx/build.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ui/kotlinx-coroutines-javafx/build.gradle.kts b/ui/kotlinx-coroutines-javafx/build.gradle.kts index 2571666a9c..e850e3940e 100644 --- a/ui/kotlinx-coroutines-javafx/build.gradle.kts +++ b/ui/kotlinx-coroutines-javafx/build.gradle.kts @@ -12,6 +12,13 @@ javafx { configuration = "compileOnly" } +sourceSets { + test.configure { + compileClasspath += configurations.compileOnly + runtimeClasspath += configurations.compileOnly + } +} + val JDK_18: String? by lazy { System.getenv("JDK_18") }