diff --git a/groovy18-reproducible-bytecode.patch b/groovy18-reproducible-bytecode.patch
index 9867fcc..f6d5de9 100644
--- a/groovy18-reproducible-bytecode.patch
+++ b/groovy18-reproducible-bytecode.patch
@@ -56,6 +56,26 @@
          if (closureMap != null) {
              map = closureMap;
          }
+--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java	2023-09-26 13:31:23.336209403 +0200
++++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java	2023-09-26 22:39:50.777395449 +0200
+@@ -42,7 +42,7 @@
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+ import java.util.ArrayList;
+-import java.util.HashSet;
++import java.util.TreeSet;
+ import java.util.Iterator;
+ import java.util.LinkedList;
+ import java.util.List;
+@@ -2573,7 +2573,7 @@
+     private void checkDuplicateNamedParams(AST elist, List expressionList) {
+         if (expressionList.isEmpty()) return;
+ 
+-        Set<String> namedArgumentNames = new HashSet<String>();
++        Set<String> namedArgumentNames = new TreeSet<String>();
+         for (Object expression : expressionList) {
+             MapEntryExpression meExp = (MapEntryExpression) expression;
+             if (meExp.getKeyExpression() instanceof ConstantExpression) {
 --- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/ClassNode.java	2023-09-26 13:31:23.339542759 +0200
 +++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/ClassNode.java	2023-09-26 19:47:32.055269643 +0200
 @@ -406,7 +406,7 @@
@@ -227,6 +247,26 @@
          // ret contains the type specs, what we now need is the type spec for the
          // current class. To get that we first apply the type parameters to the
          // current class and then use the type names of the current class to reset
+--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/javac/JavaStubGenerator.java	2023-09-26 13:31:23.359542893 +0200
++++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/javac/JavaStubGenerator.java	2023-09-26 22:43:10.372033609 +0200
+@@ -41,7 +41,7 @@
+ import java.io.StringWriter;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+-import java.util.HashMap;
++import java.util.TreeMap;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+@@ -52,7 +52,7 @@
+     private File outputPath;
+     private List<String> toCompile = new ArrayList<String>();
+     private ArrayList<MethodNode> propertyMethods = new ArrayList<MethodNode>();
+-    private Map<String, MethodNode> propertyMethodsWithSigs = new HashMap<String, MethodNode>();
++    private Map<String, MethodNode> propertyMethodsWithSigs = new TreeMap<String, MethodNode>();
+     private ArrayList<ConstructorNode> constructors = new ArrayList<ConstructorNode>();
+     private ModuleNode currentModule;
+ 
 --- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java	2023-09-26 13:31:23.362876249 +0200
 +++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java	2023-09-26 19:55:46.378599493 +0200
 @@ -59,7 +59,7 @@