external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-12 00:38:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

update android builds to SDK 29, use Java 11

Browse Source
This commit is contained in:
Anthony Calosa
2024-09-08 20:44:23 +08:00
parent 036365e984
commit 09b5ee8ac5
15 changed files with 136 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/publish-android.yml vendored
View File

@@ -20,10 +20,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set up JDK 8 - name: Set up JDK 11
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
java-version: '8' java-version: '11'
distribution: 'temurin' distribution: 'temurin'
cache: 'maven' cache: 'maven'
server-id: cardforge-repo server-id: cardforge-repo
@@ -43,7 +43,7 @@ jobs:
uses: maxim-lobanov/setup-android-tools@v1 uses: maxim-lobanov/setup-android-tools@v1
with: with:
packages: | packages: |
platforms;android-26 platforms;android-29
build-tools;30.0.3 build-tools;30.0.3
- name: Install virtual framebuffer (if not available) to allow running GUI on a headless server - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server

6
.github/workflows/snapshots-android.yml vendored
View File

@@ -24,10 +24,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set up JDK 8 - name: Set up JDK 11
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
java-version: '8' java-version: '11'
distribution: 'temurin' distribution: 'temurin'
cache: 'maven' cache: 'maven'
server-id: cardforge-repo server-id: cardforge-repo
@@ -46,7 +46,7 @@ jobs:
- name: Set Up Android tools - name: Set Up Android tools
run: | run: |
JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools" JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools"
JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "platforms;android-26" JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "platforms;android-29"
JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;30.0.3" JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;30.0.3"
- name: Install virtual framebuffer (if not available) to allow running GUI on a headless server - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server

2
.github/workflows/test-build.yaml vendored
View File

@@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
java: [ '8', '11' ] java: [ '11' ]
name: Test with Java ${{ matrix.Java }} name: Test with Java ${{ matrix.Java }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

58
forge-adventure/pom.xml
View File

@@ -46,65 +46,19 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.akathist.maven.plugins.launch4j</groupId> <groupId>com.akathist.maven.plugins.launch4j</groupId>
<artifactId>launch4j-maven-plugin</artifactId> <artifactId>launch4j-maven-plugin</artifactId>
<version>1.7.25</version> <version>2.1.2</version>
<executions> <executions>
<execution>
<id>l4j-adv</id>
<phase>package</phase>
<goals>
<goal>launch4j</goal>
</goals>
<configuration>
<headerType>gui</headerType>
<outfile>${project.build.directory}/forge-adventure-editor-java8.exe</outfile>
<jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
<dontWrapJar>true</dontWrapJar>
<errTitle>forge</errTitle>
<icon>src/main/config/forge-adventure-editor.ico</icon>
<classPath>
<mainClass>forge.adventure.Main</mainClass>
<addDependencies>false</addDependencies>
<preCp>anything</preCp>
</classPath>
<jre>
<minVersion>1.8.0</minVersion>
<maxHeapSize>4096</maxHeapSize>
<opts>
<opt>-Dfile.encoding=UTF-8</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-editor</productName>
<internalName>forge-adventure-editor</internalName>
<originalFilename>forge-adventure-editor-java8.exe</originalFilename>
</versionInfo>
</configuration>
</execution>
<!--extra--> <!--extra-->
<execution> <execution>
<id>l4j-adv2</id> <id>l4j-adv</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>launch4j</goal> <goal>launch4j</goal>
@@ -132,7 +86,7 @@
<opt>--add-opens java.base/java.math=ALL-UNNAMED</opt> <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
<opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt> <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
<opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt> <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
<opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt> <opt>--add-opens java.base/sun.nio.ch=ALL-UNNAMED</opt>
<opt>--add-opens java.base/java.util=ALL-UNNAMED</opt> <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
<opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt> <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
<opt>--add-opens java.base/java.text=ALL-UNNAMED</opt> <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
@@ -285,7 +239,7 @@
<dependency> <dependency>
<groupId>org.jetbrains</groupId> <groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId> <artifactId>annotations</artifactId>
<version>22.0.0</version> <version>24.0.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

8
forge-gui-android/AndroidManifest.xml
View File

@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="forge.app" package="forge.app"
android:versionCode="106650000" android:versionCode="106650000"
android:versionName="1.6.65" > <!-- versionName should be updated and it's used for Sentry releases tag --> android:versionName="1.6.65" > <!-- versionName should be updated and it's used for Sentry releases tag -->
<uses-sdk <uses-sdk
android:minSdkVersion="26" android:minSdkVersion="26"
android:targetSdkVersion="28" /> android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <!-- This one needs Android Runtime Permission for Android 6+ --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <!-- This one needs Android Runtime Permission for Android 6+ -->
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" tools:node="remove" />
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -23,7 +26,8 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:label="@string/app_name" android:label="@string/app_name"
android:largeHeap="true"> android:largeHeap="true"
android:resizeableActivity="false">
<activity <activity
android:name=".Launcher" android:name=".Launcher"
android:configChanges="density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode" android:configChanges="density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"

BIN
forge-gui-android/libs/sun-misc.jar Normal file
View File

Binary file not shown.

82
forge-gui-android/pom.xml
View File

@@ -40,8 +40,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
@@ -57,7 +57,7 @@
<dependency> <dependency>
<groupId>org.robolectric</groupId> <groupId>org.robolectric</groupId>
<artifactId>android-all</artifactId> <artifactId>android-all</artifactId>
<version>8.0.0_r4-robolectric-0</version> <version>10-robolectric-5803371</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -220,7 +220,29 @@
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<version>2.3.1</version> <version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>sun</groupId>
<artifactId>misc</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${pom.basedir}/libs/sun-misc.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.proguard</groupId> <groupId>net.sf.proguard</groupId>
@@ -235,7 +257,7 @@
<debug>true</debug> <debug>true</debug>
</sign> </sign>
<sdk> <sdk>
<platform>26</platform> <platform>29</platform>
<buildTools>30.0.3</buildTools> <buildTools>30.0.3</buildTools>
</sdk> </sdk>
<dexForceJumbo>true</dexForceJumbo> <dexForceJumbo>true</dexForceJumbo>
@@ -284,7 +306,29 @@
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<version>2.3.1</version> <version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>sun</groupId>
<artifactId>misc</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${pom.basedir}/libs/sun-misc.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.proguard</groupId> <groupId>net.sf.proguard</groupId>
@@ -299,7 +343,7 @@
<debug>false</debug> <debug>false</debug>
</sign> </sign>
<sdk> <sdk>
<platform>26</platform> <platform>29</platform>
<buildTools>30.0.3</buildTools> <buildTools>30.0.3</buildTools>
</sdk> </sdk>
<zipalign> <zipalign>
@@ -385,7 +429,29 @@
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<version>2.3.1</version> <version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>sun</groupId>
<artifactId>misc</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${pom.basedir}/libs/sun-misc.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.proguard</groupId> <groupId>net.sf.proguard</groupId>

12
forge-gui-android/proguard.cfg
View File

@@ -9,12 +9,12 @@
## Uncomment the line below and set it to the location of rt.jar in JDK if the Proguard step fails to find the libraries ## Uncomment the line below and set it to the location of rt.jar in JDK if the Proguard step fails to find the libraries
## and spits out a thousand-something Class Not Found errors ## and spits out a thousand-something Class Not Found errors
##-libraryjars /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar ##-libraryjars /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar
##-libraryjars <java.home>/jmods/java.base.jmod(!**.jar;!module-info.class) -libraryjars <java.home>/jmods/java.base.jmod(!**.jar;!module-info.class)
##-libraryjars <java.home>/jmods/java.datatransfer.jmod(!**.jar;!module-info.class) -libraryjars <java.home>/jmods/java.datatransfer.jmod(!**.jar;!module-info.class)
##-libraryjars <java.home>/jmods/java.prefs.jmod(!**.jar;!module-info.class) -libraryjars <java.home>/jmods/java.prefs.jmod(!**.jar;!module-info.class)
##-libraryjars <java.home>/jmods/java.xml.jmod(!**.jar;!module-info.class) -libraryjars <java.home>/jmods/java.xml.jmod(!**.jar;!module-info.class)
##-libraryjars <java.home>/jmods/java.desktop.jmod(!**.jar;!module-info.class) -libraryjars <java.home>/jmods/java.desktop.jmod(!**.jar;!module-info.class)
##-libraryjars <java.home>/jmods/jdk.xml.dom.jmod(!**.jar;!module-info.class) -libraryjars <java.home>/jmods/jdk.xml.dom.jmod(!**.jar;!module-info.class)
-dontwarn afu.org.checkerframework.** -dontwarn afu.org.checkerframework.**
-dontwarn io.netty.** -dontwarn io.netty.**

88
forge-gui-desktop/pom.xml
View File

@@ -295,7 +295,7 @@
</goals> </goals>
<configuration> <configuration>
<headerType>gui</headerType> <headerType>gui</headerType>
<outfile>${project.build.directory}/forge-java8.exe</outfile> <outfile>${project.build.directory}/forge.exe</outfile>
<jar>${project.build.finalName}-jar-with-dependencies.jar</jar> <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
<dontWrapJar>true</dontWrapJar> <dontWrapJar>true</dontWrapJar>
<errTitle>forge</errTitle> <errTitle>forge</errTitle>
@@ -306,10 +306,32 @@
<preCp>anything</preCp> <preCp>anything</preCp>
</classPath> </classPath>
<jre> <jre>
<minVersion>1.8.0</minVersion> <minVersion>11.0.1</minVersion>
<jdkPreference>jdkOnly</jdkPreference>
<maxHeapSize>4096</maxHeapSize> <maxHeapSize>4096</maxHeapSize>
<opts> <opts>
<opt>-Dfile.encoding=UTF-8</opt> <opt>-Dfile.encoding=UTF-8</opt>
<opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
<opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
<opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
<opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
<opt>--add-opens java.base/sun.nio.ch=ALL-UNNAMED</opt>
<opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
<opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
<opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
<opt>--add-opens java.desktop/java.awt=ALL-UNNAMED</opt>
<opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
<opt>--add-opens java.desktop/java.awt.image=ALL-UNNAMED</opt>
<opt>--add-opens java.desktop/java.awt.color=ALL-UNNAMED</opt>
<opt>--add-opens java.desktop/sun.awt.image=ALL-UNNAMED</opt>
<opt>--add-opens java.desktop/javax.swing=ALL-UNNAMED</opt>
<opt>--add-opens java.desktop/javax.swing.border=ALL-UNNAMED</opt>
<opt>--add-opens java.desktop/javax.swing.event=ALL-UNNAMED</opt>
<opt>--add-opens java.desktop/sun.swing=ALL-UNNAMED</opt>
<opt>--add-opens java.desktop/java.beans=ALL-UNNAMED</opt>
<opt>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</opt>
<opt>--add-opens java.base/java.net=ALL-UNNAMED</opt>
<opt>-Dio.netty.tryReflectionSetAccessible=true</opt>
</opts> </opts>
</jre> </jre>
<versionInfo> <versionInfo>
@@ -329,7 +351,7 @@
</txtProductVersion> </txtProductVersion>
<productName>Forge</productName> <productName>Forge</productName>
<internalName>forge</internalName> <internalName>forge</internalName>
<originalFilename>forge-java8.exe</originalFilename> <originalFilename>forge.exe</originalFilename>
</versionInfo> </versionInfo>
</configuration> </configuration>
</execution> </execution>
@@ -368,7 +390,6 @@
<include name="res/**" /> <include name="res/**" />
<exclude name="res/cardsfolder/**" /> <exclude name="res/cardsfolder/**" />
</fileset> </fileset>
<fileset dir="${project.build.directory}" includes="forge-java8.exe" />
<fileset dir="${project.build.directory}" includes="forge.exe" /> <fileset dir="${project.build.directory}" includes="forge.exe" />
<fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" /> <fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" />
</copy> </copy>
@@ -377,7 +398,6 @@
<chmod file="${project.build.directory}/${project.build.finalName}/forge.sh" perm="a+rx" /> <chmod file="${project.build.directory}/${project.build.finalName}/forge.sh" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" /> <chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge.cmd" perm="a+rx" /> <chmod file="${project.build.directory}/${project.build.finalName}/forge.cmd" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge-java8.exe" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" /> <chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" />
<tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" compression="bzip2"> <tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" compression="bzip2">
<tarfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}"> <tarfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
@@ -458,53 +478,6 @@
<goals> <goals>
<goal>launch4j</goal> <goal>launch4j</goal>
</goals> </goals>
<configuration>
<headerType>gui</headerType>
<outfile>${project.build.directory}/forge-java8.exe</outfile>
<jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
<dontWrapJar>true</dontWrapJar>
<errTitle>forge</errTitle>
<icon>src/main/config/forge.ico</icon>
<classPath>
<mainClass>forge.view.Main</mainClass>
<addDependencies>false</addDependencies>
<preCp>anything</preCp>
</classPath>
<jre>
<minVersion>1.8.0</minVersion>
<maxHeapSize>4096</maxHeapSize>
<opts>
<opt>-Dfile.encoding=UTF-8</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-java8.exe</originalFilename>
</versionInfo>
</configuration>
</execution>
<!--extra-->
<execution>
<id>l4j-gui2</id>
<phase>package</phase>
<goals>
<goal>launch4j</goal>
</goals>
<configuration> <configuration>
<headerType>gui</headerType> <headerType>gui</headerType>
<outfile>${project.build.directory}/forge.exe</outfile> <outfile>${project.build.directory}/forge.exe</outfile>
@@ -608,17 +581,14 @@
<include name="res/**" /> <include name="res/**" />
<exclude name="res/cardsfolder/**" /> <exclude name="res/cardsfolder/**" />
</fileset> </fileset>
<fileset dir="${project.build.directory}" includes="forge-java8.exe" />
<fileset dir="${project.build.directory}" includes="forge.exe" /> <fileset dir="${project.build.directory}" includes="forge.exe" />
<fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" /> <fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" />
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.exe" /> <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.exe" />
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure-java8.exe" />
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.sh" /> <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.sh" />
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.command" /> <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.command" />
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.cmd" /> <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.cmd" />
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-gui-mobile-dev-${project.version}-jar-with-dependencies.jar" /> <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-gui-mobile-dev-${project.version}-jar-with-dependencies.jar" />
<fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.exe" /> <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.exe" />
<fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor-java8.exe" />
<fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.sh" /> <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.sh" />
<fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.command" /> <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.command" />
<fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.cmd" /> <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.cmd" />
@@ -635,10 +605,8 @@
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.sh" perm="a+rx" /> <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.sh" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.command" perm="a+rx" /> <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.command" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.cmd" perm="a+rx" /> <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.cmd" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge-java8.exe" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" /> <chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.exe" perm="a+rx" /> <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.exe" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-java8.exe" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.exe" perm="a+rx" /> <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.exe" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor-java8.exe" perm="a+rx" /> <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor-java8.exe" perm="a+rx" />
<tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" compression="bzip2"> <tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" compression="bzip2">
@@ -646,17 +614,14 @@
<include name="forge.sh" /> <include name="forge.sh" />
<include name="forge.command" /> <include name="forge.command" />
<include name="forge.cmd" /> <include name="forge.cmd" />
<include name="forge-java8.exe" />
<include name="forge.exe" /> <include name="forge.exe" />
<include name="forge-adventure.sh" /> <include name="forge-adventure.sh" />
<include name="forge-adventure.command" /> <include name="forge-adventure.command" />
<include name="forge-adventure.cmd" /> <include name="forge-adventure.cmd" />
<include name="forge-adventure-java8.exe" />
<include name="forge-adventure.exe" /> <include name="forge-adventure.exe" />
<include name="forge-adventure-editor.sh" /> <include name="forge-adventure-editor.sh" />
<include name="forge-adventure-editor.command" /> <include name="forge-adventure-editor.command" />
<include name="forge-adventure-editor.cmd" /> <include name="forge-adventure-editor.cmd" />
<include name="forge-adventure-editor-java8.exe" />
<include name="forge-adventure-editor.exe" /> <include name="forge-adventure-editor.exe" />
</tarfileset> </tarfileset>
<tarfileset dir="${project.build.directory}/${project.build.finalName}"> <tarfileset dir="${project.build.directory}/${project.build.finalName}">
@@ -664,17 +629,14 @@
<exclude name="forge.sh" /> <exclude name="forge.sh" />
<exclude name="forge.command" /> <exclude name="forge.command" />
<exclude name="forge.cmd" /> <exclude name="forge.cmd" />
<exclude name="forge-java8.exe" />
<exclude name="forge.exe" /> <exclude name="forge.exe" />
<exclude name="forge-adventure.sh" /> <exclude name="forge-adventure.sh" />
<exclude name="forge-adventure.command" /> <exclude name="forge-adventure.command" />
<exclude name="forge-adventure.cmd" /> <exclude name="forge-adventure.cmd" />
<exclude name="forge-adventure-java8.exe" />
<exclude name="forge-adventure.exe" /> <exclude name="forge-adventure.exe" />
<exclude name="forge-adventure-editor.sh" /> <exclude name="forge-adventure-editor.sh" />
<exclude name="forge-adventure-editor.command" /> <exclude name="forge-adventure-editor.command" />
<exclude name="forge-adventure-editor.cmd" /> <exclude name="forge-adventure-editor.cmd" />
<exclude name="forge-adventure-editor-java8.exe" />
<exclude name="forge-adventure-editor.exe" /> <exclude name="forge-adventure-editor.exe" />
</tarfileset> </tarfileset>
</tar> </tar>

4
forge-gui-ios/pom.xml
View File

@@ -25,8 +25,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

51
forge-gui-mobile-dev/pom.xml
View File

@@ -34,8 +34,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>
@@ -76,53 +76,6 @@
<goals> <goals>
<goal>launch4j</goal> <goal>launch4j</goal>
</goals> </goals>
<configuration>
<headerType>gui</headerType>
<outfile>${project.build.directory}/forge-adventure-java8.exe</outfile>
<jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
<dontWrapJar>true</dontWrapJar>
<errTitle>forge</errTitle>
<icon>src/main/config/forge-adventure.ico</icon>
<classPath>
<mainClass>forge.app.Main</mainClass>
<addDependencies>false</addDependencies>
<preCp>anything</preCp>
</classPath>
<jre>
<minVersion>1.8.0</minVersion>
<maxHeapSize>4096</maxHeapSize>
<opts>
<opt>-Dfile.encoding=UTF-8</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-java8.exe</originalFilename>
</versionInfo>
</configuration>
</execution>
<!--extra-->
<execution>
<id>l4j-adv2</id>
<phase>package</phase>
<goals>
<goal>launch4j</goal>
</goals>
<configuration> <configuration>
<headerType>gui</headerType> <headerType>gui</headerType>
<outfile>${project.build.directory}/forge-adventure.exe</outfile> <outfile>${project.build.directory}/forge-adventure.exe</outfile>

4
forge-gui-mobile/pom.xml
View File

@@ -17,8 +17,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

4
forge-gui/MANUAL.txt
View File

@@ -108,8 +108,8 @@ If you're trying to run Forge for the first time, but it doesn't open up, you ca
- Current versions of Forge no longer include a launcher script for Mac OS, proceed to step three. - Current versions of Forge no longer include a launcher script for Mac OS, proceed to step three.
3) Run Forge 3) Run Forge
- On Windows, just type "forge.exe", Enter (If you have Java 8 installed, use forge-java8.exe) - On Windows, just type "forge.exe", Enter.
if you want to run mobile/adventure instead of the desktop interface, type "forge-adventure.exe", Enter (If you have Java 8 installed, use forge-adventure-java8.exe) if you want to run mobile/adventure instead of the desktop interface, type "forge-adventure.exe", Enter.
- On Linux, just type "forge.sh", Enter (if you want to run mobile/adventure interface use forge-adventure.sh) - On Linux, just type "forge.sh", Enter (if you want to run mobile/adventure interface use forge-adventure.sh)
- Launch the Forge application bundle by double clicking on the program named "Forge.app". - Launch the Forge application bundle by double clicking on the program named "Forge.app".

4
forge-lda/pom.xml
View File

@@ -21,8 +21,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

4
pom.xml
View File

@@ -104,8 +104,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>3.1</version>
<configuration> <configuration>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>