Skip to content

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

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 4 commits into
base: develop
Choose a base branch
from
Open

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

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a89b90d
Use new TeamCityExtension.isOnTeamCity method
labkey-susanh Sep 28, 2026
7673445
Merge remote-tracking branch 'origin/develop' into fb_teamCityProps
labkey-susanh Sep 29, 2026
3aa923f
Merge remote-tracking branch 'origin/develop' into fb_teamCityProps
labkey-susanh Sep 29, 2026
3894809
Merge remote-tracking branch 'origin/develop' into fb_teamCityProps
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
5 changes: 3 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import org.labkey.gradle.task.RunUiTest
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

project.group = "org.labkey.api"
def apiArtifactName = "labkey-api-selenium"
Expand Down Expand Up @@ -67,7 +68,7 @@ project.dependencies {
uiTestRuntimeOnly "org.aspectj:aspectjrt:${aspectjVersion}"

if (!project.hasProperty('testWithLocalApi') && // Use this property temporarily when upgrading XMLBeans or changing dependencies provided by API
(project.hasProperty("teamcity") || project.findProject(BuildUtils.getApiProjectPath(project.gradle)) == null)) {
(TeamCityExtension.isOnTeamCity(project) || project.findProject(BuildUtils.getApiProjectPath(project.gradle)) == null)) {
// LabKey XML schemas are used to decode exported folder XMLs and test case XMLs
// Don't include local version so that running tests doesn't require building API module
implementation("org.labkey.api:api:${labkeySchemasTestVersion}") { transitive = false }
Expand Down Expand Up @@ -96,7 +97,7 @@ if (project.findProject(":remoteapi:labkey-api-jdbc") != null)
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":remoteapi:labkey-api-jdbc")
}

if (project.hasProperty("teamcity"))
if (TeamCityExtension.isOnTeamCity(project))
{
apply plugin: 'org.labkey.build.teamCity'
}
Expand Down
Loading