diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 247818a52..40460385b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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' @@ -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 diff --git a/build.gradle.kts b/build.gradle.kts index 6de486f1f..ea4f6b3ea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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" @@ -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().configureEach { + options.release.set(16) + } }