Fix build

Bios-Marcel · Jul 12, 2024 · f30e4c0 · f30e4c0
1 parent 96f3018
commit f30e4c0
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 2 deletions.
diff --git 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:jar"
+          ./mvnw compile package javafx:jlink jpackage:jpackage
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4

diff --git a/README.md b/README.md
@@ -30,7 +30,8 @@ In order to delete the data, simply remove `$env.APPDATA/baka`.
 An installer can be built via maven:
 
 ```shell
-mvnw compile javafx:jlink jpackage:jpackage
+./mvnw dependency:get -Dartifact="group-id:artefact-id:version:jar"
+./mvnw compile package javafx:jlink jpackage:jpackage
 ```
 
 On Windows, the installer is a little buggy, as automatic reinstallation does not work.

diff --git 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>