diff --git a/build.gradle b/build.gradle index 800ba4500e..56c0a3d410 100644 --- a/build.gradle +++ b/build.gradle @@ -827,6 +827,11 @@ task v2MergedYarnJar(dependsOn: ["mergeV2"], type: Jar) { def fakeSourceDir = file(".gradle/temp/fakeSource") task genFakeSource(type: JavaExec, dependsOn: ["mergeV2", "mapNamedJar"]) { + onlyIf { + // Mapping Poet requires Java 17 + JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17) + } + group = "javadoc generation" outputs.upToDateWhen { false } diff --git a/gradle.properties b/gradle.properties index 53842a504d..42abcbf22b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,4 +10,4 @@ name_proposal_version=0.1.2 # Javadoc generation/linking fabric_loader_version=0.11.6 jetbrains_annotations_version=22.0.0 -mappingpoet_version=0.2.10 +mappingpoet_version=0.3.0 diff --git a/settings.gradle b/settings.gradle index c6152ae0f4..28803e73df 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,4 +14,8 @@ if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) { throw new UnsupportedOperationException("Yarn's buildscript requires Java 16 or higher.") } +if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { + System.err.println("Java 17 is highly recommended for using yarn. Javadoc generation will be disabled.") +} + rootProject.name = "yarn" \ No newline at end of file