Skip to content

Commit 41f214b

Browse files
renovate-botsnazy
andauthored
main: Update dependency gradle to v8.13 (#1063)
* main: Update dependency gradle to v8.13 * Adopt build-scripts to Gradle changes See https://docs.gradle.org/8.13/userguide/upgrading_version_8.html#changes_to_jvmtestsuite --------- Co-authored-by: Robert Stupp <[email protected]>
1 parent 7f9ba40 commit 41f214b

File tree

3 files changed

+9
-21
lines changed

3 files changed

+9
-21
lines changed

build-logic/src/main/kotlin/polaris-java.gradle.kts

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -100,24 +100,14 @@ testing {
100100
}
101101
)
102102
}
103-
}
104-
}
105-
}
106103

107-
// Special handling for test-suites with type `manual-test`, which are intended to be run on demand
108-
// rather than implicitly via `check`.
109-
afterEvaluate {
110-
testing {
111-
suites {
112-
withType<JvmTestSuite> {
113-
// Need to do this check in an afterEvaluate, because the `withType` above gets called
114-
// before the configure() of a registered test suite runs.
115-
if (testType.get() != "manual-test") {
116-
targets.all {
117-
if (testTask.name != "test") {
118-
testTask.configure { shouldRunAfter("test") }
119-
tasks.named("check").configure { dependsOn(testTask) }
120-
}
104+
// Special handling for test-suites with names containing `manualtest`, which are intended to
105+
// be run on demand rather than implicitly via `check`.
106+
if (!name.lowercase().contains("manualtest")) {
107+
targets.all {
108+
if (testTask.name != "test") {
109+
testTask.configure { shouldRunAfter("test") }
110+
tasks.named("check").configure { dependsOn(testTask) }
121111
}
122112
}
123113
}

build-logic/src/main/kotlin/polaris-quarkus.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* under the License.
1818
*/
1919

20-
import org.gradle.api.attributes.TestSuiteType
2120
import org.gradle.api.plugins.jvm.JvmTestSuite
2221
import org.gradle.kotlin.dsl.register
2322
import org.gradle.kotlin.dsl.withType
@@ -41,7 +40,6 @@ testing {
4140
}
4241
}
4342
register<JvmTestSuite>("intTest") {
44-
testType = TestSuiteType.INTEGRATION_TEST
4543
targets.all {
4644
tasks.named("compileIntTestJava").configure {
4745
dependsOn(tasks.named("compileQuarkusTestGeneratedSourcesJava"))

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
distributionBase=GRADLE_USER_HOME
2121
distributionPath=wrapper/dists
2222
# See https://gradle.org/release-checksums/ for valid checksums
23-
distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
24-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
23+
distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
24+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
2525
networkTimeout=10000
2626
validateDistributionUrl=true
2727
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)