File openjfx-gradle441.patch of Package openjfx
--- a/build.gradle
+++ b/build.gradle
@@ -1772,10 +1772,7 @@ allprojects {
repositories {
ivy {
url JFX_DEPS_URL
- metadataSources {
- artifact()
- }
- patternLayout {
+ layout "pattern", {
artifact "[artifact]-[revision](-[classifier]).[ext]"
artifact "[artifact].[ext]"
}
@@ -1788,10 +1785,7 @@ allprojects {
mavenCentral()
ivy {
url "https://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/"
- metadataSources {
- artifact()
- }
- patternLayout {
+ layout "pattern", {
artifact "[artifact].[ext]"
}
}
@@ -1802,19 +1796,13 @@ allprojects {
repositories {
ivy {
url libAVRepositoryURL
- metadataSources {
- artifact()
- }
- patternLayout {
+ layout "pattern", {
artifact "[artifact].[ext]"
}
}
ivy {
url FFmpegRepositoryURL
- metadataSources {
- artifact()
- }
- patternLayout {
+ layout "pattern", {
artifact "[artifact].[ext]"
}
}
@@ -4351,7 +4339,6 @@ allprojects {
project.jar.enabled = false
// and redirect the resources into the module
- project.sourceSets.main.output.resourcesDir = project.moduleDir
project.processResources.destinationDir = project.moduleDir
}
@@ -4385,7 +4372,6 @@ 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)
--- a/build.properties
+++ b/build.properties
@@ -84,8 +84,8 @@ jfx.build.jdk.buildnum.min=46
# gradle/legal/gradle.md.
# The jfx.gradle.version.min property defines the minimum version of gradle
# that is supported. It must be <= jfx.gradle.version.
-jfx.gradle.version=6.3
-jfx.gradle.version.min=5.3
+jfx.gradle.version=5.3
+jfx.gradle.version.min=4.8
# Toolchains
jfx.build.linux.gcc.version=gcc10.2.0-OL6.4+1.0
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -61,10 +61,7 @@ repositories {
if (buildClosed) {
ivy {
url jfxRepositoryURL
- metadataSources {
- artifact()
- }
- patternLayout {
+ layout "pattern", {
artifact "[artifact]-[revision].[ext]"
artifact "[artifact].[ext]"
}