Skip to content

Commit bfdb10e

Browse files
authored
Merge pull request #25 from EngineHub/ot/feature/gradle-9.7.0
Update to Gradle 9.7.0, enable Isolated Projects
2 parents 1998c5b + 6c36e1c commit bfdb10e

4 files changed

Lines changed: 9 additions & 2 deletions

File tree

.teamcity/_Self/LinBus.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ fun BuildSteps.configuredGradle(init: GradleBuildStep.() -> Unit) {
1313
enableStacktrace = true
1414

1515
init()
16+
17+
// Revert when TeamCity is updated to 2026.2 (https://youtrack.jetbrains.com/issue/TW-98463)
18+
gradleParams = "-Dorg.gradle.isolated-projects=false ${gradleParams ?: ""}".trim()
1619
}
1720
}
1821

format-snbt/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
publishing {
2121
publications {
2222
create<MavenPublication>("maven") {
23-
groupId = "${rootProject.group}.format"
23+
groupId = "${providers.gradleProperty("group").get()}.format"
2424
artifactId = "lin-bus-format-snbt"
2525
from(components["java"])
2626
}

gradle.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
group=org.enginehub.lin-bus
22
version=0.3.0-SNAPSHOT
33

4+
# Necessary because TeamCity is incompatible with Isolated Projects so we
5+
# disable it generally. But we want to keep Configuration Cache enabled when
6+
# that happens.
47
org.gradle.configuration-cache=true
8+
org.gradle.isolated-projects=true

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
44
networkTimeout=10000
55
retries=0
66
retryBackOffMs=500

0 commit comments

Comments
 (0)