Merge remote-tracking branch 'origin/main'

This commit is contained in:
天クマ 2026-05-23 22:39:53 -03:00
commit a476c790de

View file

@ -121,17 +121,18 @@ val prepareServiceFiles = tasks.register("prepareServiceFiles") {
tasks.register<Jar>("bundleAll") { tasks.register<Jar>("bundleAll") {
from(sourceSets["main"].output) from(sourceSets["main"].output)
mcVersions.forEach { ver -> mcVersions.forEach { ver ->
from(sourceSets[ver].output) from(sourceSets[ver].output) {
exclude("META-INF/services/org.adrianvictor.lib.versioning.VersionedServiceRegistrar")
}
} }
// Include the merged service file // Include the merged service file
from(prepareServiceFiles) { from(prepareServiceFiles) {
into("META-INF/services") into("META-INF/services")
include("org.adrianvictor.lib.versioning.VersionedServiceRegistrar") include("org.adrianvictor.lib.versioning.VersionedServiceRegistrar")
duplicatesStrategy = DuplicatesStrategy.INCLUDE
} }
duplicatesStrategy = DuplicatesStrategy.INCLUDE duplicatesStrategy = DuplicatesStrategy.EXCLUDE
archiveClassifier.set("all-implementations") archiveClassifier.set("all-implementations")
archiveVersion.set(project.version.toString()) archiveVersion.set(project.version.toString())