[Git][java-team/gradle][master] 4 commits: Fixed the build failure with Guava 29
Emmanuel Bourg
gitlab at salsa.debian.org
Wed May 27 23:35:25 BST 2020
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / gradle
Commits:
292cbc9e by Emmanuel Bourg at 2020-05-28T00:26:35+02:00
Fixed the build failure with Guava 29
- - - - -
0013cd22 by Emmanuel Bourg at 2020-05-28T00:26:41+02:00
Standards-Version updated to 4.5.0
- - - - -
9be336be by Emmanuel Bourg at 2020-05-28T00:27:40+02:00
Switch to debhelper level 12
- - - - -
da78f28c by Emmanuel Bourg at 2020-05-28T00:29:53+02:00
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/guava-compatibility.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+gradle (4.4.1-11) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the build failure with Guava 29
+ * Standards-Version updated to 4.5.0
+ * Switch to debhelper level 12
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 28 May 2020 00:29:47 +0200
+
gradle (4.4.1-10) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Section: java
Priority: optional
Build-Depends: ant,
bnd (>= 3.5.0),
- debhelper (>= 11),
+ debhelper-compat (= 12),
default-jdk-doc,
default-jdk (>= 2:1.9),
dh-exec,
@@ -68,7 +68,7 @@ Build-Depends: ant,
libxerces2-java,
maven-repo-helper,
testng
-Standards-Version: 4.3.0
+Standards-Version: 4.5.0
Vcs-Git: https://salsa.debian.org/java-team/gradle.git
Vcs-Browser: https://salsa.debian.org/java-team/gradle
Homepage: https://gradle.org
=====================================
debian/patches/guava-compatibility.patch
=====================================
@@ -0,0 +1,216 @@
+Description: Fixes the compatibility with the recent versions of Guava.
+ Source level must be 1.8 or higher to use the updated predicates in Guava.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/subprojects/model-core/model-core.gradle
++++ b/subprojects/model-core/model-core.gradle
+@@ -19,7 +19,7 @@
+ */
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = 1.8
+
+ dependencies {
+ api project(':baseServices')
+--- a/subprojects/base-services-groovy/src/main/java/org/gradle/groovy/scripts/internal/AstUtils.java
++++ b/subprojects/base-services-groovy/src/main/java/org/gradle/groovy/scripts/internal/AstUtils.java
+@@ -16,7 +16,7 @@
+
+ package org.gradle.groovy.scripts.internal;
+
+-import com.google.common.base.Predicate;
++import java.util.function.Predicate;
+ import org.codehaus.groovy.ast.ClassHelper;
+ import org.codehaus.groovy.ast.ClassNode;
+ import org.codehaus.groovy.ast.GroovyCodeVisitor;
+@@ -191,7 +191,7 @@
+ @Nullable
+ public static ScriptBlock detectScriptBlock(Statement statement, Predicate<? super ScriptBlock> predicate) {
+ ScriptBlock scriptBlock = detectScriptBlock(statement);
+- if (scriptBlock != null && predicate.apply(scriptBlock)) {
++ if (scriptBlock != null && predicate.test(scriptBlock)) {
+ return scriptBlock;
+ } else {
+ return null;
+@@ -201,7 +201,7 @@
+ @Nullable
+ public static ScriptBlock detectScriptBlock(Statement statement, final Collection<String> names) {
+ return detectScriptBlock(statement, new Predicate<ScriptBlock>() {
+- public boolean apply(ScriptBlock input) {
++ public boolean test(ScriptBlock input) {
+ return names.contains(input.getName());
+ }
+ });
+--- a/subprojects/reporting/reporting.gradle
++++ b/subprojects/reporting/reporting.gradle
+@@ -1,6 +1,6 @@
+ apply plugin: 'javascript-base'
+
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.8
+
+ configurations {
+ reports
+--- a/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/builder/DependencyGraphBuilder.java
++++ b/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/builder/DependencyGraphBuilder.java
+@@ -15,7 +15,7 @@
+ */
+ package org.gradle.api.internal.artifacts.ivyservice.resolveengine.graph.builder;
+
+-import com.google.common.base.Predicate;
++import java.util.function.Predicate;
+ import com.google.common.base.Predicates;
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
+@@ -202,7 +202,7 @@
+
+ if (allSelectorsAgreeWith(moduleSelectors, version, new Predicate<SelectorState>() {
+ @Override
+- public boolean apply(@Nullable SelectorState input) {
++ public boolean test(@Nullable SelectorState input) {
+ return !selectedBy.contains(input);
+ }
+ })) {
+@@ -375,7 +375,7 @@
+ private static boolean allSelectorsAgreeWith(Collection<SelectorState> allSelectors, String version, Predicate<SelectorState> filter) {
+ boolean atLeastOneAgrees = false;
+ for (SelectorState selectorState : allSelectors) {
+- if (filter.apply(selectorState)) {
++ if (filter.test(selectorState)) {
+ ResolvedVersionConstraint versionConstraint = selectorState.getVersionConstraint();
+ if (versionConstraint != null) {
+ VersionSelector candidateSelector = versionConstraint.getPreferredSelector();
+--- a/subprojects/plugin-use/plugin-use.gradle
++++ b/subprojects/plugin-use/plugin-use.gradle
+@@ -14,6 +14,8 @@
+ * limitations under the License.
+ */
+
++sourceCompatibility = 1.8
++
+ dependencies {
+ compile project(":core")
+ compile project(":dependencyManagement")
+--- a/subprojects/platform-base/platform-base.gradle
++++ b/subprojects/platform-base/platform-base.gradle
+@@ -1,4 +1,4 @@
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.8
+
+ dependencies {
+ compile libraries.groovy
+--- a/subprojects/diagnostics/diagnostics.gradle
++++ b/subprojects/diagnostics/diagnostics.gradle
+@@ -15,7 +15,7 @@
+ */
+ apply plugin: 'java-library'
+
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.8
+
+ dependencies {
+ api libraries.groovy
+--- a/subprojects/testing-base/testing-base.gradle
++++ b/subprojects/testing-base/testing-base.gradle
+@@ -14,7 +14,7 @@
+ * limitations under the License.
+ */
+ // Test execution
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.8
+
+ dependencies {
+ compile project(':core')
+--- a/subprojects/platform-jvm/platform-jvm.gradle
++++ b/subprojects/platform-jvm/platform-jvm.gradle
+@@ -1,4 +1,4 @@
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.8
+
+ dependencies {
+ compile project(":platformBase")
+--- a/subprojects/language-java/language-java.gradle
++++ b/subprojects/language-java/language-java.gradle
+@@ -1,5 +1,5 @@
+ // Compiler daemon
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.8
+
+ dependencies {
+ compile libraries.groovy
+--- a/subprojects/language-scala/language-scala.gradle
++++ b/subprojects/language-scala/language-scala.gradle
+@@ -1,6 +1,6 @@
+
+ // Compiler daemon
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.8
+
+ dependencies {
+ compile project(":core")
+--- a/subprojects/ide/ide.gradle
++++ b/subprojects/ide/ide.gradle
+@@ -14,6 +14,8 @@
+ * limitations under the License.
+ */
+
++sourceCompatibility = 1.8
++
+ sourceSets.main.java.srcDirs = []
+ sourceSets.main.groovy.srcDirs = ['src/main/java', 'src/main/groovy']
+
+--- a/subprojects/javascript/javascript.gradle
++++ b/subprojects/javascript/javascript.gradle
+@@ -14,6 +14,8 @@
+ * limitations under the License.
+ */
+
++sourceCompatibility = 1.8
++
+ dependencies {
+ compile libraries.groovy
+
+--- a/subprojects/jacoco/jacoco.gradle
++++ b/subprojects/jacoco/jacoco.gradle
+@@ -15,6 +15,7 @@
+ */
+
+
++sourceCompatibility = 1.8
+
+ dependencies {
+ compile libraries.groovy
+--- a/subprojects/maven/maven.gradle
++++ b/subprojects/maven/maven.gradle
+@@ -14,6 +14,8 @@
+ * limitations under the License.
+ */
+
++sourceCompatibility = 1.8
++
+ dependencies {
+ compile libraries.groovy
+
+--- a/subprojects/language-native/language-native.gradle
++++ b/subprojects/language-native/language-native.gradle
+@@ -14,6 +14,8 @@
+ * limitations under the License.
+ */
+
++sourceCompatibility = 1.8
++
+ dependencies {
+ compile project(':core')
+ compile project(':platformNative')
+--- a/subprojects/signing/signing.gradle
++++ b/subprojects/signing/signing.gradle
+@@ -14,6 +14,8 @@
+ * limitations under the License.
+ */
+
++sourceCompatibility = 1.8
++
+ dependencies {
+ compile libraries.groovy
+
=====================================
debian/patches/series
=====================================
@@ -28,3 +28,4 @@ java11-compatibility.patch
asm7.patch
ivy-artifact-backport.patch
fix-CVE-2019-11065.patch
+guava-compatibility.patch
View it on GitLab: https://salsa.debian.org/java-team/gradle/-/compare/e349aa3a758ba758936c445ade262d874b7231be...da78f28c4c3a3e888df5d731c0fac7a37f7b8cd9
--
View it on GitLab: https://salsa.debian.org/java-team/gradle/-/compare/e349aa3a758ba758936c445ade262d874b7231be...da78f28c4c3a3e888df5d731c0fac7a37f7b8cd9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200527/5d1e4497/attachment.html>
More information about the pkg-java-commits
mailing list