From a92f4d9fb59ade73b54a952a648e2a5da06ef8ed Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 21 Jun 2018 15:32:59 +0100
Subject: [PATCH 3/4] Allow build to work on newer gradles

---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index aa761841..05ea62f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1239,6 +1239,8 @@ project(":base") {
         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 = [
@@ -1307,6 +1309,8 @@ project(":graphics") {
         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");
-- 
2.17.1