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/04/14 09:36:19 UTC
[groovy] branch GROOVY_4_0_X updated (246f11fbee -> e5f0da0fe8)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
from 246f11fbee GROOVY-10580: Conditionally initialized `final` variables considered maybe uninitialized
new 1e8b1f4bb9 commented out options for checking warnings
new e5f0da0fe8 remove duplicate entries in jars warnings
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 3 ++-
.../src/main/groovy/org.apache.groovy-base.gradle | 27 +++++++++++-----------
.../main/groovy/org.apache.groovy-internal.gradle | 3 +++
3 files changed, 19 insertions(+), 14 deletions(-)
[groovy] 01/02: commented out options for checking warnings
Posted by pa...@apache.org.
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 1e8b1f4bb9d9c7350aa77d9a53527ed64dd6c89c
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Apr 14 13:55:25 2022 +1000
commented out options for checking warnings
---
buildSrc/src/main/groovy/org.apache.groovy-internal.gradle | 3 +++
1 file changed, 3 insertions(+)
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-internal.gradle b/buildSrc/src/main/groovy/org.apache.groovy-internal.gradle
index 21fcf9b82f..f538b42bb7 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-internal.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-internal.gradle
@@ -71,6 +71,9 @@ dependencies {
tasks.withType(AbstractCompile).configureEach {
options.encoding = 'UTF-8'
+// options.compilerArgs << '-Xlint:unchecked'
+// options.compilerArgs << '-Xlint:deprecation'
+// options.compilerArgs << '-Xlint:-options'
}
tasks.withType(GroovyCompile).configureEach {
[groovy] 02/02: remove duplicate entries in jars warnings
Posted by pa...@apache.org.
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 e5f0da0fe8b57e388dcf86f1d1cfaa417cd7697f
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Apr 14 19:11:50 2022 +1000
remove duplicate entries in jars warnings
---
build.gradle | 3 ++-
.../src/main/groovy/org.apache.groovy-base.gradle | 27 +++++++++++-----------
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/build.gradle b/build.gradle
index 18246e15f2..66164b88ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -183,7 +183,7 @@ configurations {
allprojects {
tasks.withType(AbstractCopyTask).configureEach {
- it.duplicatesStrategy = DuplicatesStrategy.WARN
+ it.duplicatesStrategy = DuplicatesStrategy.FAIL
}
}
@@ -198,6 +198,7 @@ tasks.named('jar') {
from("$projectDir/notices/NOTICE-JARJAR")
rename '^([A-Z]+)-([^.]*)', '$1'
}
+ exclude '**/package-info.class'
}
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-base.gradle b/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
index 2f1ef85ba0..06b3719779 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
@@ -149,25 +149,26 @@ tasks.withType(AbstractArchiveTask) {
reproducibleFileOrder = true
}
-tasks.withType(Jar).configureEach {
+tasks.withType(Jar).configureEach {jar ->
metaInf {
- if (file("${projectDir}/LICENSE").exists()) {
- from "${projectDir}/LICENSE"
- } else {
- from("${rootProject.projectDir}/licenses/LICENSE-BASE") {
- rename 'LICENSE-BASE', 'LICENSE'
+ if (jar.name == 'sourcesJar') {
+ if (file("${projectDir}/LICENSE").exists()) {
+ from "${projectDir}/LICENSE"
+ } else {
+ from("${rootProject.projectDir}/licenses/LICENSE-BASE") {
+ rename 'LICENSE-BASE', 'LICENSE'
+ }
}
- }
- if (file("${projectDir}/NOTICE").exists()) {
- from "${projectDir}/NOTICE"
- } else {
- from("${rootProject.projectDir}/notices/NOTICE-BASE") {
- rename 'NOTICE-BASE', 'NOTICE'
+ if (file("${projectDir}/NOTICE").exists()) {
+ from "${projectDir}/NOTICE"
+ } else {
+ from("${rootProject.projectDir}/notices/NOTICE-BASE") {
+ rename 'NOTICE-BASE', 'NOTICE'
+ }
}
}
from generateReleaseInfo
}
- exclude '**/package-info.class'
}
tasks.register("jarjar", JarJarTask) {