Manually specify JavaFX version

parent 435975d3
......@@ -32,10 +32,9 @@ dependencies {
// OpenJFX
if (JavaVersion.current().isJava11Compatible) {
val javafxVersion = System.getProperty("java.version") ?: JavaVersion.current().majorVersion
for (pkg in listOf("base", "controls", "fxml", "graphics"))
for (os in listOf("linux", "mac", "win"))
implementation("org.openjfx", "javafx-$pkg", javafxVersion, classifier = os)
implementation("org.openjfx", "javafx-$pkg", "12", classifier = os)
}
// Provides RichText TextAreas. Used for code input area.
......@@ -222,7 +221,7 @@ open class AspectJTask : DefaultTask() {
"inPath" to inPath.asPath,
"sourceRoots" to sources.asPath,
"classpath" to classpath.asPath,
"destDir" to destination,
"destDir" to destination.path,
"source" to "1.8",
"target" to "1.8",
"fork" to "true",
......@@ -263,7 +262,7 @@ val dokka by tasks.getting(DokkaTask::class) {
externalDocumentationLink {
if (JavaVersion.current().isJava11Compatible) {
val path = "https://openjfx.io/javadoc/${JavaVersion.current().majorVersion}/"
val path = "https://openjfx.io/javadoc/${dependencyVersion("javafx")}/"
url = url(path)
packageListUrl = url(path + "element-list")
} else
......@@ -313,4 +312,4 @@ fun DokkaTask.linkMapping(closure: LinkMapping.() -> Unit) = linkMapping(delegat
fun url(path: String) = uri(path).toURL()
fun dependencyVersion(dependencyName: String, configuration: String = "implementation") =
configurations[configuration].dependencies.find { it.name == dependencyName }!!.version!!
configurations[configuration].dependencies.find { it.name.startsWith(dependencyName) }!!.version!!
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment