This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit eb523bad6d276d1dc2ec3f36b181a239b3fdf9a8 Author: Paul King <[email protected]> AuthorDate: Tue Jan 16 20:33:31 2024 +1000 tweak for Gradle 8.5 but it would be better to find a way to remove the raw artifacts altogether --- build-logic/src/main/groovy/org.apache.groovy-base.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-logic/src/main/groovy/org.apache.groovy-base.gradle b/build-logic/src/main/groovy/org.apache.groovy-base.gradle index 4eddbc847d..0f6f43e6ba 100644 --- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle +++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle @@ -141,6 +141,7 @@ def excludedFromManifest = [ tasks.named('jar') { archiveAppendix = 'raw' + archiveClassifier.set("raw") groovyLibrary.configureManifest(manifest, excludedFromManifest) } @@ -199,7 +200,7 @@ tasks.register("jarjar", JarJarTask) { 'org/objectweb/asm/util/ASMifier.class', 'org/objectweb/asm/util/Trace*'] ] - outputFile = tasks.named('jar').flatMap { layout.buildDirectory.file("libs/${it.archiveBaseName.get()}-${it.archiveVersion.get()}${it.archiveClassifier.get() ? '-' + it.archiveClassifier.get() : ''}.jar") } + outputFile = tasks.named('jar').flatMap { layout.buildDirectory.file("libs/${it.archiveBaseName.get()}-${it.archiveVersion.get()}${(it.archiveClassifier.get() && it.archiveClassifier.get() != 'raw') ? '-' + it.archiveClassifier.get() : ''}.jar") } withManifest { def extras = project.name == 'groovy' ? ['Main-Class': 'groovy.ui.GroovyMain'] : [:]
