Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 7 additions & 17 deletions build-logic/src/main/kotlin/polaris-java.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -100,24 +100,14 @@ testing {
}
)
}
}
}
}

// Special handling for test-suites with type `manual-test`, which are intended to be run on demand
// rather than implicitly via `check`.
afterEvaluate {
testing {
suites {
withType<JvmTestSuite> {
// Need to do this check in an afterEvaluate, because the `withType` above gets called
// before the configure() of a registered test suite runs.
if (testType.get() != "manual-test") {
targets.all {
if (testTask.name != "test") {
testTask.configure { shouldRunAfter("test") }
tasks.named("check").configure { dependsOn(testTask) }
}
// Special handling for test-suites with names containing `manualtest`, which are intended to
// be run on demand rather than implicitly via `check`.
if (!name.lowercase().contains("manualtest")) {
targets.all {
if (testTask.name != "test") {
testTask.configure { shouldRunAfter("test") }
tasks.named("check").configure { dependsOn(testTask) }
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions build-logic/src/main/kotlin/polaris-quarkus.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* under the License.
*/

import org.gradle.api.attributes.TestSuiteType
import org.gradle.api.plugins.jvm.JvmTestSuite
import org.gradle.kotlin.dsl.register
import org.gradle.kotlin.dsl.withType
Expand All @@ -41,7 +40,6 @@ testing {
}
}
register<JvmTestSuite>("intTest") {
testType = TestSuiteType.INTEGRATION_TEST
targets.all {
tasks.named("compileIntTestJava").configure {
dependsOn(tasks.named("compileQuarkusTestGeneratedSourcesJava"))
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
# See https://gradle.org/release-checksums/ for valid checksums
distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down