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.
This commit is contained in:
Adam 2021-12-05 13:32:27 -05:00 committed by GitHub
parent 6debf368c9
commit 4bb31bc49d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 16 deletions

View File

@ -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

View File

@ -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

3
jitpack.yml Normal file
View File

@ -0,0 +1,3 @@
before_install:
- sdk install java 17.0.1-open
- sdk use java 17.0.1-open

View File

@ -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 -->