[groovy] branch master updated: Migrate JavaPluginConvention to JavaPluginExtension

[sunlan]

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

sunlan 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 01fb1cfaf3 Migrate JavaPluginConvention to JavaPluginExtension
01fb1cfaf3 is described below

commit 01fb1cfaf30e9c9f33325fda0e572724ceec20bb
Author: Goooler <wangzong...@gmail.com>
AuthorDate: Wed Sep 28 14:44:35 2022 +0800

    Migrate JavaPluginConvention to JavaPluginExtension
    
    JavaPluginConvention has been deprecated, and will be removed in Gradle 8, 
we should migrate to JavaPluginExtension.
    
https://docs.gradle.org/current/userguide/upgrading_version_7.html#java_convention_deprecation
---
 build-logic/src/main/groovy/org.apache.groovy-base.gradle         | 4 ++--
 .../groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy | 8 ++------
 2 files changed, 4 insertions(+), 8 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 06b3719779..69545da129 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -46,7 +46,7 @@ if (sharedConfiguration.hasCodeCoverage.get()) {
     pluginManager.apply(JacocoPlugin)
 }
 
-def groovyLibrary = project.extensions.create("groovyLibrary", 
GroovyLibraryExtension, sharedConfiguration, project.convention.plugins.java, 
java)
+def groovyLibrary = project.extensions.create("groovyLibrary", 
GroovyLibraryExtension, sharedConfiguration, java)
 
 java {
     withSourcesJar()
@@ -348,4 +348,4 @@ Configuration createConsumableConfiguration(ObjectFactory 
objects,
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git 
a/build-logic/src/main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy
 
b/build-logic/src/main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy
index 74468cf287..2bd7ea1380 100644
--- 
a/build-logic/src/main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy
+++ 
b/build-logic/src/main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy
@@ -37,7 +37,6 @@ import org.gradle.api.java.archives.Manifest
 import org.gradle.api.java.archives.ManifestMergeDetails
 import org.gradle.api.java.archives.ManifestMergeSpec
 import org.gradle.api.model.ObjectFactory
-import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
@@ -59,7 +58,6 @@ class GroovyLibraryExtension {
     final Property<Boolean> checkBinaryCompatibility
 
     final ObjectFactory objects
-    final JavaPluginConvention javaPluginConvention
     final JavaPluginExtension javaPluginExtension
     final SoftwareComponentContainer components
     final ConfigurationContainer configurations
@@ -70,7 +68,6 @@ class GroovyLibraryExtension {
     GroovyLibraryExtension(ObjectFactory factory,
                            ProjectLayout layout,
                            SharedConfiguration sharedConfiguration,
-                           JavaPluginConvention javaPluginConvention,
                            JavaPluginExtension javaPluginExtension,
                            SoftwareComponentContainer components,
                            ConfigurationContainer configurations,
@@ -83,7 +80,6 @@ class GroovyLibraryExtension {
         this.grooid = factory.property(Boolean).convention(false)
         this.checkBinaryCompatibility = 
factory.property(Boolean).convention(true)
         this.repackagedDependencies = 
factory.listProperty(String).convention([])
-        this.javaPluginConvention = javaPluginConvention
         this.javaPluginExtension = javaPluginExtension
         this.components = components
         this.configurations = configurations
@@ -158,7 +154,7 @@ class GroovyLibraryExtension {
 
     void registerOptionalFeature(String name) {
         javaPluginExtension.registerFeature(name) {
-            
it.usingSourceSet(javaPluginConvention.sourceSets.getByName("main"))
+            it.usingSourceSet(javaPluginExtension.sourceSets.getByName("main"))
         }
         AdhocComponentWithVariants component = findComponent()
         def apiElements = configurations.getByName("${name}ApiElements")
@@ -203,7 +199,7 @@ class GroovyLibraryExtension {
 
     private Manifest createBaseManifest() {
         def groovyBundleVersion = sharedConfiguration.groovyBundleVersion.get()
-        javaPluginConvention.manifest { Manifest mn ->
+        javaPluginExtension.manifest { Manifest mn ->
             mn.attributes(
                     'Extension-Name': 'groovy',
                     'Specification-Title': 'Groovy: a powerful, multi-faceted 
language for the JVM',