From 4bb31bc49d64604a95b94929af9426278abc73f5 Mon Sep 17 00:00:00 2001
From: Adam <Jikoo.Games@gmail.com>
Date: Sun, 5 Dec 2021 13:32:27 -0500
Subject: [PATCH] Update Java and fix AppVeyor (#1663)

* Update Java and fix AppVeyor

Target Java 16
Run CI using Java 17
Use provided Maven installation instead of relying on mirror link
Remove Java 7 memory limitation settings

* Fix Jitpack build for Java > 8

Jitpack uses Java 8 by default. While their (very minimal) explanation of settings suggests specifying `jdk: [ openjdk17 ]` would be enough, it does not appear to work. Not sure if that's just an issue with their image not including JDK17 yet or something, but this does function.
---
 .github/workflows/ci.yml |  2 +-
 appveyor.yml             | 19 ++++++-------------
 jitpack.yml              |  3 +++
 pom.xml                  |  4 ++--
 4 files changed, 12 insertions(+), 16 deletions(-)
 create mode 100644 jitpack.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2de3729..0e33780 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11, 16 ]
+        java: [ 16, 17 ]
     steps:
       - name: "Checkout"
         uses: actions/checkout@v2
diff --git a/appveyor.yml b/appveyor.yml
index dfe308d..3e5c027 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,25 +3,19 @@ skip_tags: true
 clone_depth: 10
 environment:
   matrix:
-    - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+    - appveyor_build_worker_image: Visual Studio 2022
+      JAVA_HOME: C:\Program Files\Java\jdk17
 branches:
   only:
     - master
     - dev/v20
   except:
     - gh-pages
-os: Windows Server 2012
+init:
+  - cmd: SET PATH=%JAVA_HOME%\bin;%PATH%
 install:
-  - ps: |
-      Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\maven" )) {
-        (new-object System.Net.WebClient).DownloadFile('http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip', 'C:\maven-bin.zip')
-        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
-      }
-  - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH:C:\Ruby193\bin;=%
-  - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
-  - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
-  - cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
+  - cmd: SET MAVEN_OPTS=-Xmx4g
+  - cmd: SET JAVA_OPTS=-Xmx4g
   - cmd: mvn --version
   - cmd: java -version
 build_script:
@@ -29,7 +23,6 @@ build_script:
 test_script:
   - mvn clean install --batch-mode -Pqulice
 cache:
-  - C:\maven\
   - C:\Users\appveyor\.m2
 artifacts:
 - path: target/GriefPrevention.jar
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 0000000..d9bb5ab
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,3 @@
+before_install:
+  - sdk install java 17.0.1-open
+  - sdk use java 17.0.1-open
diff --git a/pom.xml b/pom.xml
index df7a49c..946f72a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,8 +69,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>16</source>
+                    <target>16</target>
                 </configuration>
             </plugin>
             <!-- Append git commit hash to version -->