Skip to content
Merged
1 change: 0 additions & 1 deletion build.gradle
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
8 changes: 7 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
#moduleSet=all
#ideaIncludeAllModules=true
# Uncomment the following line to cause client libraries in the clientAPIs directory to be built before any modules that depend on them
#runClientLibBuilds
# This controls Gradle's file system watching, which improves efficiency of incremental builds
# https://docs.gradle.org/current/userguide/file_system_watching.html
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 +62,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
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
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