Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,30 @@ fun MavenPom.includeAdditionalInfo() {
}
}

fun MavenPom.addBundledDependencies() = bundledDependencies.forEach { addDependency(it, "provided") }
fun MavenPom.addBundledDependencies() {
val seen = mutableSetOf<ResolvedDependency>()
val queue = ArrayDeque<ResolvedDependency>()

// Visit each bundled dependency, including its transitive dependencies if so configured, so that the exact set
// of used JARs ends up in the POM as provided dependencies.
for (config in bundledDependencies) {
queue.addAll(config.resolvedConfiguration.firstLevelModuleDependencies)

while (!queue.isEmpty()) {
val dep = queue.removeFirst()
if (seen.add(dep)) {
addDependency(
dep.moduleGroup,
dep.moduleName,
dep.moduleVersion,
dep.moduleArtifacts.first().type,
"provided"
)
queue.addAll(dep.children)
}
}
}
}

publishing {
repositories {
Expand Down Expand Up @@ -407,6 +430,7 @@ publishing {

pom.addDependency(languageLibs)
pom.includeAdditionalInfo()
pom.addBundledDependencies()
}

create<MavenPublication>("tests") {
Expand All @@ -420,7 +444,6 @@ publishing {
moduleVersion = project.version.toString(),
type = "zip"
)
pom.addBundledDependencies()
pom.includeAdditionalInfo()
}
val runtimesDir = file(artifactsDir).resolve("org.iets3.opensource/org.iets3.core.os/languages/iets3.core.os")
Expand Down