Skip to content
This repository was archived by the owner on Jun 19, 2021. It is now read-only.

[1.17] Removed JDK (8 ,11 ,15) from GitHub Actions and update build.gradle.kts #507

Open
wants to merge 4 commits into
base: ver/1.17
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
- '*.md'
- 'Jenkinsfile'
branches:
- ver/1.16.5
- ver/1.17
- dev/*
- staging/1.16.5
- staging/1.17
pull_request:
paths-ignore:
- '*.md'
Expand All @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '8', '11', '15', '16' ]
java: [ '16' ]
fail-fast: false
steps:
- uses: actions/checkout@v2
Expand Down
16 changes: 10 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ toothpick {
forkVersion = "git-$forkName-$currentBranch-$versionTag"
forkUrl = "https://github.com/YatopiaMC/Yatopia"

minecraftVersion = "1.16.5"
nmsPackage = "1_16_R3"
minecraftVersion = "1.17"
nmsPackage = "1_17_R1"
nmsRevision = "R0.1-SNAPSHOT"

upstream = "Paper"
Expand Down Expand Up @@ -59,11 +59,15 @@ subprojects {
}

java {
if(JavaVersion.VERSION_1_8 > JavaVersion.current()){
error("This build must be run with Java 8 or better")
if(JavaVersion.VERSION_16 > JavaVersion.current()){
error("This build must be run with atleast Java 16 or newer")
}
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.current()
sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
withSourcesJar()
}

tasks.withType<JavaCompile>().configureEach {
options.release.set(16)
}
}