From 682eb367c8e789cf66ab1bb21dd2c6b35a3187d5 Mon Sep 17 00:00:00 2001 From: actuallyasmartname <77011692+actuallyasmartname@users.noreply.github.com> Date: Sat, 24 Apr 2021 05:07:59 -0400 Subject: [PATCH] Update Dependencies (#2343) * Update build.yml * Update publish.yml * Update update-base.yml * Update build.gradle * Update gradle.properties * Use fabric's CFR --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/update-base.yml | 4 ++-- .gitignore | 4 ++++ build.gradle | 10 +++++----- gradle.properties | 3 ++- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dcc42997f2..f7427bfb5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: image: openjdk:${{ matrix.java }} options: --user root steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: gradle/wrapper-validation-action@v1 - run: ./gradlew build javadocJar checkMappings --stacktrace - name: Build artifacts diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6a56bbab2b..207457b36f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,7 +7,7 @@ jobs: image: openjdk:16-jdk options: --user root steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: gradle/wrapper-validation-action@v1 # Ensure that releases are not ran in parallel, this ensures that the latest commit is the latest release diff --git a/.github/workflows/update-base.yml b/.github/workflows/update-base.yml index 848e7f6fcf..47384e5e86 100644 --- a/.github/workflows/update-base.yml +++ b/.github/workflows/update-base.yml @@ -9,7 +9,7 @@ jobs: if: ${{ github.event.label.name == 'update-base' }} runs-on: ubuntu-20.04 steps: - - uses: actions/github-script@v3 + - uses: actions/github-script@v4 with: github-token: ${{secrets.GITHUB_TOKEN}} script: | @@ -44,4 +44,4 @@ jobs: throw error; } - } \ No newline at end of file + } diff --git a/.gitignore b/.gitignore index ba38118f4c..85921ac500 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,7 @@ namedSrc/ .classpath .project .settings/ + +# vscode +.vscode/ +bin/ diff --git a/build.gradle b/build.gradle index 023643a9ff..2ddfd455aa 100644 --- a/build.gradle +++ b/build.gradle @@ -9,16 +9,16 @@ buildscript { dependencies { classpath "cuchaz:enigma-cli:${project.enigma_version}" classpath "net.fabricmc:stitch:${project.stitch_version}" - classpath "commons-io:commons-io:2.6" - classpath 'de.undercouch:gradle-download-task:4.0.4' - classpath 'net.fabricmc:tiny-remapper:0.3.1.72' + classpath "commons-io:commons-io:2.8.0" + classpath 'de.undercouch:gradle-download-task:4.1.1' + classpath 'net.fabricmc:tiny-remapper:0.3.2' classpath "net.fabricmc.unpick:unpick:${project.unpick_version}" classpath "net.fabricmc.unpick:unpick-format-utils:${project.unpick_version}" } } plugins { - id 'de.undercouch.download' version '4.0.4' + id 'de.undercouch.download' version '4.1.1' id 'base' id 'maven-publish' id 'java' // for jd gen @@ -75,7 +75,7 @@ dependencies { javadocClasspath "net.fabricmc:fabric-loader:${project.fabric_loader_version}" javadocClasspath "org.jetbrains:annotations:${project.jetbrains_annotations_version}" javadocClasspath "com.google.code.findbugs:jsr305:3.0.2" // for some other jsr annotations - decompileClasspath "org.benf:cfr:0.150" + decompileClasspath "net.fabricmc:cfr:${project.cfr_version}" mappingPoetJar 'net.fabricmc:mappingpoet:0.2.7' unpick "net.fabricmc.unpick:unpick-cli:${project.unpick_version}" } diff --git a/gradle.properties b/gradle.properties index 3e00d40f00..4ca1224b8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,5 +5,6 @@ enigma_version=0.27.1 stitch_version=0.5.1+build.77 unpick_version=2.2.0 # Loader is only used by javadoc generation/linking -fabric_loader_version=0.11.1 +fabric_loader_version=0.11.3 jetbrains_annotations_version=20.1.0 +cfr_version=0.0.2