From 1940289d865775a625b069ca73eb0e4464b0c777 Mon Sep 17 00:00:00 2001
From: Marcel Schramm <marceloschr@googlemail.com>
Date: Fri, 12 Jul 2024 17:44:48 +0200
Subject: [PATCH] Fix build

---
 .github/workflows/build.yml |  3 ++-
 pom.xml                     | 45 +++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4449c82..26a6c7c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,8 @@ jobs:
       - name: Build artifact
         shell: bash
         run: |
-          ./mvnw compile javafx:jlink jpackage:jpackage
+          ./mvnw dependency:get -Dartifact="group-id:artefact-id:version"
+          ./mvnw compile package javafx:jlink jpackage:jpackage
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
diff --git a/pom.xml b/pom.xml
index ef68d7d..2d7aedb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,13 @@
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
             <version>4.13.1</version>
+            <!--
+                Due to the fact that the antlr people are not adding a Java module and Java 21+ not supporting
+                automatic modules anymore, we are using moditect to generate a module, which we then specify as a direct
+                file system dependency.
+            -->
+            <scope>system</scope>
+            <systemPath>${project.build.directory}/modules/antlr4-runtime-4.13.1.jar</systemPath>
         </dependency>
 
         <!-- Nullness annotations -->
@@ -95,6 +102,44 @@
                     <target>22</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <version>1.2.2.Final</version>
+                <executions>
+                    <execution>
+                        <id>add-module-infos</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/modules</outputDirectory>
+                            <overwriteExistingFiles>true</overwriteExistingFiles>
+                            <modules>
+                                <module>
+                                    <artifact>
+                                        <groupId>org.antlr</groupId>
+                                        <artifactId>antlr4-runtime</artifactId>
+                                        <version>4.13.1</version>
+                                    </artifact>
+                                    <moduleInfoSource>
+                                        module org.antlr.antlr4.runtime {
+                                        exports org.antlr.v4.runtime;
+                                        exports org.antlr.v4.runtime.atn;
+                                        exports org.antlr.v4.runtime.dfa;
+                                        exports org.antlr.v4.runtime.misc;
+                                        exports org.antlr.v4.runtime.tree;
+                                        exports org.antlr.v4.runtime.tree.pattern;
+                                        exports org.antlr.v4.runtime.tree.xpath;
+                                        }
+                                    </moduleInfoSource>
+                                </module>
+                            </modules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.panteleyev</groupId>
                 <artifactId>jpackage-maven-plugin</artifactId>