diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ce36f5710107..e9bbda2cdaa1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -104,5 +104,5 @@ jreleaser = { id = "org.jreleaser", version = "1.19.0" } kotlin = { id = "org.jetbrains.kotlin.jvm", version = "2.2.0" } nullaway = { id = "net.ltgt.nullaway", version = "2.2.0" } plantuml = { id = "io.freefair.plantuml", version = "8.14" } -shadow = { id = "com.gradleup.shadow", version = "8.3.8" } +shadow = { id = "com.gradleup.shadow", version = "9.0.0-rc1" } spotless = { id = "com.diffplug.spotless", version = "7.1.0" } diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts index 6962f80c3ca3..237a7e87f968 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts @@ -39,6 +39,9 @@ tasks { exclude("META-INF/maven/**") excludes.remove("module-info.class") archiveClassifier = "" + from(sourceSets.main.get().output.classesDirs) { + include("module-info.class") + } } jar { dependsOn(shadowJar) diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts index 2ba0f59d1152..91982c4896ba 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts @@ -200,7 +200,7 @@ dependencies { testImplementation(dependencyFromLibs("testingAnnotations")) testImplementation(project(":junit-jupiter")) - testRuntimeOnly(project(":junit-platform-engine")) + testRuntimeOnly(project(":junit-platform-launcher")) testRuntimeOnly(project(":junit-platform-reporting")) testRuntimeOnly(bundleFromLibs("log4j")) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55baabb..8bdaf60c75ab 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 78cb6e16a49f..a78b3dff983b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionSha256Sum=19ce31d8a4f2e59a99931cc13834c70c0e502804851c0640f31a1af9a7d5b003 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a936707..ef07e0162b18 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java index 846a41c6adf9..249675770f47 100644 --- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java +++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java @@ -18,7 +18,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import org.junit.platform.reporting.testutil.FileUtils; import org.junit.platform.tests.process.OutputFiles; import org.opentest4j.TestAbortedException; @@ -41,11 +40,8 @@ void gradle_wrapper(@TempDir Path workspace, @FilePrefix("gradle") OutputFiles o .redirectOutput(outputFiles).startAndWait(); assertEquals(1, result.exitCode()); - assertThat(result.stdErrLines()) // - .contains("FAILURE: Build failed with an exception."); - - var htmlFile = FileUtils.findPath(workspace, "glob:**/build/reports/tests/test/classes/*.html"); - assertThat(htmlFile).content() // + assertThat(result.stdErr()) // + .contains("FAILURE: Build failed with an exception.") // .contains("Cannot create Launcher without at least one TestEngine"); } }