File tree Expand file tree Collapse file tree 6 files changed +15
-16
lines changed
gradle/plugins/common/src/main/kotlin
junit-platform-console-standalone
platform-tooling-support-tests Expand file tree Collapse file tree 6 files changed +15
-16
lines changed Original file line number Diff line number Diff line change @@ -30,22 +30,22 @@ val platformProjects by extra(listOf(
30
30
projects.junitPlatformSuiteCommons,
31
31
projects.junitPlatformSuiteEngine,
32
32
projects.junitPlatformTestkit
33
- ).map { it.actualProject })
33
+ ).map { dependencyProject(it) })
34
34
35
35
val jupiterProjects by extra(listOf (
36
36
projects.junitJupiter,
37
37
projects.junitJupiterApi,
38
38
projects.junitJupiterEngine,
39
39
projects.junitJupiterMigrationsupport,
40
40
projects.junitJupiterParams
41
- ).map { it.actualProject })
41
+ ).map { dependencyProject(it) })
42
42
43
43
val vintageProjects by extra(listOf (
44
- projects.junitVintageEngine.actualProject
44
+ dependencyProject( projects.junitVintageEngine)
45
45
))
46
46
47
47
val mavenizedProjects by extra(platformProjects + jupiterProjects + vintageProjects)
48
- val modularProjects by extra(mavenizedProjects - listOf ( projects.junitPlatformConsoleStandalone.actualProject ))
48
+ val modularProjects by extra(mavenizedProjects - setOf (dependencyProject( projects.junitPlatformConsoleStandalone) ))
49
49
50
50
dependencies {
51
51
modularProjects.forEach {
Original file line number Diff line number Diff line change @@ -553,14 +553,14 @@ tasks {
553
553
554
554
eclipse {
555
555
classpath {
556
- plusConfigurations.add(projects.junitPlatformConsole.actualProject .configurations[" shadowedClasspath" ])
557
- plusConfigurations.add(projects.junitJupiterParams.actualProject .configurations[" shadowedClasspath" ])
556
+ plusConfigurations.add(dependencyProject( projects.junitPlatformConsole) .configurations[" shadowedClasspath" ])
557
+ plusConfigurations.add(dependencyProject( projects.junitJupiterParams) .configurations[" shadowedClasspath" ])
558
558
}
559
559
}
560
560
561
561
idea {
562
562
module {
563
- scopes[" PROVIDED" ]!! [" plus" ]!! .add(projects.junitPlatformConsole.actualProject .configurations[" shadowedClasspath" ])
564
- scopes[" PROVIDED" ]!! [" plus" ]!! .add(projects.junitJupiterParams.actualProject .configurations[" shadowedClasspath" ])
563
+ scopes[" PROVIDED" ]!! [" plus" ]!! .add(dependencyProject( projects.junitPlatformConsole) .configurations[" shadowedClasspath" ])
564
+ scopes[" PROVIDED" ]!! [" plus" ]!! .add(dependencyProject( projects.junitJupiterParams) .configurations[" shadowedClasspath" ])
565
565
}
566
566
}
Original file line number Diff line number Diff line change @@ -12,9 +12,8 @@ val ProjectDependency.javaModuleName: String
12
12
13
13
private fun toModuleName (name : String ) = " org.${name.replace(' -' , ' .' )} "
14
14
15
- val ProjectDependency .actualProject: Project
16
- @Suppress(" DEPRECATION" )
17
- get() = this .dependencyProject
15
+ fun Project.dependencyProject (dependency : ProjectDependency ) =
16
+ project(dependency.path)
18
17
19
18
fun Project.requiredVersionFromLibs (name : String ) =
20
19
libsVersionCatalog.findVersion(name).get().requiredVersion
Original file line number Diff line number Diff line change @@ -41,11 +41,11 @@ tasks {
41
41
// https://github.com/junit-team/junit5/issues/761
42
42
// prevent duplicates, add 3rd-party licenses explicitly
43
43
exclude(" META-INF/LICENSE*.md" )
44
- from(project.projects.junitPlatformConsole.actualProject .projectDir) {
44
+ from(dependencyProject( project.projects.junitPlatformConsole) .projectDir) {
45
45
include(" LICENSE-picocli.md" )
46
46
into(" META-INF" )
47
47
}
48
- from(project.projects.junitJupiterParams.actualProject .projectDir) {
48
+ from(dependencyProject( project.projects.junitJupiterParams) .projectDir) {
49
49
include(" LICENSE-univocity-parsers.md" )
50
50
into(" META-INF" )
51
51
}
Original file line number Diff line number Diff line change @@ -84,12 +84,12 @@ tasks {
84
84
85
85
eclipse {
86
86
classpath {
87
- plusConfigurations.add(projects.junitPlatformConsole.actualProject .configurations[" shadowedClasspath" ])
87
+ plusConfigurations.add(dependencyProject( projects.junitPlatformConsole) .configurations[" shadowedClasspath" ])
88
88
}
89
89
}
90
90
91
91
idea {
92
92
module {
93
- scopes[" PROVIDED" ]!! [" plus" ]!! .add(projects.junitPlatformConsole.actualProject .configurations[" shadowedClasspath" ])
93
+ scopes[" PROVIDED" ]!! [" plus" ]!! .add(dependencyProject( projects.junitPlatformConsole) .configurations[" shadowedClasspath" ])
94
94
}
95
95
}
Original file line number Diff line number Diff line change @@ -109,7 +109,7 @@ val normalizeMavenRepo by tasks.registering(Sync::class) {
109
109
val tempRepoName: String by rootProject
110
110
111
111
// All maven-aware projects must be published to the local temp repository
112
- (mavenizedProjects + projects.junitBom.actualProject )
112
+ (mavenizedProjects + dependencyProject( projects.junitBom) )
113
113
.map { project -> project.tasks.named(" publishAllPublicationsTo${tempRepoName.capitalized()} Repository" ) }
114
114
.forEach { dependsOn(it) }
115
115
You can’t perform that action at this time.
0 commit comments