updating to gradle 4.5

Author: dcendents

build.gradle

@@ -16,7 +16,7 @@ repositories {
 }
 
 ext {
-	gradleVersions = '4.4'
+	gradleVersions = '4.5'
 	androidGradleBuildVersion = '3.0.0-beta3'
 	androidCompileSdkVersion = 'android-26'
 	androidBuildToolsVersion = '26.0.1'
@@ -51,59 +51,22 @@ ext {
     versions = [:]
 }
 
-versions.maven = "3.0.4"
+versions.commons_io = '2.2'
 versions.groovy = "2.4.12"
-versions.ant = "1.9.9"
+versions.maven = "3.0.4"
+versions.findbugs = "2.0.1"
 
 dependencies {
 	jacocoRuntime "org.jacoco:org.jacoco.agent:${jacoco.toolVersion}:runtime"
 
 	compile gradleApi()
 
 	// from gradle/gradle/dependencies.gradle
-	compileOnly dependencies.module("org.apache.maven:maven-core:${versions.maven}") {
-		dependency "org.apache.maven:maven-settings:${versions.maven}@jar"
-		dependency "org.apache.maven:maven-settings-builder:${versions.maven}@jar"
-
-		//plexus:
-		dependency "org.codehaus.plexus:plexus-utils:2.1@jar"
-		dependency "org.codehaus.plexus:plexus-interpolation:1.14@jar"
-		dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5@jar"
-		dependency "org.codehaus.plexus:plexus-container-default:1.5.5@jar"
-		dependency "org.codehaus.plexus:plexus-classworlds:2.4@jar"
-
-		//sonatype plexus
-		dependency "org.sonatype.plexus:plexus-cipher:1.7@jar"
-		dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3@jar"
-
-		//core:
-		dependency "org.apache.maven:maven-core:${versions.maven}@jar"
-		dependency "org.apache.maven:maven-compat:${versions.maven}@jar"
-		dependency "org.apache.maven:maven-model-builder:${versions.maven}@jar"
-		dependency "org.apache.maven:maven-model:${versions.maven}@jar"
-
-		//somewhat core:
-		dependency "org.apache.maven:maven-artifact:${versions.maven}@jar"
-		dependency "org.apache.maven:maven-repository-metadata:${versions.maven}@jar"
-		dependency "org.apache.maven:maven-plugin-api:${versions.maven}@jar"
-		dependency "org.apache.maven:maven-aether-provider:${versions.maven}@jar"
-
-		dependency 'org.apache.maven.wagon:wagon-file:2.4@jar'
-		dependency 'org.apache.maven.wagon:wagon-http:2.4@jar'
-		dependency 'org.apache.maven.wagon:wagon-provider-api:2.4@jar'
-		dependency 'org.apache.maven.wagon:wagon-http-shared4:2.4@jar'
-
-		//eather:
-		dependency "org.sonatype.aether:aether-api:1.13.1@jar"
-		dependency "org.sonatype.aether:aether-impl:1.13.1@jar"
-		dependency "org.sonatype.aether:aether-spi:1.13.1@jar"
-		dependency "org.sonatype.aether:aether-util:1.13.1@jar"
-		dependency 'org.sonatype.aether:aether-connector-wagon:1.13.1@jar'
-	}
+	compileOnly "org.apache.maven:maven-core:${versions.maven}"
 
 	testRuntime files(createClasspathManifest)
 
-	testCompile('org.spockframework:spock-core:1.0-groovy-2.4@jar') {
+	testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
         exclude module: 'groovy-all'
     }
 
@@ -112,23 +75,19 @@ dependencies {
 				"org.codehaus.groovy:groovy-all:${versions.groovy}"
 
 	// 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',
-				'commons-lang:commons-lang:2.6@jar',
-				'org.objenesis:objenesis:1.2@jar',
+	testCompile	"commons-io:commons-io:${versions.commons_io}",
+				'commons-lang:commons-lang:2.6',
+				'org.objenesis:objenesis:1.2',
 				'cglib:cglib:3.2.5',
 				'org.jmock:jmock:2.5.1',
 				dependencies.create('org.jmock:jmock-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
 				'org.jmock:jmock-legacy:2.5.1',
-				'com.google.guava:guava-jdk5:17.0@jar',
+				'com.google.guava:guava-jdk5:17.0',
 				'org.jsoup:jsoup:1.6.3',
-				'com.google.code.findbugs:jsr305:2.0.1',
-				'org.ow2.asm:asm-debug-all:6.0_ALPHA'
-	testCompile dependencies.module('org.apache.ivy:ivy:2.2.0'){
-		dependency "com.jcraft:jsch:0.1.54"
-	}
-	testCompile dependencies.module("org.apache.ant:ant:${versions.ant}") {
-		dependency "org.apache.ant:ant-launcher:${versions.ant}@jar"
-	}
+				"com.google.code.findbugs:findbugs:${versions.findbugs}",
+				'org.ow2.asm:asm:6.0'
+	testCompile 'org.apache.ivy:ivy:2.2.0'
+	testCompile 'org.apache.ant:ant:1.9.9'
 }
 
 sourceCompatibility = 1.6
@@ -231,7 +190,7 @@ jacocoTestReport.dependsOn test
 check.dependsOn jacocoTestReport
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.4'
+    gradleVersion = '4.5'
     distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,56 @@
+/*
+ * 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.changedetection.state
+
+import org.gradle.api.internal.file.FileTreeInternal
+import org.gradle.api.internal.file.collections.DirectoryFileTree
+import org.gradle.internal.hash.Hashing
+
+class TestFileSnapshotter implements FileSystemSnapshotter {
+    @Override
+    boolean exists(File file) {
+        return file.exists()
+    }
+
+    @Override
+    FileSnapshot snapshotSelf(File file) {
+        if (file.isFile()) {
+            return new RegularFileSnapshot(null, null, false, new FileHashSnapshot(Hashing.sha1().hashBytes(file.bytes)))
+        }
+        return new MissingFileSnapshot(null, null)
+    }
+
+    @Override
+    Snapshot snapshotAll(File file) {
+        throw new UnsupportedOperationException()
+    }
+
+    @Override
+    FileTreeSnapshot snapshotDirectoryTree(File dir) {
+        throw new UnsupportedOperationException()
+    }
+
+    @Override
+    FileTreeSnapshot snapshotDirectoryTree(DirectoryFileTree dirTree) {
+        throw new UnsupportedOperationException()
+    }
+
+    @Override
+    List<FileSnapshot> snapshotTree(FileTreeInternal tree) {
+        throw new UnsupportedOperationException()
+    }
+}

src/test/core/src/testFixtures/groovy/org/gradle/api/internal/changedetection/state/TestFileSnapshotter.groovy

@@ -29,6 +29,7 @@
 import org.gradle.internal.resource.local.FileResourceRepository;
 import org.gradle.process.internal.DefaultExecActionFactory;
 import org.gradle.process.internal.ExecActionFactory;
+import org.gradle.process.internal.ExecFactory;
 import org.gradle.process.internal.ExecHandleFactory;
 import org.gradle.process.internal.JavaExecHandleFactory;
 import org.gradle.testfixtures.internal.NativeServicesTestFixture;
@@ -38,6 +39,7 @@
 public class TestFiles {
     private static final FileSystem FILE_SYSTEM = NativeServicesTestFixture.getInstance().get(FileSystem.class);
     private static final DefaultFileLookup FILE_LOOKUP = new DefaultFileLookup(FILE_SYSTEM, PatternSets.getNonCachingPatternSetFactory());
+    private static final DefaultExecActionFactory EXEC_FACTORY = new DefaultExecActionFactory(resolver());
 
     public static FileLookup fileLookup() {
         return FILE_LOOKUP;
@@ -70,7 +72,7 @@ public static DirectoryFileTreeFactory directoryFileTreeFactory() {
     }
 
     public static FileOperations fileOperations(File basedDir) {
-        return new DefaultFileOperations(resolver(basedDir), null, null, DirectInstantiator.INSTANCE, fileLookup(), directoryFileTreeFactory(), streamHasher(), fileHasher());
+        return new DefaultFileOperations(resolver(basedDir), null, null, DirectInstantiator.INSTANCE, fileLookup(), directoryFileTreeFactory(), streamHasher(), fileHasher(), execFactory());
     }
 
     public static DefaultStreamHasher streamHasher() {
@@ -93,20 +95,24 @@ public static SourceDirectorySetFactory sourceDirectorySetFactory(File baseDir)
         return new DefaultSourceDirectorySetFactory(resolver(baseDir), new DefaultDirectoryFileTreeFactory());
     }
 
+    public static ExecFactory execFactory() {
+        return EXEC_FACTORY;
+    }
+
     public static ExecActionFactory execActionFactory() {
-        return new DefaultExecActionFactory(resolver());
+        return execFactory();
     }
 
     public static ExecHandleFactory execHandleFactory() {
-        return new DefaultExecActionFactory(resolver());
+        return execFactory();
     }
 
     public static ExecHandleFactory execHandleFactory(File baseDir) {
-        return new DefaultExecActionFactory(resolver(baseDir));
+        return execFactory().forContext(resolver(baseDir), DirectInstantiator.INSTANCE);
     }
 
     public static JavaExecHandleFactory javaExecHandleFactory(File baseDir) {
-        return new DefaultExecActionFactory(resolver(baseDir));
+        return execFactory().forContext(resolver(baseDir), DirectInstantiator.INSTANCE);
     }
 
     public static Factory<PatternSet> getPatternSetFactory() {

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

@@ -25,7 +25,6 @@ import org.gradle.api.internal.AsmBackedClassGenerator
 import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.internal.project.taskfactory.AnnotationProcessingTaskFactory
 import org.gradle.api.internal.project.taskfactory.DefaultTaskClassInfoStore
-import org.gradle.api.internal.project.taskfactory.DefaultTaskClassValidatorExtractor
 import org.gradle.api.internal.project.taskfactory.ITaskFactory
 import org.gradle.api.internal.project.taskfactory.TaskFactory
 import org.gradle.api.internal.tasks.TaskExecuter
@@ -45,7 +44,7 @@ import static org.junit.Assert.assertFalse
 abstract class AbstractSpockTaskTest extends AbstractProjectBuilderSpec {
     public static final String TEST_TASK_NAME = "taskname"
 
-    def taskClassInfoStore = new DefaultTaskClassInfoStore(new DefaultTaskClassValidatorExtractor())
+    def taskClassInfoStore = new DefaultTaskClassInfoStore()
     private final ITaskFactory taskFactory = new AnnotationProcessingTaskFactory(taskClassInfoStore, new TaskFactory(new AsmBackedClassGenerator()))
 
     abstract AbstractTask getTask()

src/test/core/src/testFixtures/groovy/org/gradle/api/tasks/AbstractSpockTaskTest.groovy

@@ -0,0 +1,36 @@
+/*
+ * 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.tasks
+
+import org.gradle.api.internal.AbstractTask
+import org.gradle.api.internal.TaskInternal
+import org.gradle.api.internal.tasks.TaskPropertyUtils
+import org.gradle.api.internal.tasks.properties.GetInputPropertiesVisitor
+import org.gradle.api.internal.tasks.properties.PropertyWalker
+
+class TaskPropertyTestUtils {
+    static Map<String, Object> getProperties(AbstractTask task) {
+        getProperties(task, task.getServices().get(PropertyWalker))
+    }
+
+    static Map<String, Object> getProperties(TaskInternal task, PropertyWalker propertyWalker) {
+        GetInputPropertiesVisitor visitor = new GetInputPropertiesVisitor(task.getName());
+        TaskPropertyUtils.visitProperties(propertyWalker, task, visitor);
+        //noinspection ConstantConditions
+        return visitor.getPropertyValuesFactory().create();
+    }
+}

src/test/core/src/testFixtures/groovy/org/gradle/api/tasks/TaskPropertyTestUtils.groovy

@@ -19,6 +19,7 @@ import org.codehaus.groovy.control.CompilerConfiguration
 import org.gradle.api.Task
 import org.gradle.api.internal.AsmBackedClassGenerator
 import org.gradle.api.internal.DefaultInstantiatorFactory
+import org.gradle.api.internal.ExperimentalFeatures
 import org.gradle.api.internal.InstantiatorFactory
 import org.gradle.api.internal.attributes.DefaultImmutableAttributesFactory
 import org.gradle.api.internal.attributes.ImmutableAttributesFactory
@@ -27,14 +28,17 @@ import org.gradle.api.internal.model.DefaultObjectFactory
 import org.gradle.api.internal.model.NamedObjectInstantiator
 import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.internal.project.taskfactory.ITaskFactory
+import org.gradle.api.internal.provider.DefaultProviderFactory
 import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.ProviderFactory
 import org.gradle.cache.internal.CrossBuildInMemoryCacheFactory
 import org.gradle.groovy.scripts.DefaultScript
 import org.gradle.groovy.scripts.Script
 import org.gradle.groovy.scripts.ScriptSource
 import org.gradle.internal.classloader.ClassLoaderHierarchyHasher
 import org.gradle.internal.event.DefaultListenerManager
 import org.gradle.internal.hash.HashCode
+import org.gradle.internal.service.DefaultServiceRegistry
 import org.gradle.test.fixtures.file.TestDirectoryProvider
 import org.gradle.testfixtures.ProjectBuilder
 import org.gradle.testfixtures.internal.NativeServicesTestFixture
@@ -57,7 +61,9 @@ class TestUtil {
     }
 
     static ObjectFactory objectFactory() {
-        return new DefaultObjectFactory(instantiatorFactory().decorate(), NamedObjectInstantiator.INSTANCE)
+        DefaultServiceRegistry services = new DefaultServiceRegistry()
+        services.add(ProviderFactory, new DefaultProviderFactory())
+        return new DefaultObjectFactory(instantiatorFactory().injectAndDecorate(services), NamedObjectInstantiator.INSTANCE)
     }
 
     static ValueSnapshotter valueSnapshotter() {
@@ -73,6 +79,14 @@ class TestUtil {
         return new DefaultImmutableAttributesFactory(valueSnapshotter())
     }
 
+    static NamedObjectInstantiator objectInstantiator() {
+        return NamedObjectInstantiator.INSTANCE
+    }
+
+    static ExperimentalFeatures experimentalFeatures() {
+        return new ExperimentalFeatures()
+    }
+
     static TestUtil create(File rootDir) {
         return new TestUtil(rootDir);
     }

src/test/core/src/testFixtures/groovy/org/gradle/util/TestUtil.groovy

@@ -107,7 +107,9 @@ class HtmlTestExecutionResult implements TestExecutionResult {
         }
 
         TestClassExecutionResult assertTestsExecuted(String... testNames) {
-            assert testsExecuted - testsSkipped == testNames as List
+            def executedAndNotSkipped = testsExecuted - testsSkipped
+            assert executedAndNotSkipped.containsAll(testNames as List)
+            assert executedAndNotSkipped.size() == testNames.size()
             return this
         }
 

src/test/internal-testing/src/main/groovy/org/gradle/integtests/fixtures/HtmlTestExecutionResult.groovy

@@ -134,7 +134,7 @@ public List<TestFile> files(Object... paths) {
     }
 
     public TestFile withExtension(String extension) {
-        return getParentFile().file(getName().replaceAll("\\..*$", "." + extension));
+        return getParentFile().file(org.gradle.internal.FileUtils.withExtension(getName(), extension));
     }
 
     public TestFile writelns(String... lines) {