Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8240539: Upgrade gradle to version 6.3
8232063: Upgrade gradle to version 6.0
8226754: FX build fails using gradle 5.6+ or 6

Reviewed-by: kcr
Backport-of: 9ecc107
  • Loading branch information
arapte committed May 10, 2021
1 parent fdd0fa0 commit 6ff7384
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 14 deletions.
22 changes: 18 additions & 4 deletions build.gradle
Expand Up @@ -1767,7 +1767,10 @@ allprojects {
repositories {
ivy {
url JFX_DEPS_URL
layout "pattern", {
metadataSources {
artifact()
}
patternLayout {
artifact "[artifact]-[revision](-[classifier]).[ext]"
artifact "[artifact].[ext]"
}
Expand All @@ -1780,7 +1783,10 @@ allprojects {
mavenCentral()
ivy {
url "https://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/"
layout "pattern", {
metadataSources {
artifact()
}
patternLayout {
artifact "[artifact].[ext]"
}
}
Expand All @@ -1791,13 +1797,19 @@ allprojects {
repositories {
ivy {
url libAVRepositoryURL
layout "pattern", {
metadataSources {
artifact()
}
patternLayout {
artifact "[artifact].[ext]"
}
}
ivy {
url FFmpegRepositoryURL
layout "pattern", {
metadataSources {
artifact()
}
patternLayout {
artifact "[artifact].[ext]"
}
}
Expand Down Expand Up @@ -4334,6 +4346,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
}

Expand Down Expand Up @@ -4367,6 +4380,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)
Expand Down
4 changes: 2 additions & 2 deletions build.properties
Expand Up @@ -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=5.3
jfx.gradle.version.min=4.8
jfx.gradle.version=6.3
jfx.gradle.version.min=5.3

# Toolchains
jfx.build.linux.gcc.version=gcc10.2.0-OL6.4+1.0
Expand Down
7 changes: 5 additions & 2 deletions buildSrc/build.gradle
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -60,7 +60,10 @@ repositories {
if (buildClosed) {
ivy {
url jfxRepositoryURL
layout "pattern", {
metadataSources {
artifact()
}
patternLayout {
artifact "[artifact]-[revision].[ext]"
artifact "[artifact].[ext]"
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/legal/gradle.md
@@ -1,4 +1,4 @@
## Gradle v5.3
## Gradle v6.3

### Apache 2.0 License
<pre>
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 0 additions & 4 deletions settings.gradle
Expand Up @@ -37,10 +37,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()

Expand Down

1 comment on commit 6ff7384

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.