From 64aaeb840aa157e358eb41001c3705aa5c2fee30 Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Mon, 14 Oct 2019 15:37:12 +0000
Subject: [PATCH] 8226754: FX build fails using gradle 5.6+ or 6

Remove obsolete STABLE_PUBLISHING; explicitly set output.resourcesDir; bump minimum gradle version to 5.3

Reviewed-by: jvos
---
 build.gradle     | 2 ++
 build.properties | 2 +-
 settings.gradle  | 4 ----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 22063aa24d..a3d5f2502a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3810,6 +3810,7 @@ allprojects {
         project.jar.enabled = false
 
         // and redirect the resources into the module
+        project.sourceSets.main.output.resourcesDir = project.moduleDir
         project.processResources.destinationDir = project.moduleDir
     }
 
@@ -3843,6 +3844,7 @@ allprojects {
         project.sourceSets.shims.resources.srcDirs += project.sourceSets.main.resources.srcDirs
 
         // and redirect the resources into the module
+        project.sourceSets.shims.output.resourcesDir = project.moduleShimsDir
         project.processShimsResources.destinationDir = project.moduleShimsDir
 
        compileTestJava.dependsOn(copyGeneratedShimsTask)
diff --git a/build.properties b/build.properties
index 8e7752fca3..d86dd45929 100644
--- a/build.properties
+++ b/build.properties
@@ -85,7 +85,7 @@ jfx.build.jdk.buildnum.min=28
 # The jfx.gradle.version.min property defines the minimum version of gradle
 # that is supported. It must be <= jfx.gradle.version.
 jfx.gradle.version=5.3
-jfx.gradle.version.min=4.8
+jfx.gradle.version.min=5.3
 
 # Toolchains
 jfx.build.linux.gcc.version=gcc8.2.0-OL6.4+1.0
diff --git a/settings.gradle b/settings.gradle
index 03576dec68..e372c0e48e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -35,10 +35,6 @@ project(":web").projectDir = file("modules/javafx.web")
 project(":media").projectDir = file("modules/javafx.media")
 project(":systemTests").projectDir = file("tests/system")
 
-// Stable publishing behavior is the default in gradle 5.x.
-// This setting enables it in gradle 4.8 to help with the transition.
-enableFeaturePreview('STABLE_PUBLISHING')
-
 def closedDir = file("../rt-closed")
 def buildClosed = closedDir.isDirectory()