Skip to content

Commit

Permalink
Fix broken javadoc jar (#3011)
Browse files Browse the repository at this point in the history
* Try building against jdk18

* update grade

* Update asm for unpick

* Set ignore-source-errors
  • Loading branch information
modmuss50 authored Feb 16, 2022
1 parent ab17c13 commit c490cdb
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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/',
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit c490cdb

Please sign in to comment.