From f32667580c101b1bad4da45b1deb3b1fba17e956 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 12 May 2021 20:59:27 +0100
Subject: [PATCH] Build javadoc against java 16 Require J16

---
 .github/workflows/build.yml              | 2 +-
 build.gradle                             | 6 +++---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 settings.gradle                          | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f7427bfb5a..234fcf7be7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [11-jdk, 16-jdk]
+        java: [16-jdk]
     runs-on: ubuntu-20.04
     container:
       image: openjdk:${{ matrix.java }}
diff --git a/build.gradle b/build.gradle
index 208a85ab60..3b94d2d8b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -784,7 +784,7 @@ task sourcesJar(type: Jar, dependsOn: classes) {
 
 compilePackageDocsJava {
 	it.options.encoding = "UTF-8"
-	it.options.release = 11
+	it.options.release = 16
 }
 
 // Only build jars for package infos if we need to actually expose stuff like annotation in the future.
@@ -922,7 +922,7 @@ javadoc {
 	// verbose = true // enable to debug
 	options {
 		// verbose() // enable to debug
-		source = "11"
+		source = "16"
 		encoding = 'UTF-8'
 		charSet = 'UTF-8'
 		memberLevel = JavadocMemberLevel.PRIVATE
@@ -952,7 +952,7 @@ javadoc {
 				'https://commons.apache.org/proper/commons-codec/archives/1.10/apidocs',
 				'https://commons.apache.org/proper/commons-compress/javadocs/api-1.8.1/',
 				"https://maven.fabricmc.net/docs/fabric-loader-${project.fabric_loader_version}/",
-				"https://docs.oracle.com/en/java/javase/11/docs/api/"
+				"https://docs.oracle.com/en/java/javase/16/docs/api/"
 				// Need to add loader jd publication for env annotations!
 		)
 		// https://docs.oracle.com/en/java/javase/15/docs/specs/man/javadoc.html#additional-options-provided-by-the-standard-doclet
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f371643eed..e5338d370b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index c9c30192a1..c6152ae0f4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,9 +9,9 @@ pluginManagement {
 	}
 }
 
-// This check is done here before any plugins that may require java 11 are able to load.
-if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
-	throw new UnsupportedOperationException("Yarn's buildscript requires Java 11 or higher.")
+// This check is done here before any plugins that may require java 16 are able to load.
+if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
+	throw new UnsupportedOperationException("Yarn's buildscript requires Java 16 or higher.")
 }
 
 rootProject.name = "yarn"
\ No newline at end of file