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

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


The following commit(s) were added to refs/heads/master by this push:
     new 0f443141c6 deprecated build usage
0f443141c6 is described below

commit 0f443141c6719c51d5733713c9f0ffbcf031c800
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Apr 22 13:54:54 2024 +1000

    deprecated build usage
---
 build-logic/src/main/groovy/org.apache.groovy-base.gradle | 4 ++--
 build.gradle                                              | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

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 4c33055503..99b1334e45 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -308,8 +308,8 @@ components.groovyLibrary {
 // By declaring a codehaus capability we can tell Gradle that the user has to
 // choose between "old" groovy and "new" groovy
 List<String> capabilities = [
-        
"org.codehaus.groovy:${archivesBaseName}:${sharedConfiguration.groovyVersion.get()}",
-        
"org.apache.groovy:${archivesBaseName}:${sharedConfiguration.groovyVersion.get()}"
+        
"org.codehaus.groovy:${base.archivesName.get()}:${sharedConfiguration.groovyVersion.get()}",
+        
"org.apache.groovy:${base.archivesName.get()}:${sharedConfiguration.groovyVersion.get()}"
 ]
 int targetJvmVersion = 
Integer.valueOf(sharedConfiguration.targetJavaVersion.get())
 // First we create the "API" and "runtime" variants of Groovy for publication
diff --git a/build.gradle b/build.gradle
index 74a002bb35..f24ee350b3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,9 @@ buildScanRecipes {
     recipes 'git-status', 'gc-stats', 'teamcity', 'travis-ci'
 }
 
-archivesBaseName = 'groovy'
+base {
+    archivesName = 'groovy'
+}
 
 groovyLibrary {
     registerOptionalFeature 'gpars'

Reply via email to