diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index fcc7b56cfa085..4b6667adfadfc 100755 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -54,7 +54,7 @@ libraries.fastutil = [coordinates: 'it.unimi.dsi:fastutil', version: libraries.gcs = [coordinates: 'com.google.apis:google-api-services-storage', version: 'v1-rev136-1.25.0'] libraries.groovy = [coordinates: 'org.gradle.groovy:groovy-all', version: gradleGroovyVersion, because: 'emulating the Groovy 2.4-style groovy-all.jar, see https://github.com/gradle/gradle-groovy-all'] libraries.gson = [coordinates: 'com.google.code.gson:gson', version: '2.8.5'] -libraries.guava = [coordinates: 'com.google.guava:guava', version: '26.0-jre'] +libraries.guava = [coordinates: 'com.google.guava:guava', version: '26.0-android', because: 'android variant is compatible with JDK 7'] libraries.inject = [coordinates: 'javax.inject:javax.inject', version: '1'] libraries.ivy = [coordinates: 'org.apache.ivy:ivy', version: '2.3.0', because: '2.4.0 contains a breaking change in DefaultModuleDescriptor.getExtraInfo(), cf. https://issues.apache.org/jira/browse/IVY-1457'] diff --git 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 index d61fcbd3352f5..cf8f2370b7d24 100644 --- 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 @@ -201,16 +201,9 @@ public static ScriptBlock detectScriptBlock(Statement statement, Predicate names) { return detectScriptBlock(statement, new Predicate() { - @Override public boolean apply(ScriptBlock input) { return names.contains(input.getName()); } - - @Override - // Added for Java 6 source compatibility - public boolean test(ScriptBlock input) { - return apply(input); - } }); } diff --git a/subprojects/base-services/src/main/java/org/gradle/internal/Actions.java b/subprojects/base-services/src/main/java/org/gradle/internal/Actions.java index 33e047030d457..2aa4b7fc6d435 100644 --- a/subprojects/base-services/src/main/java/org/gradle/internal/Actions.java +++ b/subprojects/base-services/src/main/java/org/gradle/internal/Actions.java @@ -37,12 +37,6 @@ public abstract class Actions { public boolean apply(@Nullable Action input) { return input != DO_NOTHING; } - - @Override - // Added for Java 6 source compatibility - public boolean test(@Nullable Action input) { - return apply(input); - } }; /** diff --git a/subprojects/base-services/src/main/java/org/gradle/internal/work/DefaultWorkerLeaseService.java b/subprojects/base-services/src/main/java/org/gradle/internal/work/DefaultWorkerLeaseService.java index 1bdb48908b505..512e081621911 100644 --- a/subprojects/base-services/src/main/java/org/gradle/internal/work/DefaultWorkerLeaseService.java +++ b/subprojects/base-services/src/main/java/org/gradle/internal/work/DefaultWorkerLeaseService.java @@ -16,6 +16,7 @@ package org.gradle.internal.work; +import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import org.gradle.api.Action; @@ -43,6 +44,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -202,12 +204,12 @@ public void run() { } private boolean containsProjectLocks(Iterable locks) { - for (ResourceLock lock : locks) { - if (lock instanceof ProjectLock) { - return true; + return Iterables.any(locks, new Predicate() { + @Override + public boolean apply(@Nullable ResourceLock lock) { + return lock instanceof ProjectLock; } - } - return false; + }); } private Iterable locksNotHeld(final Iterable locks) { diff --git a/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalInputsIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalInputsIntegrationTest.groovy index 9b11ea6a09df7..15b694f4e06fa 100644 --- a/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalInputsIntegrationTest.groovy +++ b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalInputsIntegrationTest.groovy @@ -229,11 +229,10 @@ class IncrementalInputsIntegrationTest extends AbstractIncrementalTasksIntegrati """ file("input").createDir() - def inputPath = file('input').absolutePath expect: fails("myTask") - failureHasCause("Multiple entries with same value: inputTwo=$inputPath and inputOne=$inputPath") + failureHasCause("Multiple entries with same key: ${file('input').absolutePath}=inputTwo and ${file('input').absolutePath}=inputOne") } def "two incremental file properties can point to the same file"() { diff --git a/subprojects/core/src/main/java/org/gradle/api/internal/plugins/DefaultPluginContainer.java b/subprojects/core/src/main/java/org/gradle/api/internal/plugins/DefaultPluginContainer.java index 25ef24cbb98d3..4aabf86145b14 100644 --- a/subprojects/core/src/main/java/org/gradle/api/internal/plugins/DefaultPluginContainer.java +++ b/subprojects/core/src/main/java/org/gradle/api/internal/plugins/DefaultPluginContainer.java @@ -103,16 +103,9 @@ public boolean hasPlugin(Class type) { private Plugin doFindPlugin(String id) { for (final PluginManagerInternal.PluginWithId pluginWithId : pluginManager.pluginsForId(id)) { Plugin plugin = Iterables.tryFind(DefaultPluginContainer.this, new Predicate() { - @Override public boolean apply(Plugin plugin) { return pluginWithId.clazz.equals(plugin.getClass()); } - - @Override - // Added for Java 6 source compatibility - public boolean test(Plugin input) { - return apply(input); - } }).orNull(); if (plugin != null) { diff --git a/subprojects/core/src/main/java/org/gradle/api/internal/tasks/properties/DefaultTaskProperties.java b/subprojects/core/src/main/java/org/gradle/api/internal/tasks/properties/DefaultTaskProperties.java index ec281e27810e2..169cdc603fea9 100644 --- a/subprojects/core/src/main/java/org/gradle/api/internal/tasks/properties/DefaultTaskProperties.java +++ b/subprojects/core/src/main/java/org/gradle/api/internal/tasks/properties/DefaultTaskProperties.java @@ -125,12 +125,6 @@ public void visitContents(FileCollectionResolveContext context) { public boolean apply(InputFilePropertySpec property) { return property.isSkipWhenEmpty(); } - - @Override - // Added for Java 6 source compatibility - public boolean test(@Nullable InputFilePropertySpec input) { - return apply(input); - } }); this.outputFiles = new CompositeFileCollection() { @Override diff --git a/subprojects/core/src/main/java/org/gradle/execution/plan/DefaultExecutionPlan.java b/subprojects/core/src/main/java/org/gradle/execution/plan/DefaultExecutionPlan.java index d727aa625dc11..a63461e964b20 100644 --- a/subprojects/core/src/main/java/org/gradle/execution/plan/DefaultExecutionPlan.java +++ b/subprojects/core/src/main/java/org/gradle/execution/plan/DefaultExecutionPlan.java @@ -400,12 +400,6 @@ private void removeShouldRunAfterSuccessorsIfTheyImposeACycle(final HashMultimap public boolean apply(Node input) { return visitingNodes.containsEntry(input, nodeWithVisitingSegment.visitingSegment); } - - @Override - // Added for Java 6 source compatibility - public boolean test(@Nullable Node input) { - return apply(input); - } }); } @@ -444,12 +438,6 @@ public Integer transform(final Node dependsOnTask) { public boolean apply(NodeInVisitingSegment nodeInVisitingSegment) { return nodeInVisitingSegment.node.equals(dependsOnTask); } - - @Override - // Added for Java 6 source compatibility - public boolean test(@Nullable NodeInVisitingSegment input) { - return apply(input); - } }); } }); diff --git a/subprojects/core/src/main/java/org/gradle/internal/filewatch/jdk7/WatchPointsRegistry.java b/subprojects/core/src/main/java/org/gradle/internal/filewatch/jdk7/WatchPointsRegistry.java index 231fcb6ea355c..543d38a776994 100644 --- a/subprojects/core/src/main/java/org/gradle/internal/filewatch/jdk7/WatchPointsRegistry.java +++ b/subprojects/core/src/main/java/org/gradle/internal/filewatch/jdk7/WatchPointsRegistry.java @@ -121,12 +121,6 @@ public File apply(File input) { public boolean apply(File input) { return inCombinedRootsOrAncestorOfAnyRoot(input, roots, unfiltered); } - - @Override - // Added for Java 6 source compatibility - public boolean test(File input) { - return apply(input); - } }); } diff --git a/subprojects/core/src/testFixtures/groovy/org/gradle/internal/operations/TestBuildOperationExecutor.java b/subprojects/core/src/testFixtures/groovy/org/gradle/internal/operations/TestBuildOperationExecutor.java index 14da9211a9a72..3f119819e4541 100644 --- a/subprojects/core/src/testFixtures/groovy/org/gradle/internal/operations/TestBuildOperationExecutor.java +++ b/subprojects/core/src/testFixtures/groovy/org/gradle/internal/operations/TestBuildOperationExecutor.java @@ -173,12 +173,6 @@ public > List> all(fi public boolean apply(Record input) { return detailsType.isInstance(input.descriptor.getDetails()); } - - @Override - // Added for Java 6 source compatibility - public boolean test(Record input) { - return apply(input); - } }) .transform(new Function>() { @Override diff --git a/subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependents/internal/DependentComponentsGraphRenderer.java b/subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependents/internal/DependentComponentsGraphRenderer.java index 496ac6314b3d6..159ca61323c66 100644 --- a/subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependents/internal/DependentComponentsGraphRenderer.java +++ b/subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependents/internal/DependentComponentsGraphRenderer.java @@ -24,7 +24,6 @@ import org.gradle.internal.graph.GraphRenderer; import org.gradle.internal.logging.text.StyledTextOutput; -import javax.annotation.Nullable; import java.util.Set; import static org.gradle.internal.logging.text.StyledTextOutput.Style.Info; @@ -128,11 +127,5 @@ public boolean apply(RenderableDependency node) { } return false; } - - @Override - // Added for Java 6 source compatibility - public boolean test(@Nullable RenderableDependency input) { - return apply(input); - } } } diff --git a/subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependents/internal/DependentComponentsRenderableDependency.java b/subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependents/internal/DependentComponentsRenderableDependency.java index aa2ffb370d529..50d8cd5fe8fc7 100644 --- a/subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependents/internal/DependentComponentsRenderableDependency.java +++ b/subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependents/internal/DependentComponentsRenderableDependency.java @@ -54,12 +54,6 @@ public static DependentComponentsRenderableDependency of(ComponentSpec component public boolean apply(BinarySpec binarySpec) { return binarySpec.isBuildable(); } - - @Override - // Added for Java 6 source compatibility - public boolean test(BinarySpec input) { - return apply(input); - } }); } boolean testSuite = false; diff --git a/subprojects/diagnostics/src/main/java/org/gradle/api/reporting/model/internal/ModelNodeRenderer.java b/subprojects/diagnostics/src/main/java/org/gradle/api/reporting/model/internal/ModelNodeRenderer.java index 94751da42f5cf..577351f2c3d52 100644 --- a/subprojects/diagnostics/src/main/java/org/gradle/api/reporting/model/internal/ModelNodeRenderer.java +++ b/subprojects/diagnostics/src/main/java/org/gradle/api/reporting/model/internal/ModelNodeRenderer.java @@ -34,9 +34,7 @@ import java.util.Map; import java.util.TreeMap; -import static org.gradle.internal.logging.text.StyledTextOutput.Style.Description; -import static org.gradle.internal.logging.text.StyledTextOutput.Style.Identifier; -import static org.gradle.internal.logging.text.StyledTextOutput.Style.Normal; +import static org.gradle.internal.logging.text.StyledTextOutput.Style.*; public class ModelNodeRenderer extends ReportRenderer { @@ -170,12 +168,6 @@ static Iterable uniqueExecutedRulesExcludingCreator(final M public boolean apply(ModelRuleDescriptor input) { return !input.equals(model.getDescriptor()); } - - @Override - // Added for Java 6 source compatibility - public boolean test(ModelRuleDescriptor input) { - return apply(input); - } }); return ImmutableSet.copyOf(filtered); } diff --git a/subprojects/distributions/src/integTest/groovy/org/gradle/DistributionIntegritySpec.groovy b/subprojects/distributions/src/integTest/groovy/org/gradle/DistributionIntegritySpec.groovy index 84b7e1ab004dd..8d7cbb00da54b 100644 --- a/subprojects/distributions/src/integTest/groovy/org/gradle/DistributionIntegritySpec.groovy +++ b/subprojects/distributions/src/integTest/groovy/org/gradle/DistributionIntegritySpec.groovy @@ -47,7 +47,7 @@ class DistributionIntegritySpec extends DistributionIntegrationSpec { 'commons-io-2.6.jar' : 'f877d304660ac2a142f3865badfc971dec7ed73c747c7f8d5d2f5139ca736513', 'commons-lang-2.6.jar' : '50f11b09f877c294d56f24463f47d28f929cf5044f648661c0f0cfbae9a2f49c', 'groovy-all-1.0-2.5.4.jar' : '704d3307616c57234871c4db3a355c3e81ea975db8dac8ee6c9264b91c74d2b7', - 'guava-26.0-jre.jar' : 'a0e9cabad665bc20bcd2b01f108e5fc03f756e13aea80abaadb9f407033bea2c', + 'guava-26.0-android.jar' : '1d044ebb866ef08b7d04e998b4260c9b52fab6e6d6b68d207859486bb3686cd5', 'jansi-1.17.1.jar' : 'b2234bfb0d8f245562d64ed9325df6b907093f4daa702c9082d4796db2a2d894', 'javax.inject-1.jar' : '91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff', 'jcl-over-slf4j-1.7.25.jar' : '5e938457e79efcbfb3ab64bc29c43ec6c3b95fffcda3c155f4a86cc320c11e14', diff --git a/subprojects/files/src/main/java/org/gradle/api/internal/file/AbstractFileCollection.java b/subprojects/files/src/main/java/org/gradle/api/internal/file/AbstractFileCollection.java index 79c9952d90170..1c6315dbdd915 100644 --- a/subprojects/files/src/main/java/org/gradle/api/internal/file/AbstractFileCollection.java +++ b/subprojects/files/src/main/java/org/gradle/api/internal/file/AbstractFileCollection.java @@ -15,7 +15,8 @@ */ package org.gradle.api.internal.file; -import com.google.common.collect.AbstractIterator; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterators; import groovy.lang.Closure; import org.apache.commons.lang.StringUtils; import org.gradle.api.file.FileCollection; @@ -31,6 +32,7 @@ import org.gradle.util.CollectionUtils; import org.gradle.util.GUtil; +import javax.annotation.Nullable; import java.io.File; import java.util.ArrayList; import java.util.Collection; @@ -188,6 +190,12 @@ public FileCollection filter(Closure filterClosure) { @Override public FileCollection filter(final Spec filterSpec) { + final Predicate predicate = new Predicate() { + @Override + public boolean apply(@Nullable File input) { + return filterSpec.isSatisfiedBy(input); + } + }; return new AbstractFileCollection() { @Override public String getDisplayName() { @@ -206,24 +214,12 @@ public Set getFiles() { @Override public boolean contains(File file) { - return AbstractFileCollection.this.contains(file) && filterSpec.isSatisfiedBy(file); + return AbstractFileCollection.this.contains(file) && predicate.apply(file); } @Override public Iterator iterator() { - final Iterator delegate = AbstractFileCollection.this.iterator(); - return new AbstractIterator() { - @Override - protected File computeNext() { - while (delegate.hasNext()) { - File element = delegate.next(); - if (filterSpec.isSatisfiedBy(element)) { - return element; - } - } - return endOfData(); - } - }; + return Iterators.filter(AbstractFileCollection.this.iterator(), predicate); } }; } diff --git a/subprojects/files/src/main/java/org/gradle/api/internal/file/AntFileCollectionMatchingTaskBuilder.java b/subprojects/files/src/main/java/org/gradle/api/internal/file/AntFileCollectionMatchingTaskBuilder.java index 22c821e798331..92934a1ce536d 100644 --- a/subprojects/files/src/main/java/org/gradle/api/internal/file/AntFileCollectionMatchingTaskBuilder.java +++ b/subprojects/files/src/main/java/org/gradle/api/internal/file/AntFileCollectionMatchingTaskBuilder.java @@ -20,10 +20,10 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.Lists; import groovy.lang.Closure; -import org.gradle.api.internal.file.collections.DirectoryFileTree; -import org.gradle.api.tasks.AntBuilderAware; import org.gradle.internal.metaobject.BeanDynamicObject; import org.gradle.internal.metaobject.DynamicObject; +import org.gradle.api.internal.file.collections.DirectoryFileTree; +import org.gradle.api.tasks.AntBuilderAware; import java.util.Collections; @@ -46,12 +46,6 @@ public Object addToAntBuilder(final Object node, final String childNodeName) { public boolean apply(DirectoryFileTree input) { return input.getDir().exists(); } - - @Override - // Added for Java 6 source compatibility - public boolean test(DirectoryFileTree input) { - return apply(input); - } }) ); diff --git a/subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/ApiGroovyCompiler.java b/subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/ApiGroovyCompiler.java index 3a3602345961e..e7584944d47b4 100644 --- a/subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/ApiGroovyCompiler.java +++ b/subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/ApiGroovyCompiler.java @@ -44,7 +44,6 @@ import org.gradle.language.base.internal.compile.Compiler; import org.gradle.util.VersionNumber; -import javax.annotation.Nullable; import java.io.File; import java.io.Serializable; import java.lang.reflect.Method; @@ -164,12 +163,6 @@ public void compile(List files, CompilationUnit cu) { public boolean apply(File file) { return hasExtension(file, ".java"); } - - @Override - // Added for Java 6 source compatibility - public boolean test(@Nullable File input) { - return apply(input); - } })); try { diff --git a/subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/NormalizingGroovyCompiler.java b/subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/NormalizingGroovyCompiler.java index 1bd3dfd880a89..27d29bff7349f 100644 --- a/subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/NormalizingGroovyCompiler.java +++ b/subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/NormalizingGroovyCompiler.java @@ -28,7 +28,6 @@ import org.gradle.language.base.internal.compile.Compiler; import org.gradle.util.CollectionUtils; -import javax.annotation.Nullable; import java.io.File; import java.util.List; @@ -72,12 +71,6 @@ public boolean apply(File element) { } return false; } - - @Override - // Added for Java 6 source compatibility - public boolean test(@Nullable File input) { - return apply(input); - } }); spec.setSourceFiles(ImmutableSet.copyOf(filtered)); diff --git a/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/NormalizingJavaCompiler.java b/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/NormalizingJavaCompiler.java index 7a9bf508a3634..d28762120e1fd 100644 --- a/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/NormalizingJavaCompiler.java +++ b/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/NormalizingJavaCompiler.java @@ -60,12 +60,6 @@ private void resolveAndFilterSourceFiles(JavaCompileSpec spec) { public boolean apply(@Nullable File input) { return hasExtension(input, ".java"); } - - @Override - // Added for Java 6 source compatibility - public boolean test(@Nullable File input) { - return apply(input); - } }); spec.setSourceFiles(ImmutableSet.copyOf(javaOnly)); diff --git a/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/asm/ClassRelevancyFilter.java b/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/asm/ClassRelevancyFilter.java index aa16809829bc4..d14f3a1829c81 100644 --- a/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/asm/ClassRelevancyFilter.java +++ b/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/asm/ClassRelevancyFilter.java @@ -41,16 +41,9 @@ public ClassRelevancyFilter(String excludedClassName) { this.excludedClassName = excludedClassName; } - @Override public boolean apply(String className) { return !className.startsWith("java.") && !excludedClassName.equals(className) && !PRIMITIVES.contains(className); } - - @Override - // Added for Java 6 source compatibility - public boolean test(String input) { - return apply(input); - } } diff --git a/subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/LocalLibraryDependencyResolver.java b/subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/LocalLibraryDependencyResolver.java index a65d7c63f023a..001af7d81153b 100644 --- a/subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/LocalLibraryDependencyResolver.java +++ b/subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/LocalLibraryDependencyResolver.java @@ -89,20 +89,8 @@ public boolean apply(VariantComponent input) { public boolean apply(Binary input) { return binaryType.isAssignableFrom(input.getClass()); } - - @Override - // Added for Java 6 source compatibility - public boolean test(Binary input) { - return apply(input); - } }); } - - @Override - // Added for Java 6 source compatibility - public boolean test(VariantComponent input) { - return apply(input); - } }; } diff --git a/subprojects/platform-base/src/main/java/org/gradle/model/internal/core/DomainObjectCollectionBackedModelMap.java b/subprojects/platform-base/src/main/java/org/gradle/model/internal/core/DomainObjectCollectionBackedModelMap.java index 772ab468488be..134755f19829c 100644 --- a/subprojects/platform-base/src/main/java/org/gradle/model/internal/core/DomainObjectCollectionBackedModelMap.java +++ b/subprojects/platform-base/src/main/java/org/gradle/model/internal/core/DomainObjectCollectionBackedModelMap.java @@ -109,12 +109,6 @@ public HasNamePredicate(String name, org.gradle.api.Namer namer) { public boolean apply(@Nullable T input) { return namer.determineName(input).equals(name); } - - @Override - // Added for Java 6 source compatibility - public boolean test(@Nullable T input) { - return apply(input); - } } private static class ToName implements Function { diff --git a/subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/ModelMapBasedRule.java b/subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/ModelMapBasedRule.java index 6ee1d515d594c..bbba1a12c2516 100644 --- a/subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/ModelMapBasedRule.java +++ b/subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/ModelMapBasedRule.java @@ -46,12 +46,6 @@ public ModelMapBasedRule(ModelReference subject, final ModelType public boolean apply(ModelReference element) { return element.getType().equals(baseType); } - - @Override - // Added for Java 6 source compatibility - public boolean test(ModelReference input) { - return apply(input); - } }); } @@ -61,12 +55,6 @@ private static ImmutableList> calculateInputs(final ModelType< public boolean apply(ModelReference element) { return !element.getType().equals(baseType); } - - @Override - // Added for Java 6 source compatibility - public boolean test(ModelReference input) { - return apply(input); - } }); ImmutableList.Builder> allInputs = ImmutableList.builder(); diff --git a/subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/DefaultVariantsMetaData.java b/subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/DefaultVariantsMetaData.java index bd7fc8af9bbee..745ba79cfb5b9 100644 --- a/subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/DefaultVariantsMetaData.java +++ b/subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/DefaultVariantsMetaData.java @@ -45,12 +45,6 @@ private DefaultVariantsMetaData(Map variantCoordinates, Map input) { return input.getValue()!=null; } - - @Override - // Added for Java 6 source compatibility - public boolean test(Map.Entry input) { - return apply(input); - } }).keySet()); this.variantAxisTypes = variantAxisTypes; } diff --git a/subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/junit/result/AggregateTestResultsProvider.java b/subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/junit/result/AggregateTestResultsProvider.java index 50f2d5a1613eb..0b2d3cc6494d7 100644 --- a/subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/junit/result/AggregateTestResultsProvider.java +++ b/subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/junit/result/AggregateTestResultsProvider.java @@ -102,16 +102,9 @@ public boolean hasOutput(long id, final TestOutputEvent.Destination destination) return Iterables.any( classOutputProviders.get(id), new Predicate() { - @Override public boolean apply(DelegateProvider delegateProvider) { return delegateProvider.provider.hasOutput(delegateProvider.id, destination); } - - @Override - // Added for Java 6 source compatibility - public boolean test(DelegateProvider input) { - return apply(input); - } }); } diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/ToolingApiClasspathIntegrationTest.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/ToolingApiClasspathIntegrationTest.groovy index d8c9bf5a06258..96004007d7508 100644 --- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/ToolingApiClasspathIntegrationTest.groovy +++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/ToolingApiClasspathIntegrationTest.groovy @@ -30,7 +30,7 @@ class ToolingApiClasspathIntegrationTest extends AbstractIntegrationSpec { then: resolve.classpath.size() == 2 resolve.classpath.any {it.name ==~ /slf4j-api-.*\.jar/} - resolve.classpath.find { it.name ==~ /gradle-tooling-api.*\.jar/ }.size() < 2.05 * 1024 * 1024 + resolve.classpath.find { it.name ==~ /gradle-tooling-api.*\.jar/ }.size() < 1.86 * 1024 * 1024 cleanup: resolver.stop()