Merge

Author: kcr

.classpath

@@ -2,7 +2,6 @@
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="src" exported="true" path="/web"/>
   <classpathentry kind="src" exported="true" path="/fxml"/>
-  <classpathentry kind="src" exported="true" path="/fxpackager"/>
   <classpathentry kind="src" exported="true" path="/swt"/>
   <classpathentry kind="src" exported="true" path="/swing"/>
   <classpathentry kind="src" exported="true" path="/media"/>

.idea/fxpackager.iml

@@ -39,7 +39,7 @@
 jfx.release.suffix=-ea
 
 # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
-jfx.release.major.version=11
+jfx.release.major.version=12
 jfx.release.minor.version=0
 jfx.release.security.version=0
 jfx.release.patch.version=0
@@ -56,8 +56,8 @@ jfx.release.patch.version=0
 
 javadoc.bottom=<small><a href="http://bugreport.java.com/bugreport/">Report a bug or suggest an enhancement</a><br> Copyright &copy; 2008, 2018, Oracle and/or its affiliates. All rights reserved.</small>
 
-javadoc.title=JavaFX 11
-javadoc.header=JavaFX&nbsp;11
+javadoc.title=JavaFX 12
+javadoc.header=JavaFX&nbsp;12
 
 ##############################################################################
 #

.idea/modules.xml

@@ -98,7 +98,6 @@ def armArchs = ["armeabi", "armeabiv-7a"]
 ANDROID = [:]
 ANDROID.compileSwing = false;
 ANDROID.compileSWT = false;
-ANDROID.compileFXPackager = false;
 ANDROID.glassPlatform = "android"
 ANDROID.armArch = armArchs[0]
 ANDROID.libDest = "lib"

.idea/rt.iml

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,7 +77,6 @@ ARMV6HF.library = { name -> return "lib${name}.so" as String }
 
 ARMV6HF.compileSwing = false;
 ARMV6HF.compileSWT = false;
-ARMV6HF.compileFXPackager = false;
 ARMV6HF.compileWebnodeNative = false;
 ARMV6HF.compileMediaNative = false;
 

build.gradle

@@ -100,7 +100,6 @@ def armArchs = ["armeabi", "armeabiv-7a"]
 ext.DALVIK = [:]
 DALVIK.compileSwing = false;
 DALVIK.compileSWT = false;
-DALVIK.compileFXPackager = false;
 DALVIK.compileDesignTime = false;
 DALVIK.glassPlatform = "android"
 DALVIK.armArch = armArchs[0]

build.properties

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@ if (!IOS.canBuild) return;
 
 IOS.compileSwing = false;
 IOS.compileSWT = false;
-IOS.compileFXPackager = false;
 
 defineProperty("USE_LIPO", "false")
 IOS.useLipo = Boolean.parseBoolean(USE_LIPO)