Migrate build.gradle to gradle 9 version with Gradle warpper

.github/workflows/gradle-cd.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '21'
           distribution: 'adopt-openj9'
 
       - name: Set up Git

.github/workflows/gradle-ci.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '21'
           distribution: 'adopt-openj9'
 
       - name: Grant execute permission for gradlew

build.gradle

@@ -6,6 +6,7 @@
  */
 
 import org.apache.tools.ant.filters.ReplaceTokens
+import groovy.xml.XmlParser
 
 String pluginName = "IBM-MQ-zOS-UCD"
 
@@ -46,6 +47,10 @@ dependencies {
     testImplementation 'org.hamcrest:hamcrest-core:1.3'
 }
 
+configurations {
+    compileClasspath.extendsFrom implementation
+}
+
 sourceSets {
     main {
         groovy {
@@ -136,7 +141,7 @@ tasks.register('gatherI18n', JavaExec) {
     delete buildLocaleDir
     mkdir buildLocaleDir
 
-    main = 'i18n-scraper'
+	mainClass.set('i18n-scraper')
     args 'build/locale/en.properties'
     classpath = sourceSets.main.runtimeClasspath
 }
@@ -145,6 +150,15 @@ tasks.register('cleanAll') {
     dependsOn('clean', 'cleanCopyDeps', 'cleanDistPlugin', 'cleanGatherI18n')
 }
 
+//extractGPU and copyi18n uses same lib so to ensure both waits for copyDeps
+tasks.named("extractGPU") {
+    dependsOn("copyDeps")
+}
+
+tasks.named("copyi18n") {
+    dependsOn("copyDeps")
+}
+
 static String stripVersion(fileNameWithVersion) {
     String ext = fileNameWithVersion.substring(fileNameWithVersion.lastIndexOf("."), fileNameWithVersion.length())
     int end = fileNameWithVersion.lastIndexOf("-")

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/groovy/com/urbancode/air/plugin/helpers/NewAirPluginTool.groovy

@@ -0,0 +1,81 @@
+/**
+ * © Copyright IBM Corporation 2016, 2023.
+ * This is licensed under the following license.
+ * The Eclipse Public 1.0 License (http://www.eclipse.org/legal/epl-v10.html)
+ * U.S. Government Users Restricted Rights:  Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+ */
+package com.urbancode.air.plugin.helpers
+
+public class NewAirPluginTool {
+
+    //**************************************************************************
+    // CLASS
+    //**************************************************************************
+
+    //**************************************************************************
+    // INSTANCE
+    //**************************************************************************
+
+    final public def isWindows = (System.getProperty('os.name') =~ /(?i)windows/).find()
+
+    def out = System.out;
+    def err = System.err;
+
+    private def inPropsFile;
+    private def outPropsFile;
+
+    def outProps;
+
+    public NewAirPluginTool(def inFile, def outFile){
+        inPropsFile = inFile;
+        outPropsFile = outFile;
+        outProps = new Properties();
+    }
+
+    public Properties getStepProperties() {
+        def props = new Properties();
+        def inputPropsFile = this.inPropsFile;
+        def inputPropsStream = null;
+        try {
+            inputPropsStream = new FileInputStream(inputPropsFile);
+            props.load(inputPropsStream);
+        }
+        catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        finally {
+            inputPropsStream.close();
+        }
+        return props;
+    }
+
+    public void setOutputProperty(String name, String value) {
+        this.outProps.setProperty(name, value);
+    }
+
+    public void setOutputProperties() {
+        OutputStream outputPropsStream = null;
+        try {
+            outputPropsStream = new FileOutputStream(this.outPropsFile);
+            outProps.store(outputPropsStream, "");
+        }
+        finally {
+            if (outputPropsStream != null) {
+                outputPropsStream.close();
+            }
+        }
+    }
+
+    public String getAuthToken() {
+        String authToken = System.getenv("AUTH_TOKEN");
+        return "{\"token\" : \"" + authToken + "\"}";
+    }
+
+    public String getAuthTokenUsername() {
+        return "PasswordIsAuthToken";
+    }
+
+    public void storeOutputProperties() {
+        setOutputProperties();
+    }
+}