From c490cdb0664baa63ad865783d778906f30370ed1 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 16 Feb 2022 16:19:57 +0000
Subject: [PATCH] Fix broken javadoc jar (#3011)

* Try building against jdk18

* update grade

* Update asm for unpick

* Set ignore-source-errors
---
 .github/workflows/build.yml              | 4 ++--
 .github/workflows/publish.yml            | 2 +-
 build.gradle                             | 6 ++++++
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 78e435fd62..024ecabc11 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [17-jdk]
+        java: [17-jdk, 18-jdk]
     runs-on: ubuntu-20.04
     container:
       image: openjdk:${{ matrix.java }}
@@ -14,7 +14,7 @@ jobs:
       - uses: gradle/wrapper-validation-action@v1
       - run: ./gradlew build javadocJar checkMappings --stacktrace
       - name: Build artifacts
-        if: ${{ matrix.java == '17-jdk' }}
+        if: ${{ matrix.java == '18-jdk' }}
         continue-on-error: true
         uses: actions/upload-artifact@v2
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index a5c3e074b2..a58993b7e1 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -6,7 +6,7 @@ jobs:
     if: ${{ github.repository_owner == 'FabricMC' }}
     runs-on: ubuntu-20.04
     container:
-      image: openjdk:17-jdk
+      image: openjdk:18-jdk
       options: --user root
     steps:
       - uses: actions/checkout@v2
diff --git a/build.gradle b/build.gradle
index 8f020029da..4878fb6968 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,6 +81,11 @@ dependencies {
 	decompileClasspath "net.fabricmc:cfr:${project.cfr_version}"
 	mappingPoetJar "net.fabricmc:mappingpoet:${project.mappingpoet_version}"
 	unpick "net.fabricmc.unpick:unpick-cli:${project.unpick_version}"
+	// Update asm to allow running on JDK 18
+	unpick "org.ow2.asm:asm:9.2"
+	unpick "org.ow2.asm:asm-tree:9.2"
+	unpick "org.ow2.asm:asm-commons:9.2"
+	unpick "org.ow2.asm:asm-util:9.2"
 }
 
 def setupGroup = "jar setup"
@@ -862,6 +867,7 @@ javadoc {
 		it.use()
 
 		addBooleanOption "-allow-script-in-comments", true
+		addBooleanOption "-ignore-source-errors", true
 		links(
 				'https://guava.dev/releases/21.0/api/docs/',
 				'https://www.javadoc.io/doc/com.google.code.gson/gson/2.8.0/',
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a254e..41dfb87909 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.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists