changeset 11063:6331a47d206c

8209966: Update minimum boot JDK to 11 Reviewed-by: prr, jvos
author kcr
date Tue, 25 Sep 2018 11:38:26 -0700
parents c263b8ea1909
children 22c69e868654
files build.gradle build.properties
diffstat 2 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Tue Sep 18 14:57:21 2018 -0700
+++ b/build.gradle	Tue Sep 25 11:38:26 2018 -0700
@@ -3795,10 +3795,8 @@
         ]);
 
     doLast {
-        // FIXME: remove JDK 10 logic once minimum JDK is bumped to 11
-        def isBootJdk10 = jdkVersion.startsWith("10")
         projectsToDocument.each { p ->
-            def destDir = isBootJdk10 ? "$buildDir/javadoc" : "$buildDir/javadoc/${p.ext.moduleName}"
+            def destDir = "$buildDir/javadoc/${p.ext.moduleName}"
             copy {
                 from("$p.projectDir/src/main/docs") {
                     include "**/*.html"
--- a/build.properties	Tue Sep 18 14:57:21 2018 -0700
+++ b/build.properties	Tue Sep 25 11:38:26 2018 -0700
@@ -72,5 +72,5 @@
 #
 ##############################################################################
 
-jfx.build.jdk.version.min=10
-jfx.build.jdk.buildnum.min=46
+jfx.build.jdk.version.min=11
+jfx.build.jdk.buildnum.min=28