Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-28 21:56:37 +01:00
Code Issues Projects Releases Wiki Activity

java 16

Browse Source
This commit is contained in:
Simon Gardling 2021-05-27 13:30:30 -04:00
parent a0f44447c3
commit 4f7c4c1e60
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
java: [ '11', '15', '16' ] java: [ '16' ]
fail-fast: false fail-fast: false
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

8
Jenkinsfile vendored
View File

@ -9,7 +9,7 @@ pipeline {
stages { stages {
stage('Cleanup') { stage('Cleanup') {
tools { tools {
jdk "OpenJDK 11" jdk "OpenJDK 16"
} }
steps { steps {
scmSkip(deleteBuild: true, skipPattern:'.*\\[CI-SKIP\\].*') scmSkip(deleteBuild: true, skipPattern:'.*\\[CI-SKIP\\].*')
@ -29,7 +29,7 @@ pipeline {
} }
stage('Init project & submodules') { stage('Init project & submodules') {
tools { tools {
jdk "OpenJDK 11" jdk "OpenJDK 16"
} }
steps { steps {
withMaven( withMaven(
@ -43,7 +43,7 @@ pipeline {
} }
stage('Decompile & apply patches') { stage('Decompile & apply patches') {
tools { tools {
jdk "OpenJDK 11" jdk "OpenJDK 16"
} }
steps { steps {
withMaven( withMaven(
@ -60,7 +60,7 @@ pipeline {
} }
stage('Build') { stage('Build') {
tools { tools {
jdk "OpenJDK 11" jdk "OpenJDK 16"
} }
steps { steps {
withMaven( withMaven(

4
PATCHES.md
View File

@ -456,8 +456,8 @@ # Patches
| server | Zombie horse naturally spawn | William Blake Galbreath | | | server | Zombie horse naturally spawn | William Blake Galbreath | |
| server | add config for logging login location | Simon Gardling | | | server | add config for logging login location | Simon Gardling | |
| server | dont load chunks for physics | Aikar | | | server | dont load chunks for physics | Aikar | |
| api | java 11 | Simon Gardling | | | api | java 16 | Simon Gardling | |
| server | java 11 | Simon Gardling | | | server | java 16 | Simon Gardling | |
| server | lithium DataTrackerMixin | JellySquid | tr7zw | | server | lithium DataTrackerMixin | JellySquid | tr7zw |
| server | lithium HashedList | JellySquid | | | server | lithium HashedList | JellySquid | |
| server | lithium MixinBox | JellySquid | | | server | lithium MixinBox | JellySquid | |

6
build.gradle.kts
View File

@ -59,10 +59,10 @@ subprojects {
} }
java { java {
if(JavaVersion.VERSION_11 > JavaVersion.current()){ if(JavaVersion.VERSION_16 > JavaVersion.current()){
error("This build must be run with Java 11 or later") error("This build must be run with Java 16 or later")
} }
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.current() targetCompatibility = JavaVersion.current()
withSourcesJar() withSourcesJar()
} }

8
patches/api/0009-java-11.patch → patches/api/0009-java-16.patch
View File

@ -1,11 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@gmail.com> From: Simon Gardling <titaniumtown@gmail.com>
Date: Fri, 23 Apr 2021 11:11:13 -0400 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 diff --git a/pom.xml b/pom.xml
index a6a2fd50e685f64afecac5da6aaaad6227a3731e..57ca52e776df7429497f25c90cf6550fa0c8ef9b 100644 index a6a2fd50e685f64afecac5da6aaaad6227a3731e..a3a11d11181763a212727ad81ae6167a292c6f1c 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -19,8 +19,8 @@ @@ -19,8 +19,8 @@
@ -14,8 +14,8 @@ index a6a2fd50e685f64afecac5da6aaaad6227a3731e..57ca52e776df7429497f25c90cf6550f
<!-- <skipTests>true</skipTests> Paper - This [was] not going to end well --> <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
- <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target> - <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source> + <maven.compiler.source>16</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.target>16</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <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! --> <adventure.version>4.7.0</adventure.version> <!-- Paper - When updating this make sure to update the linked JavaDocs on the homepage as well! -->
</properties> </properties>

8
patches/server/0071-java-11.patch → patches/server/0071-java-16.patch
View File

@ -1,11 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@gmail.com> From: Simon Gardling <titaniumtown@gmail.com>
Date: Fri, 23 Apr 2021 11:11:20 -0400 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 diff --git a/pom.xml b/pom.xml
index e8884c5f79f0550dd479074f1b69e8b9f7b68784..dbabe103fecd075df7134619ff05e603b02e99ce 100644 index e8884c5f79f0550dd479074f1b69e8b9f7b68784..620bd31a4356cb170720b4be3512791c93069131 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
@ -14,8 +14,8 @@ index e8884c5f79f0550dd479074f1b69e8b9f7b68784..dbabe103fecd075df7134619ff05e603
<minecraft_version>1_16_R3</minecraft_version> <minecraft_version>1_16_R3</minecraft_version>
- <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target> - <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source> + <maven.compiler.source>16</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.target>16</maven.compiler.target>
</properties> </properties>
<parent> <parent>