From 634db00e07e57724dacceaed1dbaa796c6e607f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tofik=20=E2=99=A1?=
 <62406295+Toffikk@users.noreply.github.com>
Date: Fri, 11 Jun 2021 13:39:21 +0200
Subject: [PATCH 1/4] [1.17] Removed JDK (8 ,11 ,15) from GitHub Actions

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

From 3061c3a82a78f637282a492c8bf999d3a421bb0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tofik=20=E2=99=A1?=
 <62406295+Toffikk@users.noreply.github.com>
Date: Fri, 11 Jun 2021 13:41:48 +0200
Subject: [PATCH 2/4] Update build.gradle.kts

---
 build.gradle.kts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6de486f1f..da1f0e892 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,10 @@ 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()
+        options.release.set(16)
         withSourcesJar()
     }
 }

From 35476f2c814358ed70c433180e46487bbf0bb848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tofik=20=E2=99=A1?=
 <62406295+Toffikk@users.noreply.github.com>
Date: Fri, 11 Jun 2021 13:46:28 +0200
Subject: [PATCH 3/4] fix

---
 build.gradle.kts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index da1f0e892..3da23a39a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -62,7 +62,11 @@ subprojects {
         if(JavaVersion.VERSION_16 > JavaVersion.current()){
             error("This build must be run with atleast Java 16 or newer")
         }
-        options.release.set(16)
+        sourceCompatibility = JavaVersion.VERSION_16
+        targetCompatibility = JavaVersion.VERSION_16
         withSourcesJar()
     }
+    
+        tasks.withType<JavaCompile>().configureEach {
+            options.release.set(16)
 }

From 3ca088771fcf9f37d941da253f84d91f2c86718c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tofik=20=E2=99=A1?=
 <62406295+Toffikk@users.noreply.github.com>
Date: Fri, 11 Jun 2021 13:49:21 +0200
Subject: [PATCH 4/4] and another fix

---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3da23a39a..ea4f6b3ea 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -69,4 +69,5 @@ subprojects {
     
         tasks.withType<JavaCompile>().configureEach {
             options.release.set(16)
+    }
 }