mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-11-25 03:55:11 +01:00
java 16
This commit is contained in:
parent
a0f44447c3
commit
4f7c4c1e60
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -27,7 +27,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
java: [ '11', '15', '16' ]
|
||||
java: [ '16' ]
|
||||
fail-fast: false
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
8
Jenkinsfile
vendored
8
Jenkinsfile
vendored
@ -9,7 +9,7 @@ pipeline {
|
||||
stages {
|
||||
stage('Cleanup') {
|
||||
tools {
|
||||
jdk "OpenJDK 11"
|
||||
jdk "OpenJDK 16"
|
||||
}
|
||||
steps {
|
||||
scmSkip(deleteBuild: true, skipPattern:'.*\\[CI-SKIP\\].*')
|
||||
@ -29,7 +29,7 @@ pipeline {
|
||||
}
|
||||
stage('Init project & submodules') {
|
||||
tools {
|
||||
jdk "OpenJDK 11"
|
||||
jdk "OpenJDK 16"
|
||||
}
|
||||
steps {
|
||||
withMaven(
|
||||
@ -43,7 +43,7 @@ pipeline {
|
||||
}
|
||||
stage('Decompile & apply patches') {
|
||||
tools {
|
||||
jdk "OpenJDK 11"
|
||||
jdk "OpenJDK 16"
|
||||
}
|
||||
steps {
|
||||
withMaven(
|
||||
@ -60,7 +60,7 @@ pipeline {
|
||||
}
|
||||
stage('Build') {
|
||||
tools {
|
||||
jdk "OpenJDK 11"
|
||||
jdk "OpenJDK 16"
|
||||
}
|
||||
steps {
|
||||
withMaven(
|
||||
|
@ -456,8 +456,8 @@ # Patches
|
||||
| server | Zombie horse naturally spawn | William Blake Galbreath | |
|
||||
| server | add config for logging login location | Simon Gardling | |
|
||||
| server | dont load chunks for physics | Aikar | |
|
||||
| api | java 11 | Simon Gardling | |
|
||||
| server | java 11 | Simon Gardling | |
|
||||
| api | java 16 | Simon Gardling | |
|
||||
| server | java 16 | Simon Gardling | |
|
||||
| server | lithium DataTrackerMixin | JellySquid | tr7zw |
|
||||
| server | lithium HashedList | JellySquid | |
|
||||
| server | lithium MixinBox | JellySquid | |
|
||||
|
@ -59,10 +59,10 @@ subprojects {
|
||||
}
|
||||
|
||||
java {
|
||||
if(JavaVersion.VERSION_11 > JavaVersion.current()){
|
||||
error("This build must be run with Java 11 or later")
|
||||
if(JavaVersion.VERSION_16 > JavaVersion.current()){
|
||||
error("This build must be run with Java 16 or later")
|
||||
}
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
sourceCompatibility = JavaVersion.VERSION_16
|
||||
targetCompatibility = JavaVersion.current()
|
||||
withSourcesJar()
|
||||
}
|
||||
|
@ -1,11 +1,11 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Gardling <titaniumtown@gmail.com>
|
||||
Date: Fri, 23 Apr 2021 11:11:13 -0400
|
||||
Subject: [PATCH] java 11
|
||||
Subject: [PATCH] java 16
|
||||
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index a6a2fd50e685f64afecac5da6aaaad6227a3731e..57ca52e776df7429497f25c90cf6550fa0c8ef9b 100644
|
||||
index a6a2fd50e685f64afecac5da6aaaad6227a3731e..a3a11d11181763a212727ad81ae6167a292c6f1c 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -19,8 +19,8 @@
|
||||
@ -14,8 +14,8 @@ index a6a2fd50e685f64afecac5da6aaaad6227a3731e..57ca52e776df7429497f25c90cf6550f
|
||||
<!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
|
||||
- <maven.compiler.source>1.8</maven.compiler.source>
|
||||
- <maven.compiler.target>1.8</maven.compiler.target>
|
||||
+ <maven.compiler.source>11</maven.compiler.source>
|
||||
+ <maven.compiler.target>11</maven.compiler.target>
|
||||
+ <maven.compiler.source>16</maven.compiler.source>
|
||||
+ <maven.compiler.target>16</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<adventure.version>4.7.0</adventure.version> <!-- Paper - When updating this make sure to update the linked JavaDocs on the homepage as well! -->
|
||||
</properties>
|
@ -1,11 +1,11 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Gardling <titaniumtown@gmail.com>
|
||||
Date: Fri, 23 Apr 2021 11:11:20 -0400
|
||||
Subject: [PATCH] java 11
|
||||
Subject: [PATCH] java 16
|
||||
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index e8884c5f79f0550dd479074f1b69e8b9f7b68784..dbabe103fecd075df7134619ff05e603b02e99ce 100644
|
||||
index e8884c5f79f0550dd479074f1b69e8b9f7b68784..620bd31a4356cb170720b4be3512791c93069131 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -14,8 +14,8 @@
|
||||
@ -14,8 +14,8 @@ index e8884c5f79f0550dd479074f1b69e8b9f7b68784..dbabe103fecd075df7134619ff05e603
|
||||
<minecraft_version>1_16_R3</minecraft_version>
|
||||
- <maven.compiler.source>1.8</maven.compiler.source>
|
||||
- <maven.compiler.target>1.8</maven.compiler.target>
|
||||
+ <maven.compiler.source>11</maven.compiler.source>
|
||||
+ <maven.compiler.target>11</maven.compiler.target>
|
||||
+ <maven.compiler.source>16</maven.compiler.source>
|
||||
+ <maven.compiler.target>16</maven.compiler.target>
|
||||
</properties>
|
||||
|
||||
<parent>
|
Loading…
Reference in New Issue
Block a user