From ad39ddb81ca12a89192bb6103bf2905f5193b4e9 Mon Sep 17 00:00:00 2001
From: Sandhya-Kamurti-01 <sandhyaparush.kamur@hcl-software.com>
Date: Wed, 11 Feb 2026 16:28:53 +0530
Subject: [PATCH 1/2] groovy upgrade

---
 ivy.xml         |  5 ++++-
 ivysettings.xml | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 ivysettings.xml

diff --git a/ivy.xml b/ivy.xml
index d9695b5..2636c45 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -16,6 +16,9 @@
         <!-- http://search.maven.org/#artifactdetails%7Corg.hamcrest%7Chamcrest-core%7C1.3%7Cjar -->
         <dependency org="org.hamcrest" name="hamcrest-core" rev="1.3" transitive="false" conf="test->default"/>
         <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all -->
-        <dependency org="org.codehaus.groovy" name="groovy-all" rev="1.8.8" transitive="false" conf="build->default"/>
+        <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all -->
+        <dependency org="org.codehaus.groovy" name="groovy-all" rev="3.0.9" transitive="false" conf="build->default"/>
+
+        <dependency org="org.codehaus.groovy" name="groovy-ant" rev="3.0.9" transitive="false" conf="build->default"/>
     </dependencies>
 </ivy-module>
\ No newline at end of file
diff --git a/ivysettings.xml b/ivysettings.xml
new file mode 100644
index 0000000..10c8182
--- /dev/null
+++ b/ivysettings.xml
@@ -0,0 +1,17 @@
+<ivysettings>
+
+    <include url="${ivy.default.settings.dir}/ivysettings.xml"/>
+
+    <resolvers>
+
+        <ibiblio name="central" m2compatible="true"  root="https://repo.maven.apache.org/maven2/"/>
+
+        <chain name="external" returnFirst="true">
+            <resolver ref="default"/>
+            <resolver ref="central"/>
+        </chain>
+    </resolvers>
+
+    <settings defaultResolver="external"/>
+
+</ivysettings>

From c026569da03d0de7981ed447020f97cd37be26e2 Mon Sep 17 00:00:00 2001
From: Sandhya-Kamurti-01 <sandhyaparush.kamur@hcl-software.com>
Date: Tue, 17 Feb 2026 11:46:09 +0530
Subject: [PATCH 2/2] remove final

---
 src/createSimulator.groovy | 2 +-
 src/deleteSimulator.groovy | 2 +-
 src/installApp.groovy      | 2 +-
 src/startSimulator.groovy  | 2 +-
 src/uiTest.groovy          | 2 +-
 src/uninstallApp.groovy    | 2 +-
 src/unitTest.groovy        | 2 +-
 src/xcrun.groovy           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/createSimulator.groovy b/src/createSimulator.groovy
index 117609a..6a72a65 100644
--- a/src/createSimulator.groovy
+++ b/src/createSimulator.groovy
@@ -11,7 +11,7 @@ import com.urbancode.air.AirPluginTool;
 import com.ibm.rational.air.plugin.ios.Util;
 
 def apTool = new AirPluginTool(this.args[0], this.args[1]);
-final def props = apTool.getStepProperties();
+def props = apTool.getStepProperties();
 
 def simName = props['simName']
 def simDeviceType = props['simDeviceType']
diff --git a/src/deleteSimulator.groovy b/src/deleteSimulator.groovy
index 8f913a9..d6b8d04 100644
--- a/src/deleteSimulator.groovy
+++ b/src/deleteSimulator.groovy
@@ -11,7 +11,7 @@ import com.urbancode.air.AirPluginTool;
 import com.ibm.rational.air.plugin.ios.Util;
 
 def apTool = new AirPluginTool(this.args[0], this.args[1]);
-final def props = apTool.getStepProperties();
+def props = apTool.getStepProperties();
 
 def udid = props['udid']
 def simName = props['simName']
diff --git a/src/installApp.groovy b/src/installApp.groovy
index bcac133..f50dc01 100644
--- a/src/installApp.groovy
+++ b/src/installApp.groovy
@@ -11,7 +11,7 @@ import com.urbancode.air.AirPluginTool;
 import com.ibm.rational.air.plugin.ios.Util;
 
 def apTool = new AirPluginTool(this.args[0], this.args[1]);
-final def props = apTool.getStepProperties();
+def props = apTool.getStepProperties();
 
 def app = props['app']
 def udid = props['udid']
diff --git a/src/startSimulator.groovy b/src/startSimulator.groovy
index e7ee41c..323cc6f 100644
--- a/src/startSimulator.groovy
+++ b/src/startSimulator.groovy
@@ -16,7 +16,7 @@ import com.urbancode.air.AirPluginTool;
 import com.ibm.rational.air.plugin.ios.Util;
 
 def apTool = new AirPluginTool(this.args[0], this.args[1]);
-final def props = apTool.getStepProperties();
+def props = apTool.getStepProperties();
 
 def udid = props['udid']
 def simName = props['simName']
diff --git a/src/uiTest.groovy b/src/uiTest.groovy
index 926220a..bfc3435 100644
--- a/src/uiTest.groovy
+++ b/src/uiTest.groovy
@@ -12,7 +12,7 @@ import com.urbancode.air.CommandHelper;
 import com.ibm.rational.air.plugin.ios.Util;
 
 def apTool = new AirPluginTool(this.args[0], this.args[1]);
-final def props = apTool.getStepProperties();
+def props = apTool.getStepProperties();
 
 def app = props['app']
 def script = props['script']
diff --git a/src/uninstallApp.groovy b/src/uninstallApp.groovy
index 7789352..a890477 100644
--- a/src/uninstallApp.groovy
+++ b/src/uninstallApp.groovy
@@ -11,7 +11,7 @@ import com.urbancode.air.AirPluginTool;
 import com.ibm.rational.air.plugin.ios.Util;
 
 def apTool = new AirPluginTool(this.args[0], this.args[1]);
-final def props = apTool.getStepProperties();
+def props = apTool.getStepProperties();
 
 def bundleID = props['bundleID']
 def udid = props['udid']
diff --git a/src/unitTest.groovy b/src/unitTest.groovy
index 2c060c8..fcc5901 100644
--- a/src/unitTest.groovy
+++ b/src/unitTest.groovy
@@ -11,7 +11,7 @@ import com.urbancode.air.AirPluginTool;
 import com.ibm.rational.air.plugin.ios.Util;
 
 def apTool = new AirPluginTool(this.args[0], this.args[1]);
-final def props = apTool.getStepProperties();
+def props = apTool.getStepProperties();
 
 def project = props['project']
 def workspace = props['workspace']
diff --git a/src/xcrun.groovy b/src/xcrun.groovy
index cc87a5d..f6a6172 100644
--- a/src/xcrun.groovy
+++ b/src/xcrun.groovy
@@ -11,7 +11,7 @@ import com.urbancode.air.AirPluginTool;
 import com.ibm.rational.air.plugin.ios.Util;
 
 def apTool = new AirPluginTool(this.args[0], this.args[1]);
-final def props = apTool.getStepProperties();
+def props = apTool.getStepProperties();
 
 def xcrunPath = props['xcrunPath']
 def additionalArgs = props['additionalArgs']