Merge branch 'gradle' into develop

# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
#	gradlew
#	src/test/internal-testing/src/main/groovy/org/gradle/test/fixtures/archive/JarTestFixture.groovy
#	src/test/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/AbstractTestDirectoryProvider.java
#	src/test/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/TestFile.java

Author: dcendents

build.gradle

@@ -16,7 +16,7 @@ repositories {
 }
 
 ext {
-	gradleVersions = '3.0,3.1,3.2,3.2.1,3.3'
+	gradleVersions = '4.0'
 	androidGradleBuildVersion = '2.2.0-beta1'
 	androidCompileSdkVersion = 'android-24'
 	androidBuildToolsVersion = '24.0.0'
@@ -101,7 +101,7 @@ dependencies {
 
 	testCompile	'junit:junit:4.12',
 				'org.hamcrest:hamcrest-all:1.3',
-				'org.codehaus.groovy:groovy-all:2.4.7'
+				'org.codehaus.groovy:groovy-all:2.4.11'
 
 	// from gradle/subprojects/core/core.gradle, gradle/subprojects/internal-testing/internal-testing.gradle and gradle/gradle/dependencies.gradle
 	testCompile	'commons-io:commons-io:2.2',
@@ -214,7 +214,7 @@ jacocoTestReport {
 	reports {
 		xml.enabled true
 		html.enabled true
-		html.destination "${buildDir}/jacocoHtml"
+		html.destination file("${buildDir}/jacocoHtml")
 	}
 }
 
@@ -223,7 +223,7 @@ jacocoTestReport.dependsOn test
 check.dependsOn jacocoTestReport
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.3'
+    gradleVersion = '4.0'
     distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Tue Jan 03 21:54:54 EST 2017
+#Tue Jul 04 23:29:18 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

gradlew

@@ -27,7 +27,7 @@
 import org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer;
 import org.gradle.api.artifacts.maven.MavenPom;
 import org.gradle.api.artifacts.maven.MavenResolver;
-import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier;
+import org.gradle.api.internal.artifacts.ImmutableModuleIdentifierFactory;
 import org.gradle.api.internal.artifacts.Module;
 import org.gradle.api.internal.artifacts.configurations.ConfigurationInternal;
 import org.gradle.api.internal.artifacts.dsl.DefaultRepositoryHandler;
@@ -69,19 +69,22 @@ public class AndroidMavenPlugin implements Plugin<ProjectInternal> {
     private final ProjectConfigurationActionContainer configurationActionContainer;
     private final MavenSettingsProvider mavenSettingsProvider;
     private final LocalMavenRepositoryLocator mavenRepositoryLocator;
+    private final ImmutableModuleIdentifierFactory moduleIdentifierFactory;
 
     private Project project;
 
     @Inject
     public AndroidMavenPlugin(Factory<LoggingManagerInternal> loggingManagerFactory, FileResolver fileResolver,
                        ProjectPublicationRegistry publicationRegistry, ProjectConfigurationActionContainer configurationActionContainer,
-                       MavenSettingsProvider mavenSettingsProvider, LocalMavenRepositoryLocator mavenRepositoryLocator) {
+                       MavenSettingsProvider mavenSettingsProvider, LocalMavenRepositoryLocator mavenRepositoryLocator,
+                       ImmutableModuleIdentifierFactory moduleIdentifierFactory) {
         this.loggingManagerFactory = loggingManagerFactory;
         this.fileResolver = fileResolver;
         this.publicationRegistry = publicationRegistry;
         this.configurationActionContainer = configurationActionContainer;
         this.mavenSettingsProvider = mavenSettingsProvider;
         this.mavenRepositoryLocator = mavenRepositoryLocator;
+        this.moduleIdentifierFactory = moduleIdentifierFactory;
     }
 
     public void apply(final ProjectInternal project) {
@@ -142,6 +145,12 @@ public void execute(WarPlugin warPlugin) {
                 configureWarScopeMappings(project.getConfigurations(), pluginConvention.getConf2ScopeMappings());
             }
         });
+        plugins.withType(JavaLibraryPlugin.class, new Action<JavaLibraryPlugin>() {
+            @Override
+            public void execute(JavaLibraryPlugin javaLibraryPlugin) {
+                configureJavaLibraryScopeMappings(project.getConfigurations(), pluginConvention.getConf2ScopeMappings());
+            }
+        });
     }
 
     private void configureUploadTasks(final DefaultDeployerFactory deployerFactory) {
@@ -167,7 +176,7 @@ public void execute(Project project) {
                 Module module = configuration.getModule();
                 for (MavenResolver resolver : uploadArchives.getRepositories().withType(MavenResolver.class)) {
                     MavenPom pom = resolver.getPom();
-                    ModuleVersionIdentifier publicationId = new DefaultModuleVersionIdentifier(
+                    ModuleVersionIdentifier publicationId = moduleIdentifierFactory.moduleWithVersion(
                             pom.getGroupId().equals(MavenProject.EMPTY_PROJECT_GROUP_ID) ? module.getGroup() : pom.getGroupId(),
                             pom.getArtifactId().equals(MavenProject.EMPTY_PROJECT_ARTIFACT_ID) ? module.getName() : pom.getArtifactId(),
                             pom.getVersion().equals(MavenProject.EMPTY_PROJECT_VERSION) ? module.getVersion() : pom.getVersion()
@@ -195,10 +204,19 @@ private void configureJavaScopeMappings(ConfigurationContainer configurations, C
                 Conf2ScopeMappingContainer.COMPILE);
         mavenScopeMappings.addMapping(RUNTIME_PRIORITY, configurations.getByName(JavaPlugin.RUNTIME_CONFIGURATION_NAME),
                 Conf2ScopeMappingContainer.RUNTIME);
+        mavenScopeMappings.addMapping(RUNTIME_PRIORITY, configurations.getByName(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME),
+                Conf2ScopeMappingContainer.RUNTIME);
         mavenScopeMappings.addMapping(TEST_COMPILE_PRIORITY, configurations.getByName(JavaPlugin.TEST_COMPILE_CONFIGURATION_NAME),
                 Conf2ScopeMappingContainer.TEST);
         mavenScopeMappings.addMapping(TEST_RUNTIME_PRIORITY, configurations.getByName(JavaPlugin.TEST_RUNTIME_CONFIGURATION_NAME),
                 Conf2ScopeMappingContainer.TEST);
+        mavenScopeMappings.addMapping(TEST_RUNTIME_PRIORITY, configurations.getByName(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME),
+                Conf2ScopeMappingContainer.TEST);
+    }
+
+    private void configureJavaLibraryScopeMappings(ConfigurationContainer configurations, Conf2ScopeMappingContainer mavenScopeMappings) {
+        mavenScopeMappings.addMapping(COMPILE_PRIORITY, configurations.getByName(JavaPlugin.API_CONFIGURATION_NAME),
+                Conf2ScopeMappingContainer.COMPILE);
     }
 
     private void configureWarScopeMappings(ConfigurationContainer configurations, Conf2ScopeMappingContainer mavenScopeMappings) {

src/main/java/org/gradle/api/plugins/AndroidMavenPlugin.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.gradle.api.internal.cache;
+
+import org.gradle.api.internal.file.TestFiles;
+import org.gradle.internal.serialize.Serializer;
+
+import java.io.File;
+
+public class TestFileContentCacheFactory implements FileContentCacheFactory {
+    @Override
+    public <V> FileContentCache<V> newCache(String name, int normalizedCacheSize, final Calculator<? extends V> calculator, Serializer<V> serializer) {
+        return new FileContentCache<V>() {
+            @Override
+            public V get(File file) {
+                return calculator.calculate(file, TestFiles.fileSystem().stat(file).getType());
+            }
+        };
+    }
+}

src/test/core/src/testFixtures/groovy/org/gradle/api/internal/cache/TestFileContentCacheFactory.java

@@ -21,6 +21,8 @@
 import org.gradle.api.tasks.util.internal.PatternSets;
 import org.gradle.internal.Factory;
 import org.gradle.internal.nativeintegration.filesystem.FileSystem;
+import org.gradle.internal.resource.local.FileResourceConnector;
+import org.gradle.internal.resource.local.FileResourceRepository;
 import org.gradle.process.internal.DefaultExecActionFactory;
 import org.gradle.process.internal.ExecActionFactory;
 import org.gradle.process.internal.ExecHandleFactory;
@@ -41,6 +43,10 @@ public static FileSystem fileSystem() {
         return FILE_SYSTEM;
     }
 
+    public static FileResourceRepository fileRepository() {
+        return new FileResourceConnector(FILE_SYSTEM);
+    }
+
     /**
      * Returns a resolver with no base directory.
      */

src/test/core/src/testFixtures/groovy/org/gradle/api/internal/file/TestFiles.java

@@ -131,15 +131,15 @@ public abstract class AbstractTaskTest extends AbstractProjectBuilderSpec {
         getTask().getActions().add(Actions.doNothing())
 
         then:
-        2 == getTask().getActions().size()
+        getTask().getActions().size() == 2
 
         when:
         List<Action<? super Task>> actions = Lists.newArrayList()
         actions.add(Actions.doNothing())
         getTask().setActions(actions)
 
         then:
-        1 == getTask().getActions().size()
+        getTask().getActions().size() == 1
     }
 
     def "addAction with null throws"() {