fixed compatibility with gradle 7, added tests

Author: raydac

jcp-tests/jcp-test-android/pom.xml

@@ -74,7 +74,7 @@
             <id>gradle</id>
             <phase>compile</phase>
             <configuration>
-              <executable>${gradle.executable}</executable>
+              <executable>${gradle6.executable}</executable>
               <arguments>
                 <argument>clean</argument>
                 <argument>test</argument>

jcp-tests/jcp-test-gradle/build.gradle jcp-tests/jcp-test-gradle-5/build.gradlejcp-tests/jcp-test-gradle/build.gradle renamed to jcp-tests/jcp-test-gradle-5/build.gradle

@@ -9,7 +9,7 @@
     <version>0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>jcp-test-gradle</artifactId>
+  <artifactId>jcp-test-gradle-5</artifactId>
   <packaging>pom</packaging>
 
   <dependencies>
@@ -63,11 +63,12 @@
             <id>gradle</id>
             <phase>compile</phase>
             <configuration>
-              <executable>${gradle.executable}</executable>
+              <executable>${gradle5.executable}</executable>
               <arguments>
                 <argument>clean</argument>
                 <argument>test</argument>
                 <argument>jar</argument>
+                <argument>--rerun-tasks</argument>
                 <argument>--scan</argument>
                 <argument>--full-stacktrace</argument>
                 <argument>

jcp-tests/jcp-test-gradle/configFile.txt …p-tests/jcp-test-gradle-5/configFile.txtjcp-tests/jcp-test-gradle/configFile.txt renamed to jcp-tests/jcp-test-gradle-5/configFile.txt jcp-tests/jcp-test-gradle/configFile.txt renamed to jcp-tests/jcp-test-gradle-5/configFile.txt

@@ -0,0 +1,71 @@
+buildscript {
+    repositories {
+        flatDir dirs: "../../jcp/target"
+    }
+    dependencies {
+        classpath "com.igormaznitsa:jcp:7.0.5-SNAPSHOT"
+    }
+}
+
+apply plugin: 'java'
+apply plugin: 'application'
+apply plugin: 'com.igormaznitsa.jcp'
+
+mainClassName = 'hello.world'
+
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+dependencies {
+    testCompile 'junit:junit:4.12'
+}
+
+jar {
+    manifest {
+        attributes(
+                'Main-Class': 'com.igormaznitsa.jcp.it.gradle.MainTwo'
+        )
+    }
+}
+
+
+preprocess {
+    sources = sourceSets.main.java.srcDirs
+    allowWhitespaces = true
+    eol = '\r\n'
+    keepAttributes = true
+    sourceEncoding = 'UTF-8'
+    targetEncoding = 'UTF-8'
+    ignoreMissingSources = false
+    excludeExtensions = ['txt', 'xml']
+    fileExtensions = ['java']
+    unknownVarAsFalse = false
+    dryRun = false
+    verbose = true
+    clearTarget = true
+    careForLastEol = true
+    keepComments = true
+    excludeFolders = ['**/some1', '**/some2']
+    configFiles = ['./configFile.txt']
+    keepLines = true
+    allowWhitespaces = true
+    preserveIndents = true
+    dontOverwriteSameContent = false
+    vars = ['some.test.global': 'Some Test Global Value']
+}
+task(changeSourceFolder) {
+    sourceSets.main.java.srcDirs = [preprocess.target]
+}.dependsOn preprocess
+
+
+compileJava.dependsOn preprocess
+
+gradle.buildFinished {
+    println("Incoming preprocess files: " + preprocess.incomingFiles.size())
+    println("Resulted preprocess files: " + preprocess.outcomingFiles.size())
+}

jcp-tests/jcp-test-gradle/pom.xml jcp-tests/jcp-test-gradle-5/pom.xmljcp-tests/jcp-test-gradle/pom.xml renamed to jcp-tests/jcp-test-gradle-5/pom.xml

@@ -0,0 +1,2 @@
+# config file for build
+someGlobalVar="HUZZAA!"