[groovy] branch GROOVY_3_0_X updated: follow up to GROOVY-9410 (further improvements)

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
     new f77d37f  follow up to GROOVY-9410 (further improvements)
f77d37f is described below

commit f77d37f76a92cac88d2dc7d621908ef104cba16f
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Feb 20 20:53:14 2020 +1000

    follow up to GROOVY-9410 (further improvements)
---
 build.gradle           | 6 +++---
 gradle/assemble.gradle | 2 +-
 gradle/upload.gradle   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index fdb57cc..a4c4237 100644
--- a/build.gradle
+++ b/build.gradle
@@ -162,9 +162,9 @@ dependencies {
     api "org.ow2.asm:asm:$asmVersion" // marked as api but manually excluded later in assemble.gradle - modules will use shaded version
     // for internal usage by the parser but manually excluded later in assemble.gradle - modules will use shaded version
     api "antlr:antlr:$antlrVersion"
-    compileOnly "org.ow2.asm:asm-analysis:$asmVersion"
-    compileOnly "org.ow2.asm:asm-commons:$asmVersion"
-    compileOnly "org.ow2.asm:asm-tree:$asmVersion"
+    implementation "org.ow2.asm:asm-analysis:$asmVersion"
+    implementation "org.ow2.asm:asm-commons:$asmVersion"
+    implementation "org.ow2.asm:asm-tree:$asmVersion"
     implementation "org.ow2.asm:asm-util:$asmVersion"
     implementation("com.thoughtworks.xstream:xstream:$xstreamVersion") {
         exclude(group: 'xpp3', module: 'xpp3_min')
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index c543ba1..d4247ab 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -204,7 +204,7 @@ allprojects {
             dependsOn arch
             from = file(arch.archivePath)
             if (project == rootProject) {
-                repackagedLibraries = files(configurations.runtime.incoming.artifactView {
+                repackagedLibraries = files(configurations.runtimeClasspath.incoming.artifactView {
                     componentFilter { component ->
                         if (component instanceof ModuleComponentIdentifier) {
                             return component.module in [
diff --git a/gradle/upload.gradle b/gradle/upload.gradle
index da5b7fd..5d00b85 100644
--- a/gradle/upload.gradle
+++ b/gradle/upload.gradle
@@ -24,7 +24,7 @@ if (isUsingArtifactory) {
     logger.lifecycle 'Deployment environment set to Artifactory'
 }
 
-def embedded = ['asm', 'asm-util', 'asm-analysis', 'asm-tree', 'asm-commons', 'antlr', 'commons-cli', 'openbeans']
+def embedded = ['asm', 'asm-util', 'asm-analysis', 'asm-tree', 'asm-commons', 'antlr', 'picocli', 'openbeans']
 def removeJarjaredDependencies = { p ->
     p.dependencies.removeAll(p.dependencies.findAll {
         it.groupId == 'org.codehaus.groovy' || embedded.contains(it.artifactId)