Skip to content

Commit 64aaeb8

Browse files
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
1 parent 63fe66c commit 64aaeb8

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -3810,6 +3810,7 @@ allprojects {
38103810
project.jar.enabled = false
38113811

38123812
// and redirect the resources into the module
3813+
project.sourceSets.main.output.resourcesDir = project.moduleDir
38133814
project.processResources.destinationDir = project.moduleDir
38143815
}
38153816

@@ -3843,6 +3844,7 @@ allprojects {
38433844
project.sourceSets.shims.resources.srcDirs += project.sourceSets.main.resources.srcDirs
38443845

38453846
// and redirect the resources into the module
3847+
project.sourceSets.shims.output.resourcesDir = project.moduleShimsDir
38463848
project.processShimsResources.destinationDir = project.moduleShimsDir
38473849

38483850
compileTestJava.dependsOn(copyGeneratedShimsTask)

build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jfx.build.jdk.buildnum.min=28
8585
# The jfx.gradle.version.min property defines the minimum version of gradle
8686
# that is supported. It must be <= jfx.gradle.version.
8787
jfx.gradle.version=5.3
88-
jfx.gradle.version.min=4.8
88+
jfx.gradle.version.min=5.3
8989

9090
# Toolchains
9191
jfx.build.linux.gcc.version=gcc8.2.0-OL6.4+1.0

settings.gradle

-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ project(":web").projectDir = file("modules/javafx.web")
3535
project(":media").projectDir = file("modules/javafx.media")
3636
project(":systemTests").projectDir = file("tests/system")
3737

38-
// Stable publishing behavior is the default in gradle 5.x.
39-
// This setting enables it in gradle 4.8 to help with the transition.
40-
enableFeaturePreview('STABLE_PUBLISHING')
41-
4238
def closedDir = file("../rt-closed")
4339
def buildClosed = closedDir.isDirectory()
4440

0 commit comments

Comments
 (0)