Support Gradle 7.0

.github/workflows/ci.yml

@@ -1,6 +1,10 @@
 name: CI
 on:
   push:
+    branches:
+      - master
+    tags:
+      - v*
   pull_request:
   schedule:
     - cron: '0 0 * * 1'
@@ -44,8 +48,11 @@ jobs:
     strategy:
       matrix:
         gradle-versions:
-          - 5.3,5.6
-          - 6.0,6.6
+          - 5.6
+          - 6.0,6.1,6.2
+          - 6.3,6.4,6.5
+          - 6.6,6.7,6.8
+          - '7.0'
     steps:
       - uses: actions/checkout@v2
         with:

CHANGELOG.md

@@ -2,10 +2,13 @@
 
 ## Unreleased
 
+**This release drops support for Gradle versions before 5.6**
+
 ### Fixed
 
 * [#191](https://github.com/xenit-eu/alfresco-docker-gradle-plugin/issues/191) - dockerCompose fromBuildImage/fromProject silently fail when wrong argument type is provided
 * [#192](https://github.com/xenit-eu/alfresco-docker-gradle-plugin/issues/192) - Deprecated non-annotated properties in prefixXXXLog4j tasks
+* [#204](https://github.com/xenit-eu/alfresco-docker-gradle-plugin/issues/204) - Support Gradle 7.0
 
 ### Dependencies
 

build.gradle

@@ -20,9 +20,8 @@ sourceCompatibility = 1.8
 configurations {
     packaged
     compileOnly.extendsFrom(packaged)
-    testCompile.extendsFrom(packaged)
-    integrationTestCompile.extendsFrom testCompile
-    integrationTestRuntime.extendsFrom testRuntime
+    testImplementation.extendsFrom(packaged)
+    integrationTestImplementation.extendsFrom testImplementation
 }
 
 sourceSets {
@@ -70,6 +69,7 @@ gradlePlugin {
             implementationClass = "eu.xenit.gradle.docker.compose.DockerComposeAutoPlugin"
         }
     }
+    testSourceSets(sourceSets.test, sourceSets.integrationTest)
 }
 
 pluginBundle {
@@ -122,16 +122,16 @@ repositories {
 dependencies {
     packaged 'org.alfresco:alfresco-mmt:6.0'
     packaged group: 'commons-io', name: 'commons-io', version: '2.8.0'
-    packaged('org.eclipse.jgit:org.eclipse.jgit:5.11.0.202103091610-r'){
+    packaged('org.eclipse.jgit:org.eclipse.jgit:5.11.0.202103091610-r') {
         exclude group: 'org.slf4j'
     }
 
-    compile 'com.bmuschko:gradle-docker-plugin:6.7.0'
-    compile 'com.avast.gradle:gradle-docker-compose-plugin:0.14.3'
-    testCompile group: 'junit', name: 'junit', version: '4.13.2'
-    testCompile gradleTestKit()
-    testCompile "org.mockito:mockito-core:2.+"
-    testCompile 'com.github.stefanbirkner:system-rules:1.19.0'
+    implementation 'com.bmuschko:gradle-docker-plugin:6.7.0'
+    implementation 'com.avast.gradle:gradle-docker-compose-plugin:0.14.3'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
+    testImplementation gradleTestKit()
+    testImplementation "org.mockito:mockito-core:2.+"
+    testImplementation 'com.github.stefanbirkner:system-rules:1.19.0'
 }
 
 
@@ -156,6 +156,10 @@ jar {
     dependsOn(shadowJar)
 }
 
+pluginUnderTestMetadata {
+    pluginClasspath.from(configurations.packaged)
+}
+
 import org.gradle.util.GradleVersion
 
 task integrationTest(type: Test, group: "verification") {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/integrationTest/java/eu/xenit/gradle/testrunner/AbstractIntegrationTest.java

@@ -44,7 +44,9 @@ public static Collection<Object[]> testData() {
             });
         }
         return Arrays.asList(new Object[][]{
-                {"6.7"},
+                {"7.0"},
+                {"6.8.3"},
+                {"6.7.1"},
                 {"6.6.1"},
                 {"6.5.1"},
                 {"6.4.1"},
@@ -53,9 +55,6 @@ public static Collection<Object[]> testData() {
                 {"6.1.1"},
                 {"6.0.1"},
                 {"5.6.4"},
-                {"5.5.1"},
-                {"5.4.1"},
-                {"5.3.1"},
         });
     }
 

src/integrationTest/reproductions/applyamps-subproject/build.gradle

@@ -21,8 +21,6 @@ dockerAlfresco {
     }
 }
 
-afterEvaluate {
-    createDockerFile {
-        copyFile './build.gradle', '/tmp/some-file.gradle'
-    }
+createDockerFile {
+    copyFile './build.gradle', '/tmp/some-file.gradle'
 }

src/integrationTest/reproductions/applyamps-subproject/subproject/build.gradle

@@ -14,16 +14,16 @@ repositories {
 }
 
 dependencies {
-    compile("de.fmaul:javascript-console-repo:0.6@amp") {
+    implementation("de.fmaul:javascript-console-repo:0.6@amp") {
         transitive = false
     }
 }
 
 task amp(type: Zip) {
-    from({ zipTree(configurations.compile.singleFile) }) {
+    from({ zipTree(configurations.runtimeClasspath.singleFile) }) {
         into "/"
     }
-    extension = "amp"
+    archiveExtension = "amp"
 }
 
 artifacts {