Add indirection to suppress deprecation warning for now

Author: marcphilipp

build.gradle.kts

@@ -30,22 +30,22 @@ val platformProjects by extra(listOf(
 		projects.junitPlatformSuiteCommons,
 		projects.junitPlatformSuiteEngine,
 		projects.junitPlatformTestkit
-).map { it.dependencyProject })
+).map { it.actualProject })
 
 val jupiterProjects by extra(listOf(
 		projects.junitJupiter,
 		projects.junitJupiterApi,
 		projects.junitJupiterEngine,
 		projects.junitJupiterMigrationsupport,
 		projects.junitJupiterParams
-).map { it.dependencyProject })
+).map { it.actualProject })
 
 val vintageProjects by extra(listOf(
-		projects.junitVintageEngine.dependencyProject
+		projects.junitVintageEngine.actualProject
 ))
 
 val mavenizedProjects by extra(platformProjects + jupiterProjects + vintageProjects)
-val modularProjects by extra(mavenizedProjects - listOf(projects.junitPlatformConsoleStandalone.dependencyProject))
+val modularProjects by extra(mavenizedProjects - listOf(projects.junitPlatformConsoleStandalone.actualProject))
 
 dependencies {
 	modularProjects.forEach {

documentation/documentation.gradle.kts

@@ -553,14 +553,14 @@ tasks {
 
 eclipse {
 	classpath {
-		plusConfigurations.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowedClasspath"])
-		plusConfigurations.add(projects.junitJupiterParams.dependencyProject.configurations["shadowedClasspath"])
+		plusConfigurations.add(projects.junitPlatformConsole.actualProject.configurations["shadowedClasspath"])
+		plusConfigurations.add(projects.junitJupiterParams.actualProject.configurations["shadowedClasspath"])
 	}
 }
 
 idea {
 	module {
-		scopes["PROVIDED"]!!["plus"]!!.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowedClasspath"])
-		scopes["PROVIDED"]!!["plus"]!!.add(projects.junitJupiterParams.dependencyProject.configurations["shadowedClasspath"])
+		scopes["PROVIDED"]!!["plus"]!!.add(projects.junitPlatformConsole.actualProject.configurations["shadowedClasspath"])
+		scopes["PROVIDED"]!!["plus"]!!.add(projects.junitJupiterParams.actualProject.configurations["shadowedClasspath"])
 	}
 }

gradle/plugins/common/src/main/kotlin/ProjectExtensions.kt

@@ -1,10 +1,20 @@
 import org.gradle.api.Project
+import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.artifacts.VersionCatalog
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.the
 
 val Project.javaModuleName: String
-    get() = "org." + this.name.replace('-', '.')
+    get() = toModuleName(name)
+
+val ProjectDependency.javaModuleName: String
+    get() = toModuleName(name)
+
+private fun toModuleName(name: String) = "org.${name.replace('-', '.')}"
+
+val ProjectDependency.actualProject: Project
+    @Suppress("DEPRECATION")
+    get() = this.dependencyProject
 
 fun Project.requiredVersionFromLibs(name: String) =
     libsVersionCatalog.findVersion(name).get().requiredVersion

junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts

@@ -41,11 +41,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.junitPlatformConsole.dependencyProject.projectDir) {
+		from(project.projects.junitPlatformConsole.actualProject.projectDir) {
 			include("LICENSE-picocli.md")
 			into("META-INF")
 		}
-		from(project.projects.junitJupiterParams.dependencyProject.projectDir) {
+		from(project.projects.junitJupiterParams.actualProject.projectDir) {
 			include("LICENSE-univocity-parsers.md")
 			into("META-INF")
 		}

junit-platform-console/junit-platform-console.gradle.kts

@@ -27,7 +27,7 @@ tasks {
 	compileModule {
 		options.compilerArgs.addAll(listOf(
 			"--add-modules", "org.opentest4j.reporting.events",
-			"--add-reads", "${project.projects.junitPlatformReporting.dependencyProject.javaModuleName}=org.opentest4j.reporting.events",
+			"--add-reads", "${project.projects.junitPlatformReporting.javaModuleName}=org.opentest4j.reporting.events",
 			"--add-modules", "info.picocli",
 			"--add-reads", "${javaModuleName}=info.picocli"
 		))

platform-tests/platform-tests.gradle.kts

@@ -84,12 +84,12 @@ tasks {
 
 eclipse {
 	classpath {
-		plusConfigurations.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowedClasspath"])
+		plusConfigurations.add(projects.junitPlatformConsole.actualProject.configurations["shadowedClasspath"])
 	}
 }
 
 idea {
 	module {
-		scopes["PROVIDED"]!!["plus"]!!.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowedClasspath"])
+		scopes["PROVIDED"]!!["plus"]!!.add(projects.junitPlatformConsole.actualProject.configurations["shadowedClasspath"])
 	}
 }

platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts

@@ -109,7 +109,7 @@ val normalizeMavenRepo by tasks.registering(Sync::class) {
 	val tempRepoName: String by rootProject
 
 	// All maven-aware projects must be published to the local temp repository
-	(mavenizedProjects + projects.junitBom.dependencyProject)
+	(mavenizedProjects + projects.junitBom.actualProject)
 		.map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalized()}Repository") }
 		.forEach { dependsOn(it) }