mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-12 00:38:44 +00:00
fix compilation
This commit is contained in:
Anthony Calosa
2
.github/workflows/snapshots-android.yml
vendored
2
.github/workflows/snapshots-android.yml
vendored
@@ -91,7 +91,7 @@ jobs:
|
||||
export _JAVA_OPTIONS="-Xmx2g"
|
||||
d=$(date +%m-%d)
|
||||
# Replace date in forge-gui-mobile/src/forge/Forge.java
|
||||
sed -i -e "s/-SNAPSHOT/-SNAPSHOT-${d}/g" forge-gui-mobile/src/forge/Forge.java
|
||||
# sed -i -e "s/-SNAPSHOT/-SNAPSHOT-${d}/g" forge-gui-mobile/src/forge/Forge.java
|
||||
mvn -U -B -P android-release-build install -e -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=35.0.0 -Dmaven.test.skip=true
|
||||
mkdir -p forge-gui-android/target/upload
|
||||
mv forge-gui-android/target/*-signed-aligned.apk forge-gui-android/target/upload/
|
||||
|
||||
12
.github/workflows/snapshots-pc.yml
vendored
12
.github/workflows/snapshots-pc.yml
vendored
@@ -55,13 +55,13 @@ jobs:
|
||||
|
||||
- name: Rename before upload
|
||||
run: |
|
||||
mkdir tarball
|
||||
mkdir izpack
|
||||
# If this works just gotta figure out how to append datetime
|
||||
mv /home/runner/.m2/repository/forge/forge-gui-desktop/*/*.bz2 tarball/
|
||||
cd tarball
|
||||
out="$(basename -s .tar.bz2 *)"
|
||||
mv /home/runner/.m2/repository/forge/forge-installer/*/*.jar izpack/
|
||||
cd izpack
|
||||
out="$(basename -s .jar *)"
|
||||
d=$(date +%m-%d)
|
||||
mv "${out}.tar.bz2" "${out}-${d}.tar.bz2"
|
||||
mv "${out}.jar" "${out}-${d}.jar"
|
||||
|
||||
- name: 📂 Sync files
|
||||
uses: SamKirkland/FTP-Deploy-Action@v4.3.4
|
||||
@@ -69,7 +69,7 @@ jobs:
|
||||
server: ftp.cardforge.org
|
||||
username: ${{ secrets.FTP_USERNAME }}
|
||||
password: ${{ secrets.FTP_PASSWORD }}
|
||||
local-dir: tarball/
|
||||
local-dir: izpack/
|
||||
server-dir: downloads/dailysnapshots/
|
||||
exclude: |
|
||||
*.jar
|
||||
|
||||
2
.github/workflows/test-build.yaml
vendored
2
.github/workflows/test-build.yaml
vendored
@@ -26,4 +26,4 @@ jobs:
|
||||
run: |
|
||||
export DISPLAY=":1"
|
||||
Xvfb :1 -screen 0 800x600x8 &
|
||||
mvn -U -B clean -P windows-linux test
|
||||
mvn -U -B clean -P test
|
||||
|
||||
@@ -20,7 +20,61 @@
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
|
||||
<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>
|
||||
</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>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
@@ -353,106 +407,6 @@
|
||||
</dependencies>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>windows-linux</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<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>
|
||||
</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>
|
||||
<!--extra-->
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<version>3.6.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>released-version</id>
|
||||
<phase>validate</phase>
|
||||
<goals>
|
||||
<goal>released-version</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>parse-version</id>
|
||||
<goals>
|
||||
<goal>parse-version</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>attach-distribution</id>
|
||||
<phase>post-integration-test</phase>
|
||||
<goals>
|
||||
<goal>attach-artifact</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifacts>
|
||||
<artifact>
|
||||
<file>${basedir}/../forge-installer/target/forge.zip</file>
|
||||
<type>zip</type>
|
||||
</artifact>
|
||||
</artifacts>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<properties>
|
||||
<license.file.name>"LICENSE.txt"</license.file.name>
|
||||
|
||||
@@ -47,33 +47,6 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.izpack</groupId>
|
||||
<artifactId>izpack-maven-plugin</artifactId>
|
||||
<version>5.2.3</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>post-integration-test</phase>
|
||||
<goals>
|
||||
<goal>izpack</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<!-- base for relative paths in izpack descriptor -->
|
||||
<baseDir>${project.basedir}/target</baseDir>
|
||||
<installFile>${project.basedir}/target/install.xml</installFile>
|
||||
<outputDirectory>${project.basedir}/target</outputDirectory>
|
||||
<finalName>${project.build.finalName}</finalName>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.izpack</groupId>
|
||||
<artifactId>izpack-panel</artifactId>
|
||||
<version>5.2.3</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.google.code.maven-replacer-plugin</groupId>
|
||||
<artifactId>replacer</artifactId>
|
||||
@@ -104,6 +77,54 @@
|
||||
</replacements>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>forge</groupId>
|
||||
<artifactId>forge-gui-mobile-dev</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>forge</groupId>
|
||||
<artifactId>forge-gui-desktop</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>windows-linux</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.izpack</groupId>
|
||||
<artifactId>izpack-maven-plugin</artifactId>
|
||||
<version>5.2.3</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>post-integration-test</phase>
|
||||
<goals>
|
||||
<goal>izpack</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<!-- base for relative paths in izpack descriptor -->
|
||||
<baseDir>${project.basedir}/target</baseDir>
|
||||
<installFile>${project.basedir}/target/install.xml</installFile>
|
||||
<outputDirectory>${project.basedir}/target</outputDirectory>
|
||||
<finalName>${project.build.finalName}</finalName>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.izpack</groupId>
|
||||
<artifactId>izpack-panel</artifactId>
|
||||
<version>5.2.3</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
@@ -121,13 +142,6 @@
|
||||
<phase>initialize</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
<!--mkdir dir="${project.basedir}/target" />
|
||||
<delete>
|
||||
<fileset dir="${project.basedir}/target" includes="*.jar" />
|
||||
<fileset dir="${project.basedir}/target" includes="*.txt" />
|
||||
<fileset dir="${project.basedir}/target" includes="*.xml" />
|
||||
<fileset dir="${project.basedir}/target" includes="*.zip" />
|
||||
</delete-->
|
||||
<copy todir="${project.basedir}/target">
|
||||
<fileset dir="${basedir}" includes="*.png" />
|
||||
<fileset dir="${basedir}" includes="*.txt" />
|
||||
@@ -162,8 +176,8 @@
|
||||
<include name="res/**" />
|
||||
<exclude name="res/cardsfolder/**" />
|
||||
</fileset>
|
||||
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge-gui-desktop-${project.version}-jar-with-dependencies.jar" />
|
||||
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.exe" />
|
||||
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge-gui-desktop-${revision}-jar-with-dependencies.jar" />
|
||||
<fileset dir="${project.build.directory}/../../adventure-editor/tools" includes="gdx-particle-editor.jar" />
|
||||
<fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.exe" />
|
||||
<fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.sh" />
|
||||
@@ -232,6 +246,43 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<version>3.6.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>released-version</id>
|
||||
<phase>validate</phase>
|
||||
<goals>
|
||||
<goal>released-version</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>parse-version</id>
|
||||
<goals>
|
||||
<goal>parse-version</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>attach-distribution</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>attach-artifact</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifacts>
|
||||
<artifact>
|
||||
<file>${basedir}/target/${project.build.finalName}.jar</file>
|
||||
<type>jar</type>
|
||||
</artifact>
|
||||
</artifacts>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
4
pom.xml
4
pom.xml
@@ -331,7 +331,7 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<!--plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>flatten-maven-plugin</artifactId>
|
||||
<version>1.6.0</version>
|
||||
@@ -355,7 +355,7 @@
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugin-->
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user