Skip to content

Updates for Gradle 10, 11 and configuration cache compatibility #1520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-susanh wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Updates for Gradle 10, 11 and configuration cache compatibility #1520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f71d27
Gradle plugins update for more Gradle 10 compatibility
labkey-susanh Sep 28, 2026
2e9dbdd
Removing ShowDiscrepancies incompatibility setting
labkey-susanh Sep 28, 2026
8895d42
Add commented out configuration-cache properties
labkey-susanh Sep 28, 2026
1656c07
Merge remote-tracking branch 'origin/develop' into fb_teamCityProps
labkey-susanh Sep 29, 2026
ec18d09
use new method for checking if on TeamCity or not
labkey-susanh Sep 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,6 @@ project.tasks.register("showDiscrepancies", ShowDiscrepancies) {
task ->
task.group = "Help"
task.description = "Report external dependencies that have more than one version referenced in the modules in this build"
task.notCompatibleWithConfigurationCache("Walks the project tree")
}

project.tasks.register('getModulesManifest', DefaultTask) {
Expand Down
6 changes: 5 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ org.gradle.vfs.watch=true
# This controls Gradle's build cache, which improves efficiency.
# https://docs.gradle.org/current/userguide/build_cache.html
org.gradle.caching=true
# This controls Gradle's configuration cache, which improves efficiency.
# https://docs.gradle.org/current/userguide/configuration_cache.html
#org.gradle.configuration-cache=true
#org.gradle.configuration-cache.problems=warn
# comment out or use --no-parallel to turn off parallel execution
org.gradle.parallel=true
# comment out and Gradle will attempt to determine the optimal number of executor threads to use
Expand Down Expand Up @@ -56,7 +60,7 @@ windowsProteomicsBinariesVersion=1.0
# The current version numbers for the gradle plugins.
artifactoryPluginVersion=6.0.4
gradleNodePluginVersion=7.1.0
gradlePluginsVersion=11.0.0
gradlePluginsVersion=11.1.0-teamCityProps-SNAPSHOT
owaspDependencyCheckPluginVersion=13.0.0

# Versions of node and npm to use during the build. If set, these versions
Expand Down
3 changes: 2 additions & 1 deletion server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import org.labkey.gradle.task.CreateJsDocs
import org.labkey.gradle.util.BuildUtils
import org.labkey.gradle.util.GroupNames
import org.labkey.gradle.util.PomFileHelper
import org.labkey.gradle.plugin.extension.TeamCityExtension

plugins {
id 'maven-publish'
Expand Down Expand Up @@ -193,7 +194,7 @@ project.tasks.register("reportVersionToTeamCity", DefaultTask) {
})
}

if (project.hasProperty("teamcity"))
if (TeamCityExtension.isOnTeamCity(project))
{
project.tasks.named('stageApp').configure { dependsOn(project.tasks.named('reportVersionToTeamCity')) }
}
Expand Down
Loading