add support for Gradle version 7.2. see #103

Author: Horcrux7

.classpath

@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry including="**/*.java" kind="src" output="bin/test" path="src">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="gradle_scope" value="test"/>
-			<attribute name="gradle_used_by_scope" value="test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="output" path="bin/default"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin/main" path="src">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

.travis.yml

@@ -14,6 +14,7 @@ env:
    - LIB_GRADLE_VERSION=4.8 DEPLOY=true
    - LIB_GRADLE_VERSION=4.8.1
    - LIB_GRADLE_VERSION=4.10.2
+   - LIB_GRADLE_VERSION=7.2
   global:
     # The next declaration is the encrypted gradlePublishKey
     - secure: tzRoJbjW38G0YcSRuf53+koo/ZixIrA1vHJ9StOfafZOJzKyoASkbFa2EpUKmp3CXBWvUSTVo59j7ywUSyWW+L+G+CRnYqkDTktySJ/LAHjR0CH5dJCUodwcwtZkBje/RQZ//ZuPO2I7wY/aqHfj/E8pg2h9Y+nOd2v9R904/5b5gck9nM1Tr74YE2dJDm3h0QKrMqx6/oT7KVTWQpTNeLxcdrdNn5yxllqn4YDF70gEksoSuJeFR2l5lwSlTTseKI7Q7mGYI1Tg/PSZoxlPz3DGFmSe+9sewRnN9ZnjQDEY06/GmrGQHGv9MV1azvenlFHrt9lIbHnEo0GBqxNpeFfMd4+B9oeEmL8roapNSq0TCgVvOzda/G5KyY8TgLEi+k7WrZaWGvbW+AorU5ntenWEzSWz3b5lpwnwXxrPyyRnaKd3R5mRYj+LL10hlHAiWpvXn+v6ptD2OunE6l3JEm+wln+6wZjJBqBhl1jsv3LOd5siezFGqqOzC6FN6UgkTZqsgMfROzoqklFv3Ko8fU4e6oo9VzI/cJGcFHFO4M+dOHyYZbKl8hfvi1Bf44UpYo914sdwmWGIAZ8J6V2xtCqTnyN1bi/EQuKAkE2400laduCt/rnGyR8IefcM6iFxjufR5jCXpXBhbQ0cQ//pUT0eW4ssjqKvt9RrJmt/Mew=
@@ -25,7 +26,8 @@ before_install:
   - sudo apt-get install -y fakeroot
 install:
   - gradle wrapper
-  - ./gradlew uploadArchives
+  # upload to '../repo'
+  - ./gradlew publish
 deploy:
   provider: releases
   api_key:

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 apply plugin: 'java'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 apply from: "${buildscript.sourceFile.parentFile}/scripts/javapreprocessor.gradle"
 
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    compile gradleApi()
+    api gradleApi()
 }
 
 sourceSets {
@@ -48,14 +48,6 @@ sourceSets {
             exclude '**/package.html'
         }
     }
-    test { 
-        java {
-            srcDirs = ['src']
-            if ( !version.equalsIgnoreCase(baseVersion) ) {
-                srcDirs = ["${buildDir}/preparedSrc-${gVersion}"]
-            }
-        }
-    }
 }
 
 /* Configure for ClearReports Version and copy files if needed */
@@ -79,13 +71,19 @@ if( !System.getProperty("local") && file( '../BuildScripts/base.gradle' ).exists
 } else {
     println "Uploading into local '../repo'"
     version += System.getenv('DEPLOY') != null ?'':'-SNAPSHOT' // setting version to snapshot
-    uploadArchives {
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                from components.java
+            }
+        }
         repositories {
-            mavenDeployer {
-                repository(url: uri('../repo'))
+            maven {
+                url = '../repo'
             }
         }
     }
+    publish.dependsOn 'assemble'
 
     clean.doLast {
         println "Cleaning local repository folder"

scripts/SetupBuilderVersion.gradle

@@ -14,5 +14,6 @@ ext.setupBuilderVersion = { buildVersion = '+' ->
     if( gVersion >= VersionNumber.parse( '4.2' ) ) version = '4.2'
     if( gVersion >= VersionNumber.parse( '4.5' ) ) version = '4.5'
     if( gVersion >= VersionNumber.parse( '4.8' ) ) version = '4.8'
+    if( gVersion >= VersionNumber.parse( '7.2' ) ) version = '7.2'
     return version + '.' + buildVersion
 }

scripts/javapreprocessor.gradle

@@ -185,6 +185,7 @@ class JPPTask extends DefaultTask {
         getProject().getTasks().JPP.enabled = true
     }
 
+    @Input
     HashMap<String,HashMap<String, String>> getJPPSources() {
         return jppSources;
     }

src/com/inet/gradle/setup/abstracts/AbstractTask.java

@@ -62,6 +62,11 @@
 
 import groovy.lang.Closure;
 
+/*// if gradleVersion >= 7.0
+import org.gradle.api.internal.DocumentationRegistry;
+import org.gradle.api.model.ObjectFactory;
+*/// endif
+
 /**
  * Base class for all setup task.
  *
@@ -176,9 +181,11 @@ private void processFiles( CopyActionProcessingStreamAction action, CopySpecInte
 
         /*// if gradleVersion < 3.4
         CopyActionExecuter copyActionExecuter = new CopyActionExecuter( getInstantiator(), getFileSystem() );
-        */// else
+        */// elif gradleVersion < 7.2
         CopyActionExecuter copyActionExecuter = new CopyActionExecuter( getInstantiator(), getFileSystem(), true );
-        //// endif
+        /*// else
+        CopyActionExecuter copyActionExecuter = new CopyActionExecuter( getInstantiator(), getObjectFactory(), getFileSystem(), true, getDocumentationRegistry() );
+        */// endif
 
         CopyAction copyAction = new CopyAction() {
             @Override
@@ -214,6 +221,18 @@ protected FileLookup getFileLookup() {
         throw new UnsupportedOperationException();
     }
 
+    /*// if gradleVersion >= 7.0
+    @Inject
+    protected DocumentationRegistry getDocumentationRegistry() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected ObjectFactory getObjectFactory() {
+        throw new UnsupportedOperationException();
+    }
+    */// endif
+
     /**
      * The platform depending build.
      */

src/com/inet/gradle/setup/abstracts/SetupSources.java

@@ -38,6 +38,10 @@
 import org.gradle.api.Transformer;
 //// endif
 
+/*//if gradleVersion >= 7.2
+import org.gradle.api.file.ExpandDetails;
+*///endif
+
 /**
  * Implementation of the CopySpec interface.
  * 
@@ -296,4 +300,11 @@ default CopySpec filesNotMatching( Iterable<String> arg0, Action<? super FileCop
         return getRootSpec().filesMatching( arg0, arg1 );
     }
     //// endif
+
+    /*// if gradleVersion >= 7.2
+    @Override
+    default CopySpec expand( Map<String,?> arg0, Action<? super ExpandDetails> arg1 ) {
+        return getRootSpec().expand( arg0, arg1 );
+    }
+    */// endif
 }