diff --git a/build.gradle.kts b/build.gradle.kts index b3d340918d1b..0aa286988901 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,35 +35,35 @@ val buildRevision: String by extra { versioning.info.commit } val builtByValue by extra { project.findProperty("builtBy") ?: project.property("defaultBuiltBy") } val platformProjects by extra(listOf( - projects.platform.commons, - projects.platform.console, - projects.platform.`console-standalone`, - projects.platform.engine, - projects.platform.jfr, - projects.platform.launcher, - projects.platform.reporting, - projects.platform.runner, - projects.platform.suite.aggregator, - projects.platform.suite.api, - projects.platform.suite.commons, - projects.platform.suite.engine, - projects.platform.testkit -)) + projects.junitPlatformCommons, + projects.junitPlatformConsole, + projects.junitPlatformConsoleStandalone, + projects.junitPlatformEngine, + projects.junitPlatformJfr, + projects.junitPlatformLauncher, + projects.junitPlatformReporting, + projects.junitPlatformRunner, + projects.junitPlatformSuite, + projects.junitPlatformSuiteApi, + projects.junitPlatformSuiteCommons, + projects.junitPlatformSuiteEngine, + projects.junitPlatformTestkit +).map { it.dependencyProject }) val jupiterProjects by extra(listOf( - projects.jupiter.aggregator, - projects.jupiter.api, - projects.jupiter.engine, - projects.jupiter.migrationsupport, - projects.jupiter.params -)) + projects.junitJupiter, + projects.junitJupiterApi, + projects.junitJupiterEngine, + projects.junitJupiterMigrationsupport, + projects.junitJupiterParams +).map { it.dependencyProject }) val vintageProjects by extra(listOf( - projects.vintage.engine + projects.junitVintageEngine.dependencyProject )) val mavenizedProjects by extra(platformProjects + jupiterProjects + vintageProjects) -val modularProjects by extra(mavenizedProjects - listOf(projects.platform.`console-standalone`)) +val modularProjects by extra(mavenizedProjects - listOf(projects.junitPlatformConsoleStandalone.dependencyProject)) val license by extra(License( name = "Eclipse Public License v2.0", @@ -76,14 +76,14 @@ val tempRepoDir by extra(file("$buildDir/repo")) val enableJaCoCo = project.hasProperty("enableJaCoCo") val jacocoTestProjects = listOf( - projects.jupiter.engine, - projects.jupiter.migrationsupport, - projects.jupiter.params, - projects.platform.runner, - projects.platform.suite.commons, - projects.platform.suite.engine, - projects.vintage.engine, - projects.platform.tests + projects.junitJupiterEngine, + projects.junitJupiterMigrationsupport, + projects.junitJupiterParams, + projects.junitPlatformRunner, + projects.junitPlatformSuiteCommons, + projects.junitPlatformSuiteEngine, + projects.junitVintageEngine, + projects.platformTests ) val jacocoCoveredProjects = modularProjects val jacocoClassesDir = file("$buildDir/jacoco/classes") diff --git a/buildSrc/src/main/kotlin/ProjectExtensions.kt b/buildSrc/src/main/kotlin/ProjectExtensions.kt index 8bac577a5d6e..315126c5bae3 100644 --- a/buildSrc/src/main/kotlin/ProjectExtensions.kt +++ b/buildSrc/src/main/kotlin/ProjectExtensions.kt @@ -4,9 +4,3 @@ import org.gradle.kotlin.dsl.provideDelegate val Project.javaModuleName: String get() = "org." + this.name.replace('-', '.') - -val Project.projects: Projects - get() { - var versions: Projects? by rootProject.extra - return versions ?: Projects(rootProject).also { versions = it } - } diff --git a/buildSrc/src/main/kotlin/Projects.kt b/buildSrc/src/main/kotlin/Projects.kt deleted file mode 100644 index 2738c4608ce9..000000000000 --- a/buildSrc/src/main/kotlin/Projects.kt +++ /dev/null @@ -1,53 +0,0 @@ -import org.gradle.api.Project -import kotlin.reflect.KProperty - -class Projects(private val rootProject: Project) { - val bom = project("junit-bom") - val platform = Platform() - val jupiter = Jupiter() - val vintage = Vintage() - - private fun project(name: String) = rootProject.project(":${name}") - - inner class Platform { - private val platformProject = object { - operator fun getValue(receiver: Any?, property: KProperty<*>) = project("junit-platform-${property.name}") - } - val commons by platformProject - val console by platformProject - val `console-standalone` by platformProject - val engine by platformProject - val jfr by platformProject - val launcher by platformProject - val reporting by platformProject - val runner by platformProject - val suite = Suite() - val testkit by platformProject - val tests = project("platform-tests") - - inner class Suite { - private val suiteProject = object { - operator fun getValue(receiver: Any?, property: KProperty<*>) = project("junit-platform-suite-${property.name}") - } - val aggregator = project("junit-platform-suite") - val api by suiteProject - val commons by suiteProject - val engine by suiteProject - } - } - - inner class Jupiter { - private val jupiterProject = object { - operator fun getValue(receiver: Any?, property: KProperty<*>) = project("junit-jupiter-${property.name}") - } - val aggregator = project("junit-jupiter") - val api by jupiterProject - val engine by jupiterProject - val migrationsupport by jupiterProject - val params by jupiterProject - } - - inner class Vintage { - val engine = project("junit-vintage-engine") - } -} diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts index 2b8ddb33cfe3..3f04b3535976 100644 --- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts @@ -54,13 +54,13 @@ dependencies { "testImplementation"(libs.findDependency("assertj").get()) "testImplementation"(libs.findDependency("mockito").get()) - if (project != projects.jupiter.engine) { - "testImplementation"(projects.jupiter.aggregator) + if (project != project(":junit-jupiter-engine")) { + "testImplementation"(project(":junit-jupiter")) } - "testImplementation"(testFixtures(projects.jupiter.api)) + "testImplementation"(testFixtures(project(":junit-jupiter-api"))) - "testRuntimeOnly"(projects.platform.launcher) - "testRuntimeOnly"(projects.platform.jfr) + "testRuntimeOnly"(project(":junit-platform-engine")) + "testRuntimeOnly"(project(":junit-platform-jfr")) "testRuntimeOnly"(libs.findBundle("log4j").get()) } diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts index 3b32739e91a8..c223b69da7b1 100644 --- a/documentation/documentation.gradle.kts +++ b/documentation/documentation.gradle.kts @@ -26,7 +26,7 @@ javaLibrary { val apiReport by configurations.creating dependencies { - implementation(project(projects.jupiter.api.path)) { + implementation(projects.junitJupiterApi) { because("Jupiter API is used in src/main/java") } @@ -34,15 +34,15 @@ dependencies { // in reports generated by the ApiReportGenerator. modularProjects.forEach { apiReport(it) } - testImplementation(projects.jupiter.aggregator) - testImplementation(projects.jupiter.migrationsupport) - testImplementation(projects.platform.console) - testImplementation(projects.platform.runner) - testImplementation(projects.platform.suite.aggregator) - testImplementation(projects.platform.testkit) + testImplementation(projects.junitJupiter) + testImplementation(projects.junitJupiterMigrationsupport) + testImplementation(projects.junitPlatformConsole) + testImplementation(projects.junitPlatformRunner) + testImplementation(projects.junitPlatformSuite) + testImplementation(projects.junitPlatformTestkit) testImplementation(kotlin("stdlib")) - testImplementation(projects.vintage.engine) + testImplementation(projects.junitVintageEngine) testRuntimeOnly(libs.bundles.log4j) testImplementation(libs.classgraph) { @@ -413,14 +413,14 @@ fun JavaExec.redirectOutput(outputFile: File) { eclipse { classpath { - plusConfigurations.add(projects.platform.console.configurations["shadowed"]) - plusConfigurations.add(projects.jupiter.params.configurations["shadowed"]) + plusConfigurations.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowed"]) + plusConfigurations.add(projects.junitJupiterParams.dependencyProject.configurations["shadowed"]) } } idea { module { - scopes["PROVIDED"]!!["plus"]!!.add(projects.platform.console.configurations["shadowed"]) - scopes["PROVIDED"]!!["plus"]!!.add(projects.jupiter.params.configurations["shadowed"]) + scopes["PROVIDED"]!!["plus"]!!.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowed"]) + scopes["PROVIDED"]!!["plus"]!!.add(projects.junitJupiterParams.dependencyProject.configurations["shadowed"]) } } diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts index 247887a63bde..8e8e39ac6ea6 100644 --- a/junit-jupiter-api/junit-jupiter-api.gradle.kts +++ b/junit-jupiter-api/junit-jupiter-api.gradle.kts @@ -6,10 +6,10 @@ plugins { description = "JUnit Jupiter API" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) api(libs.opentest4j) - api(projects.platform.commons) + api(projects.junitPlatformCommons) compileOnly(kotlin("stdlib")) } diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts index 1e4c05756764..be338ed699d8 100644 --- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts +++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts @@ -9,15 +9,15 @@ plugins { description = "JUnit Jupiter Engine" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) - api(projects.platform.engine) - api(projects.jupiter.api) + api(projects.junitPlatformEngine) + api(projects.junitJupiterApi) - testImplementation(projects.platform.launcher) - testImplementation(projects.platform.runner) - testImplementation(projects.platform.testkit) - testImplementation(testFixtures(projects.platform.commons)) + testImplementation(projects.junitPlatformLauncher) + testImplementation(projects.junitPlatformRunner) + testImplementation(projects.junitPlatformTestkit) + testImplementation(testFixtures(projects.junitPlatformCommons)) testImplementation(kotlin("stdlib")) testImplementation(libs.kotlinx.coroutines) testImplementation(libs.groovy3) diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts index ebdd9bf9bf15..4f778d0298a6 100644 --- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts +++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts @@ -9,15 +9,15 @@ plugins { description = "JUnit Jupiter Migration Support" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.junit4) api(libs.apiguardian) - api(projects.jupiter.api) + api(projects.junitJupiterApi) - testImplementation(projects.jupiter.engine) - testImplementation(projects.platform.launcher) - testImplementation(projects.platform.runner) - testImplementation(projects.platform.testkit) + testImplementation(projects.junitJupiterEngine) + testImplementation(projects.junitPlatformLauncher) + testImplementation(projects.junitPlatformRunner) + testImplementation(projects.junitPlatformTestkit) } tasks.jar { diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts index 4e4a727844c0..e52ed31bfceb 100644 --- a/junit-jupiter-params/junit-jupiter-params.gradle.kts +++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts @@ -7,16 +7,16 @@ plugins { description = "JUnit Jupiter Params" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) - api(projects.jupiter.api) + api(projects.junitJupiterApi) shadowed(libs.univocity.parsers) - testImplementation(projects.platform.testkit) - testImplementation(projects.jupiter.engine) - testImplementation(projects.platform.launcher) - testImplementation(projects.platform.runner) + testImplementation(projects.junitPlatformTestkit) + testImplementation(projects.junitJupiterEngine) + testImplementation(projects.junitPlatformLauncher) + testImplementation(projects.junitPlatformRunner) compileOnly(kotlin("stdlib")) testImplementation(kotlin("stdlib")) diff --git a/junit-jupiter/junit-jupiter.gradle.kts b/junit-jupiter/junit-jupiter.gradle.kts index a95f708ce8dd..e453e4325d7c 100644 --- a/junit-jupiter/junit-jupiter.gradle.kts +++ b/junit-jupiter/junit-jupiter.gradle.kts @@ -5,9 +5,9 @@ plugins { description = "JUnit Jupiter (Aggregator)" dependencies { - api(platform(projects.bom)) - api(projects.jupiter.api) - api(projects.jupiter.params) + api(platform(projects.junitBom)) + api(projects.junitJupiterApi) + api(projects.junitJupiterParams) - runtimeOnly(projects.jupiter.engine) + runtimeOnly(projects.junitJupiterEngine) } diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts index 1b0962546f56..80582cdf3f2a 100644 --- a/junit-platform-commons/junit-platform-commons.gradle.kts +++ b/junit-platform-commons/junit-platform-commons.gradle.kts @@ -8,7 +8,7 @@ plugins { description = "JUnit Platform Commons" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) } diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts index dc805c9b8a3e..03544646a5f2 100644 --- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts +++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts @@ -8,11 +8,11 @@ plugins { description = "JUnit Platform Console Standalone" dependencies { - shadowed(projects.platform.reporting) - shadowed(projects.platform.console) - shadowed(projects.jupiter.engine) - shadowed(projects.jupiter.params) - shadowed(projects.vintage.engine) + shadowed(projects.junitPlatformReporting) + shadowed(projects.junitPlatformConsole) + shadowed(projects.junitJupiterEngine) + shadowed(projects.junitJupiterParams) + shadowed(projects.junitVintageEngine) } val jupiterVersion = rootProject.version @@ -28,11 +28,11 @@ tasks { // https://github.com/junit-team/junit5/issues/761 // prevent duplicates, add 3rd-party licenses explicitly exclude("META-INF/LICENSE*.md") - from(project.projects.platform.console.projectDir) { + from(project.projects.junitPlatformConsole.dependencyProject.projectDir) { include("LICENSE-picocli.md") into("META-INF") } - from(project.projects.jupiter.params.projectDir) { + from(project.projects.junitJupiterParams.dependencyProject.projectDir) { include("LICENSE-univocity-parsers.md") into("META-INF") } diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts index 0f6610d79545..6f4561ee0192 100644 --- a/junit-platform-console/junit-platform-console.gradle.kts +++ b/junit-platform-console/junit-platform-console.gradle.kts @@ -8,9 +8,9 @@ plugins { description = "JUnit Platform Console" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) - api(projects.platform.reporting) + api(projects.junitPlatformReporting) shadowed(libs.picocli) } diff --git a/junit-platform-engine/junit-platform-engine.gradle.kts b/junit-platform-engine/junit-platform-engine.gradle.kts index d223d80a7e78..8d1a06e2f51c 100644 --- a/junit-platform-engine/junit-platform-engine.gradle.kts +++ b/junit-platform-engine/junit-platform-engine.gradle.kts @@ -6,10 +6,10 @@ plugins { description = "JUnit Platform Engine API" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) api(libs.opentest4j) - api(projects.platform.commons) + api(projects.junitPlatformCommons) testImplementation(libs.assertj) } diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts index 3aaeb32fb78b..ebcc646c8b29 100644 --- a/junit-platform-jfr/junit-platform-jfr.gradle.kts +++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts @@ -5,9 +5,9 @@ plugins { description = "JUnit Platform Flight Recorder Support" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) - api(projects.platform.launcher) + api(projects.junitPlatformLauncher) } javaLibrary { diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts index 89355b7abf98..a80a02901aac 100644 --- a/junit-platform-launcher/junit-platform-launcher.gradle.kts +++ b/junit-platform-launcher/junit-platform-launcher.gradle.kts @@ -6,7 +6,7 @@ plugins { description = "JUnit Platform Launcher" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) - api(projects.platform.engine) + api(projects.junitPlatformEngine) } diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts index b872ef23b69e..3b33528cbe97 100644 --- a/junit-platform-reporting/junit-platform-reporting.gradle.kts +++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts @@ -5,7 +5,7 @@ plugins { description = "JUnit Platform Reporting" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) - api(projects.platform.launcher) + api(projects.junitPlatformLauncher) } diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts index 6f864fe0bf12..9a12966b91b5 100644 --- a/junit-platform-runner/junit-platform-runner.gradle.kts +++ b/junit-platform-runner/junit-platform-runner.gradle.kts @@ -8,16 +8,16 @@ plugins { description = "JUnit Platform Runner" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.junit4) api(libs.apiguardian) - api(projects.platform.launcher) - api(projects.platform.suite.api) + api(projects.junitPlatformLauncher) + api(projects.junitPlatformSuiteApi) - implementation(projects.platform.suite.commons) + implementation(projects.junitPlatformSuiteCommons) - testImplementation(testFixtures(projects.platform.engine)) - testImplementation(testFixtures(projects.platform.launcher)) + testImplementation(testFixtures(projects.junitPlatformEngine)) + testImplementation(testFixtures(projects.junitPlatformLauncher)) } tasks.jar { diff --git a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts index 9845a3142657..84011b85987a 100644 --- a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts +++ b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts @@ -5,9 +5,9 @@ plugins { description = "JUnit Platform Suite API" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) - api(projects.platform.commons) + api(projects.junitPlatformCommons) - osgiVerification(projects.platform.commons) + osgiVerification(projects.junitPlatformCommons) } diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts index 155ced0af6a1..4c0aa95c9d52 100644 --- a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts +++ b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts @@ -6,12 +6,12 @@ plugins { description = "JUnit Platform Suite Commons" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) - api(projects.platform.launcher) + api(projects.junitPlatformLauncher) - implementation(projects.platform.engine) - implementation(projects.platform.suite.api) + implementation(projects.junitPlatformEngine) + implementation(projects.junitPlatformSuiteApi) - testImplementation(projects.jupiter.engine) + testImplementation(projects.junitJupiterEngine) } diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts index 6a9a5dd1e4d5..701b5ec1ef68 100644 --- a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts +++ b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts @@ -7,16 +7,16 @@ plugins { description = "JUnit Platform Suite Engine" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) - api(projects.platform.engine) - api(projects.platform.suite.api) + api(projects.junitPlatformEngine) + api(projects.junitPlatformSuiteApi) - implementation(projects.platform.suite.commons) + implementation(projects.junitPlatformSuiteCommons) - testFixturesApi(projects.jupiter.api) - testFixturesApi(projects.platform.suite.api) + testFixturesApi(projects.junitJupiterApi) + testFixturesApi(projects.junitPlatformSuiteApi) - testImplementation(projects.platform.testkit) - testImplementation(projects.jupiter.engine) + testImplementation(projects.junitPlatformTestkit) + testImplementation(projects.junitJupiterEngine) } diff --git a/junit-platform-suite/junit-platform-suite.gradle.kts b/junit-platform-suite/junit-platform-suite.gradle.kts index f1c104ab9efe..67ec26ab10a2 100644 --- a/junit-platform-suite/junit-platform-suite.gradle.kts +++ b/junit-platform-suite/junit-platform-suite.gradle.kts @@ -5,7 +5,7 @@ plugins { description = "JUnit Platform Suite (Aggregator)" dependencies { - api(platform(projects.bom)) - api(projects.platform.suite.api) - implementation(projects.platform.suite.engine) + api(platform(projects.junitBom)) + api(projects.junitPlatformSuiteApi) + implementation(projects.junitPlatformSuiteEngine) } diff --git a/junit-platform-testkit/junit-platform-testkit.gradle.kts b/junit-platform-testkit/junit-platform-testkit.gradle.kts index 8defbaae230b..d3b45822f96d 100644 --- a/junit-platform-testkit/junit-platform-testkit.gradle.kts +++ b/junit-platform-testkit/junit-platform-testkit.gradle.kts @@ -5,9 +5,9 @@ plugins { description = "JUnit Platform Test Kit" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) api(libs.assertj) api(libs.opentest4j) - api(projects.platform.launcher) + api(projects.junitPlatformLauncher) } diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts index d6b53b33da81..a0433fbec2c0 100644 --- a/junit-vintage-engine/junit-vintage-engine.gradle.kts +++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts @@ -11,18 +11,18 @@ plugins { description = "JUnit Vintage Engine" dependencies { - api(platform(projects.bom)) + api(platform(projects.junitBom)) api(libs.apiguardian) - api(projects.platform.engine) + api(projects.junitPlatformEngine) api(libs.junit4) testFixturesApi(platform(libs.groovy2.bom)) testFixturesApi(libs.spock1) - testFixturesImplementation(projects.platform.runner) + testFixturesImplementation(projects.junitPlatformRunner) - testImplementation(projects.platform.launcher) - testImplementation(projects.platform.runner) - testImplementation(projects.platform.testkit) + testImplementation(projects.junitPlatformLauncher) + testImplementation(projects.junitPlatformRunner) + testImplementation(projects.junitPlatformTestkit) } tasks { diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts index 979e7068b2de..276f78759fca 100644 --- a/platform-tests/platform-tests.gradle.kts +++ b/platform-tests/platform-tests.gradle.kts @@ -9,32 +9,32 @@ plugins { dependencies { // --- Things we are testing -------------------------------------------------- - testImplementation(projects.platform.commons) - testImplementation(projects.platform.console) - testImplementation(projects.platform.engine) - testImplementation(projects.platform.jfr) - testImplementation(projects.platform.launcher) + testImplementation(projects.junitPlatformCommons) + testImplementation(projects.junitPlatformConsole) + testImplementation(projects.junitPlatformEngine) + testImplementation(projects.junitPlatformJfr) + testImplementation(projects.junitPlatformLauncher) // --- Things we are testing with --------------------------------------------- - testImplementation(projects.platform.runner) - testImplementation(projects.platform.testkit) - testImplementation(testFixtures(projects.platform.commons)) - testImplementation(testFixtures(projects.platform.engine)) - testImplementation(testFixtures(projects.platform.launcher)) - testImplementation(projects.jupiter.engine) + testImplementation(projects.junitPlatformRunner) + testImplementation(projects.junitPlatformTestkit) + testImplementation(testFixtures(projects.junitPlatformCommons)) + testImplementation(testFixtures(projects.junitPlatformEngine)) + testImplementation(testFixtures(projects.junitPlatformLauncher)) + testImplementation(projects.junitJupiterEngine) testImplementation(libs.apiguardian) testImplementation(libs.jfrunit) testImplementation(libs.joox) // --- Test run-time dependencies --------------------------------------------- - testRuntimeOnly(projects.vintage.engine) + testRuntimeOnly(projects.junitVintageEngine) testRuntimeOnly(libs.groovy3) { because("`ReflectionUtilsTests.findNestedClassesWithInvalidNestedClassFile` needs it") } // --- https://openjdk.java.net/projects/code-tools/jmh/ ----------------------- jmh(libs.jmh.core) - jmh(projects.jupiter.api) + jmh(projects.junitJupiterApi) jmh(libs.junit4) jmhAnnotationProcessor(libs.jmh.generator.annprocess) } @@ -70,12 +70,12 @@ tasks { eclipse { classpath { - plusConfigurations.add(projects.platform.console.configurations["shadowed"]) + plusConfigurations.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowed"]) } } idea { module { - scopes["PROVIDED"]!!["plus"]!!.add(projects.platform.console.configurations["shadowed"]) + scopes["PROVIDED"]!!["plus"]!!.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowed"]) } } diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts index bf54593ac0d9..7310badca306 100644 --- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts +++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts @@ -44,7 +44,7 @@ tasks.test { val mavenizedProjects: List by rootProject val tempRepoName: String by rootProject - (mavenizedProjects + projects.bom) + (mavenizedProjects + projects.junitBom.dependencyProject) .map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalize()}Repository") } .forEach { dependsOn(it) } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 468b21ba55f3..72826880a4c8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -132,3 +132,4 @@ rootProject.children.forEach { project -> } enableFeaturePreview("VERSION_CATALOGS") +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")