Merge pull request #368 from nebula-plugins/gradle-6_4-support

Gradle 6.4 support

build.gradle

@@ -68,6 +68,7 @@ dependencies {
     }
 
     implementation 'com.bmuschko:gradle-docker-plugin:3.2.1'
+    testImplementation 'com.github.stefanbirkner:system-rules:1.19.0'
 }
 
 def javaApiUrl = 'http://docs.oracle.com/javase/1.6.0/docs/api/'

gradle/dependency-locks/integTestCompileClasspath.lockfile

@@ -3,9 +3,11 @@
 # This file is expected to be part of source control.
 cglib:cglib-nodep:3.2.2
 com.bmuschko:gradle-docker-plugin:3.2.1
+com.github.stefanbirkner:system-rules:1.19.0
 com.google.guava:guava:19.0
-com.netflix.nebula:nebula-test:7.6.0
+com.netflix.nebula:nebula-test:7.8.6
 commons-io:commons-io:2.6
+junit:junit-dep:4.11
 junit:junit:4.12
 org.apache.ant:ant-launcher:1.10.6
 org.apache.ant:ant:1.10.6

gradle/dependency-locks/integTestRuntimeClasspath.lockfile

@@ -3,9 +3,11 @@
 # This file is expected to be part of source control.
 cglib:cglib-nodep:3.2.2
 com.bmuschko:gradle-docker-plugin:3.2.1
+com.github.stefanbirkner:system-rules:1.19.0
 com.google.guava:guava:19.0
-com.netflix.nebula:nebula-test:7.6.0
+com.netflix.nebula:nebula-test:7.8.6
 commons-io:commons-io:2.6
+junit:junit-dep:4.11
 junit:junit:4.12
 org.apache.ant:ant-launcher:1.10.6
 org.apache.ant:ant:1.10.6

gradle/dependency-locks/testCompileClasspath.lockfile

@@ -3,9 +3,11 @@
 # This file is expected to be part of source control.
 cglib:cglib-nodep:3.2.2
 com.bmuschko:gradle-docker-plugin:3.2.1
+com.github.stefanbirkner:system-rules:1.19.0
 com.google.guava:guava:19.0
-com.netflix.nebula:nebula-test:7.6.0
+com.netflix.nebula:nebula-test:7.8.6
 commons-io:commons-io:2.6
+junit:junit-dep:4.11
 junit:junit:4.12
 org.apache.ant:ant-launcher:1.10.6
 org.apache.ant:ant:1.10.6

gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -3,9 +3,11 @@
 # This file is expected to be part of source control.
 cglib:cglib-nodep:3.2.2
 com.bmuschko:gradle-docker-plugin:3.2.1
+com.github.stefanbirkner:system-rules:1.19.0
 com.google.guava:guava:19.0
-com.netflix.nebula:nebula-test:7.6.0
+com.netflix.nebula:nebula-test:7.8.6
 commons-io:commons-io:2.6
+junit:junit-dep:4.11
 junit:junit:4.12
 org.apache.ant:ant-launcher:1.10.6
 org.apache.ant:ant:1.10.6

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https://services.gradle.org/distributions-snapshots/gradle-6.4-20200329220053+0000-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/groovy/com/netflix/gradle/plugins/packaging/ProjectPackagingExtension.groovy

@@ -16,6 +16,10 @@ import org.gradle.api.internal.file.copy.CopySpecInternal
 import org.gradle.api.internal.file.copy.DefaultCopySpec
 import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.specs.Spec
+import org.gradle.api.tasks.util.PatternSet
+import org.gradle.api.tasks.util.internal.PatternSets
+import org.gradle.api.tasks.util.internal.PatternSpecFactory
+import org.gradle.internal.Factory
 import org.gradle.internal.reflect.Instantiator
 import org.gradle.util.GradleVersion
 
@@ -39,7 +43,11 @@ class ProjectPackagingExtension extends SystemPackagingExtension {
     public ProjectPackagingExtension(Project project) {
         FileResolver resolver = ((ProjectInternal) project).getFileResolver();
         Instantiator instantiator = ((ProjectInternal) project).getServices().get(Instantiator.class);
-        if (GradleVersion.current().baseVersion >= GradleVersion.version("6.0")) {
+        if (GradleVersion.current().baseVersion >= GradleVersion.version("6.4") || GradleVersion.current().version.startsWith('6.4')) {
+            FileCollectionFactory fileCollectionFactory = ((ProjectInternal) project).getServices().get(FileCollectionFactory.class);
+            Factory<PatternSet> patternSetFactory =  new PatternSets.PatternSetFactory(PatternSpecFactory.INSTANCE)
+            delegateCopySpec = new DefaultCopySpec(fileCollectionFactory, instantiator, patternSetFactory);
+        } else if (GradleVersion.current().baseVersion >= GradleVersion.version("6.0")) {
             FileCollectionFactory fileCollectionFactory = ((ProjectInternal) project).getServices().get(FileCollectionFactory.class);
             delegateCopySpec = new DefaultCopySpec(resolver, fileCollectionFactory, instantiator);
         } else {

src/test/groovy/com/netflix/gradle/plugins/application/OspackageApplicationSpringBootPluginLauncherSpec.groovy

@@ -19,12 +19,19 @@ package com.netflix.gradle.plugins.application
 import com.google.common.base.Throwables
 import com.netflix.gradle.plugins.deb.Scanner
 import nebula.test.IntegrationSpec
+import org.junit.Rule
+import org.junit.contrib.java.lang.system.ProvideSystemProperty
 import spock.lang.Unroll
 
 import java.util.jar.Manifest
 import java.util.zip.ZipFile
 
 class OspackageApplicationSpringBootPluginLauncherSpec extends IntegrationSpec {
+
+    //TODO: remove this once @Optional is removed from https://github.com/spring-projects/spring-boot/blob/master/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/application/CreateBootStartScripts.java#L33
+    @Rule
+    public final ProvideSystemProperty myPropertyHasMyValue = new ProvideSystemProperty("ignoreDeprecations", "true")
+
     def 'plugin throws exception if spring-boot plugin not applied'() {
         buildFile << """
             ${applyPlugin(OspackageApplicationSpringBootPlugin)}
@@ -84,7 +91,7 @@ class OspackageApplicationSpringBootPluginLauncherSpec extends IntegrationSpec {
         buildFile << buildScript(bootVersion, null)
 
         when:
-        runTasksSuccessfully('buildDeb', '--warning-mode', 'all')
+        runTasksSuccessfully('buildDeb')
 
         then:
         final archivePath = file("build/distributions/test_unspecified_all.deb")
@@ -123,7 +130,7 @@ class OspackageApplicationSpringBootPluginLauncherSpec extends IntegrationSpec {
         buildFile << buildScript(bootVersion, startScript)
 
         when:
-        def result = runTasksSuccessfully('runStartScript', '--warning-mode', 'all')
+        def result = runTasksSuccessfully('runStartScript')
 
         then:
         result.standardOutput.contains('Hello Integration Test')

src/test/groovy/com/netflix/gradle/plugins/packaging/CopySpecEnhancementTest.groovy

@@ -6,6 +6,7 @@ import org.gradle.api.internal.file.FileResolver
 import org.gradle.api.internal.file.copy.DefaultCopySpec
 import org.gradle.api.tasks.util.PatternSet
 import org.gradle.api.tasks.util.internal.PatternSets
+import org.gradle.api.tasks.util.internal.PatternSpecFactory
 import org.gradle.internal.Factory
 import org.gradle.internal.reflect.DirectInstantiator
 import org.gradle.internal.reflect.Instantiator
@@ -23,11 +24,13 @@ class CopySpecEnhancementTest {
     private final FileCollectionFactory factory = [configurableFiles: {
         null
     }] as FileCollectionFactory
-
+    private final Factory<PatternSet> patternSetFactory =  new PatternSets.PatternSetFactory(PatternSpecFactory.INSTANCE)
     def spec = createDefaultCopySpec()
 
     private DefaultCopySpec createDefaultCopySpec() {
-        if (GradleVersion.current().baseVersion >= GradleVersion.version("6.0")) {
+        if (GradleVersion.current().baseVersion >= GradleVersion.version("6.4") || GradleVersion.current().version.startsWith('6.4')) {
+            new DefaultCopySpec(factory, instantiator, patternSetFactory);
+        } else if (GradleVersion.current().baseVersion >= GradleVersion.version("6.0")) {
             new DefaultCopySpec(fileResolver, factory, instantiator);
         } else {
             new DefaultCopySpec(fileResolver, instantiator);