--- rt-8u152-b05/build.gradle	2017-06-16 01:18:26.000000000 +0200
+++ rt-8u152-b05-patched/build.gradle	2018-11-07 13:50:50.414052105 +0100
@@ -1239,6 +1239,8 @@
         compile BUILD_SRC
     }
 
+    project.sourceSets.main.output.classesDir = new File(project.buildDir, "classes/main")
+
     // We need to take the VersionInfo.java file and replace the various
     // properties within it
     def replacements = [
@@ -1299,7 +1301,7 @@
 
     dependencies {
         compile project(":base"), BUILD_SRC
-        compile name: SWT_FILE_NAME
+        compile group: "org.eclipse.swt", name: "swt", version: "3.108.0"
         stubCompile group: "junit", name: "junit", version: "4.8.2",
         project(":base").sourceSets.test.output, sourceSets.main.output
         antlr3 group: "org.antlr", name: "antlr", version: "3.1.3"
@@ -1307,6 +1309,8 @@
         antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2"
     }
 
+    project.sourceSets.main.output.classesDir = new File(project.buildDir, "classes/main")
+
     // Create a single "native" task which will depend on all the individual native tasks for graphics
     project.ext.nativeAllTask = task("native", group: "Build", description: "Compiles and Builds all native libraries for Graphics");
     project.ext.cleanNativeAllTask = task("cleanNative", group: "Build", description: "Clean all native libraries and objects for Graphics");
@@ -1620,6 +1624,8 @@
         testCompile project(":graphics").sourceSets.test.output
         testCompile project(":base").sourceSets.test.output
     }
+    
+    project.sourceSets.main.output.classesDir = new File(project.buildDir, "classes/main")
 
     test {
         def cssDir = file("$buildDir/classes/main/javafx")
@@ -1658,6 +1664,7 @@
     dependencies {
         compile BUILD_SRC, project(":base"), project(":graphics")
     }
+    project.sourceSets.main.output.classesDir = new File(project.buildDir, "classes/main")
 }
 
 project(":swing") {
@@ -1672,6 +1679,7 @@
     test {
         enabled = IS_FULL_TEST && IS_AWT_TEST
     }
+    project.sourceSets.main.output.classesDir = new File(project.buildDir, "classes/main")
 }
 
 project(":swt") {
@@ -1680,8 +1688,9 @@
     }
     dependencies {
         compile BUILD_SRC, project(":base"), project(":graphics")
-        compile name: SWT_FILE_NAME
+        compile group: "org.eclipse.swt", name: "swt", version: "3.108.0"
     }
+    project.sourceSets.main.output.classesDir = new File(project.buildDir, "classes/main")
 }
 
 project(":fxml") {
@@ -1697,6 +1706,7 @@
         jvmArgs "-Djavafx.toolkit=com.sun.javafx.pgstub.StubToolkit"
         classpath += files("$JDK_HOME/jre/lib/ext/nashorn.jar")
     }
+    project.sourceSets.main.output.classesDir = new File(project.buildDir, "classes/main")
 }
 
 project(":builders") {
@@ -1716,6 +1726,7 @@
         // we have to use the stub toolkit for now.
         jvmArgs "-Djavafx.toolkit=com.sun.javafx.pgstub.StubToolkit"
     }
+    project.sourceSets.main.output.classesDir = new File(project.buildDir, "classes/main")
 }
 
 project(":jmx") {
@@ -1781,6 +1792,8 @@
     dependencies {
         compile group: "org.apache.ant", name: "ant", version: "1.8.2"
     }
+    
+    project.sourceSets.main.output.classesDir = new File(project.buildDir, "classes/main")
 
     // When producing the jar, we need to relocate a few class files
     // from their normal location to a resources/classes or resources/web-files
@@ -2147,6 +2160,8 @@
     dependencies {
         compile BUILD_SRC, project(":base"), project(":graphics")
     }
+    
+    project.sourceSets.main.output.classesDir = new File(project.buildDir, "classes/main")
 
     sourceSets {
         tools {
@@ -2447,6 +2462,8 @@
     dependencies {
         compile project(":base"), project(":graphics"), project(":controls"), project(":media")
     }
+    
+    project.sourceSets.main.output.classesDir = new File(project.buildDir, "classes/main")
 
     task webArchiveJar(type: Jar) {
         from (project.file("$projectDir/src/test/resources/test/html")) {