Build javadoc against java 16

Require J16
This commit is contained in:
modmuss50 2021-05-12 20:59:27 +01:00
parent 8fc50a424d
commit f32667580c
4 changed files with 8 additions and 8 deletions

View File

@ -4,7 +4,7 @@ jobs:
build: build:
strategy: strategy:
matrix: matrix:
java: [11-jdk, 16-jdk] java: [16-jdk]
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: container:
image: openjdk:${{ matrix.java }} image: openjdk:${{ matrix.java }}

View File

@ -784,7 +784,7 @@ task sourcesJar(type: Jar, dependsOn: classes) {
compilePackageDocsJava { compilePackageDocsJava {
it.options.encoding = "UTF-8" 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. // 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 // verbose = true // enable to debug
options { options {
// verbose() // enable to debug // verbose() // enable to debug
source = "11" source = "16"
encoding = 'UTF-8' encoding = 'UTF-8'
charSet = 'UTF-8' charSet = 'UTF-8'
memberLevel = JavadocMemberLevel.PRIVATE 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-codec/archives/1.10/apidocs',
'https://commons.apache.org/proper/commons-compress/javadocs/api-1.8.1/', 'https://commons.apache.org/proper/commons-compress/javadocs/api-1.8.1/',
"https://maven.fabricmc.net/docs/fabric-loader-${project.fabric_loader_version}/", "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! // 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 // https://docs.oracle.com/en/java/javase/15/docs/specs/man/javadoc.html#additional-options-provided-by-the-standard-doclet

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -9,9 +9,9 @@ pluginManagement {
} }
} }
// This check is done here before any plugins that may require java 11 are able to load. // This check is done here before any plugins that may require java 16 are able to load.
if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) { if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
throw new UnsupportedOperationException("Yarn's buildscript requires Java 11 or higher.") throw new UnsupportedOperationException("Yarn's buildscript requires Java 16 or higher.")
} }
rootProject.name = "yarn" rootProject.name = "yarn"