diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml index 4e8e3904cd1..7f566b4a2a2 100644 --- a/.github/workflows/publish-android.yml +++ b/.github/workflows/publish-android.yml @@ -20,10 +20,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' distribution: 'temurin' cache: 'maven' server-id: cardforge-repo @@ -43,7 +43,7 @@ jobs: uses: maxim-lobanov/setup-android-tools@v1 with: packages: | - platforms;android-26 + platforms;android-29 build-tools;30.0.3 - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server diff --git a/.github/workflows/snapshots-android.yml b/.github/workflows/snapshots-android.yml index aef9e707055..497934db733 100644 --- a/.github/workflows/snapshots-android.yml +++ b/.github/workflows/snapshots-android.yml @@ -24,10 +24,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' distribution: 'temurin' cache: 'maven' server-id: cardforge-repo @@ -46,7 +46,7 @@ jobs: - name: Set Up Android tools 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 --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" - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index 48082ff9a2b..48949da0e0c 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '8', '11' ] + java: [ '11' ] name: Test with Java ${{ matrix.Java }} steps: - uses: actions/checkout@v3 diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml index 50623a0175c..2e22b5d977a 100644 --- a/forge-adventure/pom.xml +++ b/forge-adventure/pom.xml @@ -46,65 +46,19 @@ maven-compiler-plugin - 1.8 - 1.8 + 11 + 11 com.akathist.maven.plugins.launch4j launch4j-maven-plugin - 1.7.25 + 2.1.2 - - l4j-adv - package - - launch4j - - - gui - ${project.build.directory}/forge-adventure-editor-java8.exe - ${project.build.finalName}-jar-with-dependencies.jar - true - forge - src/main/config/forge-adventure-editor.ico - - forge.adventure.Main - false - anything - - - 1.8.0 - 4096 - - -Dfile.encoding=UTF-8 - - - - - 1.0.0.0 - - - 1.0.0.0 - - Forge - Forge - - 1.0.0.0 - - - 1.0.0.0 - - forge-adventure-editor - forge-adventure-editor - forge-adventure-editor-java8.exe - - - - l4j-adv2 + l4j-adv package launch4j @@ -132,7 +86,7 @@ --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED - --add-opens=java.base/sun.nio.ch=ALL-UNNAMED + --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED @@ -285,7 +239,7 @@ org.jetbrains annotations - 22.0.0 + 24.0.1 compile diff --git a/forge-gui-android/AndroidManifest.xml b/forge-gui-android/AndroidManifest.xml index b493a8c32d9..7a36e7ab78f 100644 --- a/forge-gui-android/AndroidManifest.xml +++ b/forge-gui-android/AndroidManifest.xml @@ -1,15 +1,18 @@ + android:targetSdkVersion="29" /> + + @@ -23,7 +26,8 @@ android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:label="@string/app_name" - android:largeHeap="true"> + android:largeHeap="true" + android:resizeableActivity="false"> maven-compiler-plugin - 1.8 - 1.8 + 11 + 11 @@ -57,7 +57,7 @@ org.robolectric android-all - 8.0.0_r4-robolectric-0 + 10-robolectric-5803371 provided @@ -220,7 +220,29 @@ javax.xml.bind jaxb-api - 2.3.1 + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + javax.activation + javax.activation-api + 1.2.0 + + + sun + misc + 1 + system + ${pom.basedir}/libs/sun-misc.jar net.sf.proguard @@ -235,7 +257,7 @@ true - 26 + 29 30.0.3 true @@ -284,7 +306,29 @@ javax.xml.bind jaxb-api - 2.3.1 + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + javax.activation + javax.activation-api + 1.2.0 + + + sun + misc + 1 + system + ${pom.basedir}/libs/sun-misc.jar net.sf.proguard @@ -299,7 +343,7 @@ false - 26 + 29 30.0.3 @@ -385,7 +429,29 @@ javax.xml.bind jaxb-api - 2.3.1 + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + javax.activation + javax.activation-api + 1.2.0 + + + sun + misc + 1 + system + ${pom.basedir}/libs/sun-misc.jar net.sf.proguard diff --git a/forge-gui-android/proguard.cfg b/forge-gui-android/proguard.cfg index b4cc8fcab34..877eac61e4d 100644 --- a/forge-gui-android/proguard.cfg +++ b/forge-gui-android/proguard.cfg @@ -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 ## and spits out a thousand-something Class Not Found errors ##-libraryjars /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar -##-libraryjars /jmods/java.base.jmod(!**.jar;!module-info.class) -##-libraryjars /jmods/java.datatransfer.jmod(!**.jar;!module-info.class) -##-libraryjars /jmods/java.prefs.jmod(!**.jar;!module-info.class) -##-libraryjars /jmods/java.xml.jmod(!**.jar;!module-info.class) -##-libraryjars /jmods/java.desktop.jmod(!**.jar;!module-info.class) -##-libraryjars /jmods/jdk.xml.dom.jmod(!**.jar;!module-info.class) +-libraryjars /jmods/java.base.jmod(!**.jar;!module-info.class) +-libraryjars /jmods/java.datatransfer.jmod(!**.jar;!module-info.class) +-libraryjars /jmods/java.prefs.jmod(!**.jar;!module-info.class) +-libraryjars /jmods/java.xml.jmod(!**.jar;!module-info.class) +-libraryjars /jmods/java.desktop.jmod(!**.jar;!module-info.class) +-libraryjars /jmods/jdk.xml.dom.jmod(!**.jar;!module-info.class) -dontwarn afu.org.checkerframework.** -dontwarn io.netty.** diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml index a4d1522a3e7..ade0b2b0bd0 100644 --- a/forge-gui-desktop/pom.xml +++ b/forge-gui-desktop/pom.xml @@ -295,7 +295,7 @@ gui - ${project.build.directory}/forge-java8.exe + ${project.build.directory}/forge.exe ${project.build.finalName}-jar-with-dependencies.jar true forge @@ -306,10 +306,32 @@ anything - 1.8.0 + 11.0.1 + jdkOnly 4096 -Dfile.encoding=UTF-8 + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.math=ALL-UNNAMED + --add-opens java.base/jdk.internal.misc=ALL-UNNAMED + --add-opens java.base/java.nio=ALL-UNNAMED + --add-opens java.base/sun.nio.ch=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.base/java.lang.reflect=ALL-UNNAMED + --add-opens java.base/java.text=ALL-UNNAMED + --add-opens java.desktop/java.awt=ALL-UNNAMED + --add-opens java.desktop/java.awt.font=ALL-UNNAMED + --add-opens java.desktop/java.awt.image=ALL-UNNAMED + --add-opens java.desktop/java.awt.color=ALL-UNNAMED + --add-opens java.desktop/sun.awt.image=ALL-UNNAMED + --add-opens java.desktop/javax.swing=ALL-UNNAMED + --add-opens java.desktop/javax.swing.border=ALL-UNNAMED + --add-opens java.desktop/javax.swing.event=ALL-UNNAMED + --add-opens java.desktop/sun.swing=ALL-UNNAMED + --add-opens java.desktop/java.beans=ALL-UNNAMED + --add-opens java.base/java.util.concurrent=ALL-UNNAMED + --add-opens java.base/java.net=ALL-UNNAMED + -Dio.netty.tryReflectionSetAccessible=true @@ -329,7 +351,7 @@ Forge forge - forge-java8.exe + forge.exe @@ -368,7 +390,6 @@ - @@ -377,7 +398,6 @@ - @@ -458,53 +478,6 @@ launch4j - - gui - ${project.build.directory}/forge-java8.exe - ${project.build.finalName}-jar-with-dependencies.jar - true - forge - src/main/config/forge.ico - - forge.view.Main - false - anything - - - 1.8.0 - 4096 - - -Dfile.encoding=UTF-8 - - - - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - Forge - Forge - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - Forge - forge - forge-java8.exe - - - - - - l4j-gui2 - package - - launch4j - gui ${project.build.directory}/forge.exe @@ -608,17 +581,14 @@ - - - @@ -635,10 +605,8 @@ - - @@ -646,17 +614,14 @@ - - - @@ -664,17 +629,14 @@ - - - diff --git a/forge-gui-ios/pom.xml b/forge-gui-ios/pom.xml index 2dac4a6805e..34df7c45dad 100644 --- a/forge-gui-ios/pom.xml +++ b/forge-gui-ios/pom.xml @@ -25,8 +25,8 @@ maven-compiler-plugin - 1.8 - 1.8 + 11 + 11 diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml index 97bcf1d68bb..3581c65526c 100644 --- a/forge-gui-mobile-dev/pom.xml +++ b/forge-gui-mobile-dev/pom.xml @@ -34,8 +34,8 @@ maven-compiler-plugin - 1.8 - 1.8 + 11 + 11 @@ -76,53 +76,6 @@ launch4j - - gui - ${project.build.directory}/forge-adventure-java8.exe - ${project.build.finalName}-jar-with-dependencies.jar - true - forge - src/main/config/forge-adventure.ico - - forge.app.Main - false - anything - - - 1.8.0 - 4096 - - -Dfile.encoding=UTF-8 - - - - - 1.0.0.0 - - - 1.0.0.0 - - Forge - Forge - - 1.0.0.0 - - - 1.0.0.0 - - forge-adventure - forge-adventure - forge-adventure-java8.exe - - - - - - l4j-adv2 - package - - launch4j - gui ${project.build.directory}/forge-adventure.exe diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml index 6a177762936..97a83b44665 100644 --- a/forge-gui-mobile/pom.xml +++ b/forge-gui-mobile/pom.xml @@ -17,8 +17,8 @@ maven-compiler-plugin - 1.8 - 1.8 + 11 + 11 diff --git a/forge-gui/MANUAL.txt b/forge-gui/MANUAL.txt index 1da21baf453..3b8a895fb7a 100644 --- a/forge-gui/MANUAL.txt +++ b/forge-gui/MANUAL.txt @@ -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. 3) Run Forge -- On Windows, just type "forge.exe", Enter (If you have Java 8 installed, use forge-java8.exe) - 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) +- On Windows, just type "forge.exe", Enter. + 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) - Launch the Forge application bundle by double clicking on the program named "Forge.app". diff --git a/forge-lda/pom.xml b/forge-lda/pom.xml index f06ef8734a7..8dd3817f9a6 100644 --- a/forge-lda/pom.xml +++ b/forge-lda/pom.xml @@ -21,8 +21,8 @@ maven-compiler-plugin - 1.8 - 1.8 + 11 + 11 diff --git a/pom.xml b/pom.xml index 993a31fa14f..39f2c093d71 100644 --- a/pom.xml +++ b/pom.xml @@ -104,8 +104,8 @@ maven-compiler-plugin 3.1 - 1.8 - 1.8 + 11 + 11