orcas gradle 7 compatible

opitzconsulting · May 12, 2022 · dd4dff4 · dd4dff4
1 parent 8a77a8e
commit dd4dff4
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 10 deletions.
diff --git a/orcas_core/build_source/build.gradle b/orcas_core/build_source/build.gradle
@@ -73,6 +73,11 @@ subprojects
   }
 
   project.buildDir = project.ext.tmp_folder + "/" + project.path.replaceAll( ":", "_" )
+
+      tasks.withType(JavaCompile.class) {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
 }
 
 

diff --git a/...lugin/src/main/groovy/com/opitzconsulting/orcas/gradle/BaseOrcasOneTimeScriptsTask.groovy b/...lugin/src/main/groovy/com/opitzconsulting/orcas/gradle/BaseOrcasOneTimeScriptsTask.groovy
@@ -2,6 +2,7 @@ package com.opitzconsulting.orcas.gradle
 
 import de.opitzconsulting.orcas.diff.ParameterDefaults
 import de.opitzconsulting.orcas.diff.Parameters
+import org.gradle.api.tasks.Internal
 
 import java.io.File;
 
@@ -27,10 +28,12 @@ public abstract class BaseOrcasOneTimeScriptsTask extends BaseOrcasTask
     }
   }
 
+  @Internal
   protected boolean isCheckFolderExists()
   {
     return true;
   }
 
+  @Internal
   protected abstract File getScriptfolder();
 }
diff --git a/...orcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/BaseOrcasTask.groovy b/...orcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/BaseOrcasTask.groovy
@@ -1,6 +1,7 @@
 package com.opitzconsulting.orcas.gradle
 
 import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.logging.LogLevel
 
@@ -12,11 +13,18 @@ import de.opitzconsulting.orcas.diff.Parameters.JdbcConnectParameters;
 
 public abstract class BaseOrcasTask extends DefaultTask 
 {
+  @Internal
   FailOnErrorMode failOnErrorMode
+  @Internal
   ExecuteSqlErrorHandler executeSqlErrorHandler
   private def parameterModifier;
+  @Internal
   def boolean nologging;
 
+  BaseOrcasTask() {
+    outputs.upToDateWhen { false }
+  }
+
   @TaskAction
   def executeOrcasTask()
   {
@@ -138,6 +146,7 @@ public abstract class BaseOrcasTask extends DefaultTask
     executeOrcasTaskWithParameters( lParametersCall );
   }
 
+  @Internal
   protected boolean isMariadb()
   {
     return project.orcasconfiguration.jdbcurl.startsWith( "jdbc:mysql" ) || project.orcasconfiguration.jdbcurl.startsWith( "jdbc:mariadb" );
@@ -149,6 +158,7 @@ public abstract class BaseOrcasTask extends DefaultTask
     logger.log( lLogLevel, getLogname() + ": " + pLogMessage );
   }
 
+  @Internal
   protected abstract String getLogname();
 
   protected abstract void executeOrcasTaskWithParameters( ParametersCall pParameters );

diff --git a/...in/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasOneTimeScriptsTask.groovy b/...in/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasOneTimeScriptsTask.groovy
@@ -1,11 +1,15 @@
-package com.opitzconsulting.orcas.gradle;
+package com.opitzconsulting.orcas.gradle
+
+import org.gradle.api.tasks.Internal;
 
 import java.io.File;
 
 public class ExecuteOrcasOneTimeScriptsTask extends BaseOrcasOneTimeScriptsTask
 {
+  @Internal
   def scriptfolder;
 
+  @Internal
   def logname;
 
   protected String getLogname()

diff --git a/...dle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptTask.groovy b/...dle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptTask.groovy
@@ -1,6 +1,7 @@
 package com.opitzconsulting.orcas.gradle
 
-import de.opitzconsulting.orcas.diff.Parameters;
+import de.opitzconsulting.orcas.diff.Parameters
+import org.gradle.api.tasks.Internal;
 
 import java.io.File;
 import java.util.List;
@@ -10,15 +11,18 @@ import de.opitzconsulting.orcas.diff.ParametersCall;
 
 public class ExecuteOrcasScriptTask extends BaseOrcasTask
 {
+  @Internal
   def scriptfile;
 
+  @Internal
   def logname;
 
   protected String getLogname()
   {
     return logname;
   }
 
+  @Internal
   List<String> scriptParameters;
 
   @Override

diff --git a/...le_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptsTask.groovy b/...le_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptsTask.groovy
@@ -1,6 +1,7 @@
 package com.opitzconsulting.orcas.gradle
 
-import de.opitzconsulting.orcas.diff.Parameters;
+import de.opitzconsulting.orcas.diff.Parameters
+import org.gradle.api.tasks.Internal;
 
 import java.io.File;
 import org.gradle.api.file.FileCollection;
@@ -11,10 +12,13 @@ import de.opitzconsulting.orcas.diff.ParametersCall;
 
 public class ExecuteOrcasScriptsTask extends BaseOrcasTask
 {
+  @Internal
   def scriptfolder;
 
+  @Internal
   FileCollection scriptFiles;
 
+  @Internal
   def logname;
 
   protected String getLogname()

diff --git a/...e_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasCheckConnectionTask.groovy b/...e_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasCheckConnectionTask.groovy
@@ -1,10 +1,12 @@
 package com.opitzconsulting.orcas.gradle;
 
 import de.opitzconsulting.orcas.diff.OrcasCheckConnection;
-import de.opitzconsulting.orcas.diff.ParametersCall;
+import de.opitzconsulting.orcas.diff.ParametersCall
+import org.gradle.api.tasks.Internal;
 
 public class OrcasCheckConnectionTask extends BaseOrcasTask
 {
+  @Internal
   def logname = "check-connection";
 
   @Override

diff --git a/...plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasCompileAllInvalidTask.groovy b/...plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasCompileAllInvalidTask.groovy
@@ -1,18 +1,24 @@
 package com.opitzconsulting.orcas.gradle
 
 import de.opitzconsulting.orcas.diff.OrcasCompileAllInvalid
-import de.opitzconsulting.orcas.diff.Parameters;
+import de.opitzconsulting.orcas.diff.Parameters
+import org.gradle.api.tasks.Internal;
 
 import java.nio.charset.StandardCharsets;
 import de.opitzconsulting.orcas.diff.ParametersCall;
 import com.opitzconsulting.orcas.dbobjects.SqlplusDirAccessDbobjects
 
 public class OrcasCompileAllInvalidTask extends BaseOrcasTask
 {
+  @Internal
   def logname = "compile-all-invalid";
+  @Internal
   def dontFailOnErrors = false;
+  @Internal
   @Deprecated
   def boolean getCompileInfos = false;
+
+  @Internal
   def List<OrcasCompileAllInvalid.CompileInfo> compileInfos;
 
   @Override
@@ -47,6 +53,7 @@ public class OrcasCompileAllInvalidTask extends BaseOrcasTask
     }
   }
 
+  @Internal
   protected boolean isRunOnlyIfReplaceablesExists()
   {
     return false;

diff --git a/...rcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasDbDocTask.groovy b/...rcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasDbDocTask.groovy
@@ -2,7 +2,8 @@ package com.opitzconsulting.orcas.gradle
 
 import de.oc.dbdoc.ant.*;
 import de.opitzconsulting.orcas.diff.ParametersCall
-import org.gradle.api.tasks.InputDirectory;
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.OutputDirectory;
 
 public class OrcasDbDocTask extends BaseOrcasTask
@@ -38,6 +39,7 @@ public class OrcasDbDocTask extends BaseOrcasTask
     callClosure( pClosure, orcasDbDoc.getDiagram() );
   }
 
+  @Internal
   public OrcasDbDoc getOrcasDbDoc() {
     return orcasDbDoc;
   }
@@ -56,6 +58,7 @@ public class OrcasDbDocTask extends BaseOrcasTask
     callClosure( pClosure, this );
   }
 
+  @Internal
   public Tableregistry getTableregistry() {
     return orcasDbDoc.tableregistry;
   }

diff --git a/..._plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasDropReplaceablesTask.groovy b/..._plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasDropReplaceablesTask.groovy
@@ -1,4 +1,6 @@
-package com.opitzconsulting.orcas.gradle;
+package com.opitzconsulting.orcas.gradle
+
+import org.gradle.api.tasks.Internal;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -57,6 +59,7 @@ public class OrcasDropReplaceablesTask extends BaseOrcasTask
     }
   }
 
+  @Internal
   protected boolean isRunOnlyIfReplaceablesExists()
   {
     return false;

diff --git a/...ugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasInstallReplaceablesTask.groovy b/...ugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasInstallReplaceablesTask.groovy
@@ -2,12 +2,15 @@ package com.opitzconsulting.orcas.gradle;
 
 import de.opitzconsulting.orcas.diff.OrcasScriptRunner;
 import de.opitzconsulting.orcas.diff.ParametersCall;
-import org.gradle.api.file.FileCollection;
+import org.gradle.api.file.FileCollection
+import org.gradle.api.tasks.Internal;
 
 public class OrcasInstallReplaceablesTask extends BaseOrcasTask
 {
+  @Internal
   def logname = "install-replaceables";
 
+  @Internal
   FileCollection scriptFiles;
 
   protected String getLogname()

diff --git a/...plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasSchemaSyncStaticsTask.groovy b/...plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasSchemaSyncStaticsTask.groovy
@@ -2,10 +2,12 @@ package com.opitzconsulting.orcas.gradle
 
 import de.opitzconsulting.orcas.diff.OrcasMain;
 import de.opitzconsulting.orcas.diff.Parameters.JdbcConnectParameters;
-import de.opitzconsulting.orcas.diff.ParametersCall;
+import de.opitzconsulting.orcas.diff.ParametersCall
+import org.gradle.api.tasks.Internal;
 
 public class OrcasSchemaSyncStaticsTask extends BaseOrcasTask
 {
+  @Internal
   private String logname = "sync-statics";
 
   @Override

diff --git a/...dle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasUpdateStaticsTask.groovy b/...dle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/OrcasUpdateStaticsTask.groovy
@@ -2,16 +2,21 @@ package com.opitzconsulting.orcas.gradle
 
 import de.opitzconsulting.orcas.diff.OrcasMain;
 import de.opitzconsulting.orcas.diff.ParametersCall;
-import org.gradle.api.file.FileCollection;
+import org.gradle.api.file.FileCollection
+import org.gradle.api.tasks.Internal;
 
 public class OrcasUpdateStaticsTask extends BaseOrcasTask
 {
+  @Internal
   public String logname = "update-statics";
 
+  @Internal
   FileCollection scriptFiles;
 
+  @Internal
   FileCollection relevantScriptFiles;
 
+  @Internal
   FileCollection schemaFiles;
 
   @Override