You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/09/21 03:33:17 UTC
[groovy] 05/05: Revert "Cleanup build-logic"
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
commit aae99bac6a90ab8ef3c3f4a838a6537d8db5fdf9
Author: Goooler <wa...@gmail.com>
AuthorDate: Tue Sep 20 21:28:06 2022 +0800
Revert "Cleanup build-logic"
This reverts commit 969d8b24ffaa9e1ca2fc226979a7385f1057e70a.
---
.../org.apache.groovy-bad-practices-detection.gradle | 4 +---
.../src/main/groovy/org.apache.groovy-base.gradle | 18 +++++++++---------
.../groovy/org.apache.groovy-published-library.gradle | 6 ++----
.../apache/groovy/gradle/GroovyLibraryExtension.groovy | 5 +++--
.../groovy/org/apache/groovy/gradle/JarJarTask.groovy | 3 ++-
.../apache/groovy/gradle/SharedConfiguration.groovy | 4 ++--
6 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-bad-practices-detection.gradle b/build-logic/src/main/groovy/org.apache.groovy-bad-practices-detection.gradle
index 6cdb2ef56f..d44211ec26 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-bad-practices-detection.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-bad-practices-detection.gradle
@@ -1,5 +1,3 @@
-import groovy.transform.CompileStatic
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -44,7 +42,7 @@ allprojects { p ->
p.configurations.metaClass = new ContainerMetaclassClass(p.configurations.metaClass, checkResolution)
}
-@CompileStatic
+@groovy.transform.CompileStatic
class ContainerMetaclassClass extends DelegatingMetaClass {
Closure configuration
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 8e14e7e042..06b3719779 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -322,14 +322,14 @@ afterEvaluate {
}
@CompileStatic
-static Configuration createConsumableConfiguration(ObjectFactory objects,
- TaskContainer tasks,
- ConfigurationContainer container,
- String name,
- String usage,
- String artifactTask,
- List<String> capabilities,
- int targetJvmVersion) {
+Configuration createConsumableConfiguration(ObjectFactory objects,
+ TaskContainer tasks,
+ ConfigurationContainer container,
+ String name,
+ String usage,
+ String artifactTask,
+ List<String> capabilities,
+ int targetJvmVersion) {
container.create(name) { Configuration cnf ->
cnf.canBeConsumed = true
cnf.canBeResolved = false
@@ -348,4 +348,4 @@ static Configuration createConsumableConfiguration(ObjectFactory objects,
}
}
}
-}
+}
\ No newline at end of file
diff --git a/build-logic/src/main/groovy/org.apache.groovy-published-library.gradle b/build-logic/src/main/groovy/org.apache.groovy-published-library.gradle
index d993eb950f..3acc6946fb 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-published-library.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-published-library.gradle
@@ -1,5 +1,3 @@
-import groovy.swing.SwingBuilder
-
plugins {
id 'maven-publish'
id 'signing'
@@ -828,7 +826,7 @@ gradle.taskGraph.whenReady { taskGraph ->
def promptUser(String prompt) {
def response = ''
if (System.console() == null) {
- new SwingBuilder().edt {
+ new groovy.swing.SwingBuilder().edt {
dialog(modal: true, // pause build
title: 'Response required', // dialog title
alwaysOnTop: true,
@@ -855,4 +853,4 @@ def promptUser(String prompt) {
throw new InvalidUserDataException("Null response detected!")
}
response
-}
+}
\ 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 cb87c31fe4..74468cf287 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
@@ -42,6 +42,7 @@ import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.provider.ListProperty
import org.gradle.api.provider.Property
import org.gradle.api.tasks.TaskContainer
+import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.bundling.Jar
import javax.inject.Inject
@@ -110,7 +111,7 @@ class GroovyLibraryExtension {
) {
grooid.set(true)
def grooidJar = tasks.register("grooidJar", JarJarTask) {
- def jarjar = tasks.named("jarjar", JarJarTask)
+ TaskProvider<JarJarTask> jarjar = (TaskProvider<JarJarTask>) tasks.named("jarjar")
it.dependsOn(jarjar)
it.from.set(jarjar.flatMap { it.outputFile })
if (librariesToRepackage) {
@@ -129,7 +130,7 @@ class GroovyLibraryExtension {
it.createManifest = false
it.includedResources = resources
it.outputFile.set(layout.buildDirectory.file(
- tasks.named('jar', Jar).map { jar ->
+ tasks.named('jar').map { Jar jar ->
"libs/${jar.archiveBaseName.get()}-${jar.archiveVersion.get()}-grooid.jar"
}
))
diff --git a/build-logic/src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy
index d80107cd63..369fdf21a4 100644
--- a/build-logic/src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy
+++ b/build-logic/src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy
@@ -191,4 +191,5 @@ class JarJarTask extends DefaultTask {
private static String baseName(File file) {
file.name.substring(0, file.name.lastIndexOf('-'))
}
-}
+
+}
\ No newline at end of file
diff --git a/build-logic/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
index f7acf93ac8..b03304642e 100644
--- a/build-logic/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
+++ b/build-logic/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
@@ -114,7 +114,7 @@ class SharedConfiguration {
logger.lifecycle "ArtifactoryUser user: ${username.getOrElse("not defined")}"
}
- private static Provider<RegularFile> artifactoryFile(ProviderFactory providers, ProjectLayout layout) {
+ private Provider<RegularFile> artifactoryFile(ProviderFactory providers, ProjectLayout layout) {
providers.provider {
// try to read artifactory.properties
Directory base = layout.projectDirectory
@@ -127,7 +127,7 @@ class SharedConfiguration {
}
}
- private static Provider<String> provider(ProviderFactory providers, Provider<Properties> properties, String propertyName, String gradlePropertyName, String envVarName) {
+ private Provider<String> provider(ProviderFactory providers, Provider<Properties> properties, String propertyName, String gradlePropertyName, String envVarName) {
return providers.gradleProperty(gradlePropertyName).forUseAtConfigurationTime()
.orElse(providers.environmentVariable(envVarName).forUseAtConfigurationTime())
.orElse(properties.map { it.getProperty(propertyName) })