646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
129 lines
6.6 KiB
Diff
129 lines
6.6 KiB
Diff
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
|
|
--- a/forge-gui-desktop/pom.xml
|
|
+++ b/forge-gui-desktop/pom.xml
|
|
@@ -71,62 +71,6 @@
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
|
|
- <artifactId>launch4j-maven-plugin</artifactId>
|
|
- <version>2.5.1</version>
|
|
- <executions>
|
|
- <execution>
|
|
- <id>l4j-gui</id>
|
|
- <phase>package</phase>
|
|
- <goals>
|
|
- <goal>launch4j</goal>
|
|
- </goals>
|
|
- <configuration>
|
|
- <headerType>gui</headerType>
|
|
- <outfile>${project.build.directory}/forge.exe</outfile>
|
|
- <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
|
|
- <dontWrapJar>true</dontWrapJar>
|
|
- <errTitle>forge</errTitle>
|
|
- <downloadUrl>https://bell-sw.com/pages/downloads/#jdk-17-lts</downloadUrl>
|
|
- <icon>src/main/config/forge.ico</icon>
|
|
- <classPath>
|
|
- <mainClass>forge.view.Main</mainClass>
|
|
- <addDependencies>false</addDependencies>
|
|
- <preCp>anything</preCp>
|
|
- </classPath>
|
|
- <jre>
|
|
- <minVersion>17</minVersion>
|
|
- <requiresJdk>true</requiresJdk>
|
|
- <maxHeapSize>4096</maxHeapSize>
|
|
- <opts>
|
|
- <opt>${mandatory.java.args}</opt>
|
|
- <opt>${addopen.java.args}</opt>
|
|
- </opts>
|
|
- </jre>
|
|
- <versionInfo>
|
|
- <fileVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </fileVersion>
|
|
- <txtFileVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </txtFileVersion>
|
|
- <fileDescription>Forge</fileDescription>
|
|
- <copyright>Forge</copyright>
|
|
- <productVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </productVersion>
|
|
- <txtProductVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </txtProductVersion>
|
|
- <productName>Forge</productName>
|
|
- <internalName>forge</internalName>
|
|
- <originalFilename>forge.exe</originalFilename>
|
|
- </versionInfo>
|
|
- </configuration>
|
|
- </execution>
|
|
- </executions>
|
|
- </plugin>
|
|
- <plugin>
|
|
<groupId>com.google.code.maven-replacer-plugin</groupId>
|
|
<artifactId>replacer</artifactId>
|
|
<version>1.5.3</version>
|
|
diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
|
|
--- a/forge-gui-mobile-dev/pom.xml
|
|
+++ b/forge-gui-mobile-dev/pom.xml
|
|
@@ -61,57 +61,6 @@
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
|
|
- <artifactId>launch4j-maven-plugin</artifactId>
|
|
- <version>2.5.1</version>
|
|
- <executions>
|
|
- <execution>
|
|
- <id>l4j-adv</id>
|
|
- <phase>package</phase>
|
|
- <goals>
|
|
- <goal>launch4j</goal>
|
|
- </goals>
|
|
- <configuration>
|
|
- <headerType>gui</headerType>
|
|
- <outfile>${project.build.directory}/forge-adventure.exe</outfile>
|
|
- <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
|
|
- <dontWrapJar>true</dontWrapJar>
|
|
- <errTitle>forge</errTitle>
|
|
- <downloadUrl>https://bell-sw.com/pages/downloads/#jdk-17-lts</downloadUrl>
|
|
- <icon>src/main/config/forge-adventure.ico</icon>
|
|
- <jre>
|
|
- <minVersion>17</minVersion>
|
|
- <requiresJdk>true</requiresJdk>
|
|
- <maxHeapSize>4096</maxHeapSize>
|
|
- <opts>
|
|
- <opt>${mandatory.java.args}</opt>
|
|
- </opts>
|
|
- </jre>
|
|
- <versionInfo>
|
|
- <fileVersion>
|
|
- 1.0.0.0
|
|
- </fileVersion>
|
|
- <txtFileVersion>
|
|
- 1.0.0.0
|
|
- </txtFileVersion>
|
|
- <fileDescription>Forge</fileDescription>
|
|
- <copyright>Forge</copyright>
|
|
- <productVersion>
|
|
- 1.0.0.0
|
|
- </productVersion>
|
|
- <txtProductVersion>
|
|
- 1.0.0.0
|
|
- </txtProductVersion>
|
|
- <productName>forge-adventure</productName>
|
|
- <internalName>forge-adventure</internalName>
|
|
- <originalFilename>forge-adventure.exe</originalFilename>
|
|
- </versionInfo>
|
|
- </configuration>
|
|
- </execution>
|
|
- <!--extra-->
|
|
- </executions>
|
|
- </plugin>
|
|
- <plugin>
|
|
<groupId>com.google.code.maven-replacer-plugin</groupId>
|
|
<artifactId>replacer</artifactId>
|
|
<version>1.5.3</version>
|
|
|