(Release) Monocle jdk-12+14.

flapdoodle-oss · May 4, 2019 · 11674b1 · 11674b1
1 parent 4307f37
commit 11674b1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ low-level access.
 ## Gradle
 
 ```gradle
+testCompile "org.testfx:openjfx-monocle:jdk-12+14" // For Java 12
 testCompile "org.testfx:openjfx-monocle:jdk-11+26" // For Java 11
 testCompile "org.testfx:openjfx-monocle:jdk-9+181" // For Java 9
 testCompile "org.testfx:openjfx-monocle:8u76-b04" // For Java 8
@@ -25,7 +26,7 @@ testCompile "org.testfx:openjfx-monocle:8u76-b04" // For Java 8
 <dependency>
     <groupId>org.testfx</groupId>
     <artifactId>openjfx-monocle</artifactId>
-    <version>jdk-11+26</version> <!-- jdk-9+181 for Java 9, 8u76-b04 for Java 8 -->
+    <version>jdk-12+14</version> <!-- jdk-11+26 for Java 11, jdk-9+181 for Java 9, 8u76-b04 for Java 8 -->
     <scope>test</scope>
 </dependency>
 ```

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,19 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
     }
 
     dependencies {
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
+        classpath 'org.openjfx:javafx-plugin:0.0.7'
     }
 }
 
+apply plugin: 'org.openjfx.javafxplugin'
+
 // print welcome message.
 apply from: rootProject.file("gradle/welcome.gradle")
 
@@ -37,38 +43,21 @@ task("initSourceDirs", group: "build setup").doLast {
     for (sourceDir in sourceDirs) { sourceDir.mkdirs() }
 }
 
-ext.openjfxVersion = '11-ea+25'
-
-static def getOSName() {
-    final String osName = System.getProperty("os.name").toLowerCase()
-    if (osName.contains("linux")) {
-        return ("linux")
-    } else if (osName.contains("mac os x") || osName.contains("darwin") || osName.contains("osx")) {
-        return ("mac")
-    } else if (osName.contains("windows")) {
-        return ("win")
-    }
-    return ""
-}
-
-ext.platform = getOSName()
-
 // provide java tasks.
 apply plugin: "java"
 
 repositories {
     jcenter()
 }
 
-dependencies {
-    compile "org.openjfx:javafx-base:${openjfxVersion}:${platform}"
-    compile "org.openjfx:javafx-controls:${openjfxVersion}:${platform}"
-    compile "org.openjfx:javafx-graphics:${openjfxVersion}:${platform}"
+javafx {
+    modules = [ 'javafx.controls', 'javafx.graphics' ]
+    version = '12.0.1'
 }
 
 // java language level.
-sourceCompatibility = "10"
-targetCompatibility = "10"
+sourceCompatibility = "12"
+targetCompatibility = "12"
 
 // configure publish tasks.
 apply from: rootProject.file("gradle/publish-bintray.gradle")

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group = org.testfx
-version = jdk-11+26
+version = jdk-12+14
 
 description = Headless graphics driver for JavaFX.
 vendor = The OpenJDK Community

diff --git a/gradle/publish-bintray.gradle b/gradle/publish-bintray.gradle
@@ -34,8 +34,12 @@ publishing {
                 artifact sourceJar
                 artifact javadocJar
                 pom.withXml {
-                    asNode().children().last() + pomConfig
+                    asNode().dependencies.'*'
+                            .findAll() { it.groupId.text() == 'org.openjfx' }
+                            .each { it.remove(it.classifier) }
                     asNode().appendNode("description", pomConfig.description)
+                    asNode().children().last() + pomConfig
+
                 }
             }
         }