Skip to content

Commit 5d19df5

Browse files
committed
Fix ensureReleaseCheckUpToDate Failure
Signed-off-by: junya koyama <arukiidou@yahoo.co.jp>
1 parent 255bc7c commit 5d19df5

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

buildSrc/src/main/groovy/archunit.java-release-check-conventions.gradle

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,20 @@ task ensureReleaseCheckUpToDate {
1919
releaseCheckDependencies.each { releaseCheckDependency ->
2020
VersionCatalog versionCatalog = versionCatalogs.named("libs")
2121
def dependencies = versionCatalog.libraryAliases.collect { versionCatalog.findLibrary(it).get().get() }
22-
def matchingProjectDependency = dependencies.find {
22+
def matchingProjectDependencies = dependencies.findAll {
2323
it.group == releaseCheckDependency.groupId && it.name == releaseCheckDependency.artifactId
2424
}
25+
26+
assert matchingProjectDependencies.size() == 1 || releaseCheckDependency.groupId.contains("org.junit") :
27+
"Multiple dependency ${matchingProjectDependencies.size()}: ${matchingProjectDependencies}"
28+
29+
// Filter out duplicate versions of JUnit5 or JUnit6.
30+
def matchingProjectDependency = releaseCheckDependency.groupId.contains("org.junit")
31+
? releaseCheckDependency.version.contains("6.")
32+
? matchingProjectDependencies.find {ju -> ju.version.contains("6.") }
33+
: matchingProjectDependencies.find {ju -> !ju.version.contains("6.") }
34+
: matchingProjectDependencies.first()
35+
2536
assert matchingProjectDependency != null:
2637
"No project dependency was found for expected release dependency ${releaseCheckDependency}"
2738
assert matchingProjectDependency.version == releaseCheckDependency.version:

0 commit comments

Comments
 (0)