Merge branch 'release'

foreveremain · Jul 3, 2018 · 5a776b3 · 5a776b3
2 parents 8e4e5fe + fe39671
commit 5a776b3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-4.9-20180624235932+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/subprojects/core/src/main/java/org/gradle/api/internal/file/AbstractFileCollection.java b/subprojects/core/src/main/java/org/gradle/api/internal/file/AbstractFileCollection.java
@@ -17,7 +17,6 @@
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterators;
-import com.google.common.collect.Sets;
 import groovy.lang.Closure;
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
@@ -33,6 +32,7 @@
 import org.gradle.api.specs.Specs;
 import org.gradle.api.tasks.StopExecutionException;
 import org.gradle.api.tasks.TaskDependency;
+import org.gradle.util.CollectionUtils;
 import org.gradle.util.DeprecationLogger;
 import org.gradle.util.GUtil;
 
@@ -258,7 +258,7 @@ public TaskDependency getBuildDependencies() {
 
             @Override
             public Set<File> getFiles() {
-                return Sets.filter(AbstractFileCollection.this.getFiles(), predicate);
+                return CollectionUtils.filter(AbstractFileCollection.this, new LinkedHashSet<File>(), filterSpec);
             }
 
             @Override

diff --git a/subprojects/docs/src/docs/release/release-features.txt b/subprojects/docs/src/docs/release/release-features.txt
@@ -0,0 +1,3 @@
+ - Experimental APIs for creating and configuring tasks lazily
+ - Pass arguments to JavaExec via CLI
+ - Improved dependency insight report