Skip to content

Commit 7a9cbb5

Browse files
authored
Update dependencies (FabricMC#3093)
1 parent a664192 commit 7a9cbb5

File tree

12 files changed

+283
-228
lines changed

12 files changed

+283
-228
lines changed

.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
*.mapping text eol=lf
1+
* text eol=lf

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v2
1414
- uses: gradle/wrapper-validation-action@v1
15-
- run: ./gradlew build javadocJar checkMappings --stacktrace
15+
- run: ./gradlew build javadocJar checkMappings --stacktrace --warning-mode fail
1616
- name: Build artifacts
1717
if: ${{ matrix.java == '18-jdk' }}
1818
continue-on-error: true

HEADER

+4-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
This file is free for everyone to use under the Creative Commons Zero license.
1+
/*
2+
* This file is free for everyone to use under the Creative Commons Zero license.
3+
*/
4+

build.gradle

+13-12
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ buildscript {
1010
dependencies {
1111
classpath "cuchaz:enigma-cli:${project.enigma_version}"
1212
classpath "net.fabricmc:stitch:${project.stitch_version}"
13-
classpath "commons-io:commons-io:2.8.0"
14-
classpath 'de.undercouch:gradle-download-task:4.1.1'
15-
classpath 'net.fabricmc:tiny-remapper:0.7.0'
13+
classpath "commons-io:commons-io:2.11.0"
14+
classpath "de.undercouch:gradle-download-task:4.1.1"
15+
classpath "net.fabricmc:tiny-remapper:${project.tiny_remapper_version}"
1616
classpath "net.fabricmc.unpick:unpick:${project.unpick_version}"
1717
classpath "net.fabricmc.unpick:unpick-format-utils:${project.unpick_version}"
1818
classpath "net.fabricmc:name-proposal:${project.name_proposal_version}"
@@ -21,9 +21,9 @@ buildscript {
2121

2222
plugins {
2323
id 'java' // for constants, packages, javadoc
24-
id 'de.undercouch.download' version '4.1.1'
24+
id 'de.undercouch.download' version '4.1.2'
2525
id 'maven-publish'
26-
id 'org.cadixdev.licenser' version '0.6.1'
26+
id "com.diffplug.spotless" version "6.4.2"
2727
id 'net.fabricmc.filament' version '0.3.0'
2828
}
2929

@@ -82,10 +82,10 @@ dependencies {
8282
mappingPoetJar "net.fabricmc:mappingpoet:${project.mappingpoet_version}"
8383
unpick "net.fabricmc.unpick:unpick-cli:${project.unpick_version}"
8484
// Update asm to allow running on JDK 18
85-
unpick "org.ow2.asm:asm:9.2"
86-
unpick "org.ow2.asm:asm-tree:9.2"
87-
unpick "org.ow2.asm:asm-commons:9.2"
88-
unpick "org.ow2.asm:asm-util:9.2"
85+
unpick "org.ow2.asm:asm:${project.asm_version}"
86+
unpick "org.ow2.asm:asm-tree:${project.asm_version}"
87+
unpick "org.ow2.asm:asm-commons:${project.asm_version}"
88+
unpick "org.ow2.asm:asm-util:${project.asm_version}"
8989
}
9090

9191
def setupGroup = "jar setup"
@@ -700,9 +700,10 @@ sourceSets {
700700
packageDocs // package info files
701701
}
702702

703-
license {
704-
header file("HEADER")
705-
include '**/*.java'
703+
spotless {
704+
java {
705+
licenseHeaderFile(rootProject.file("HEADER"))
706+
}
706707
}
707708

708709
task constantsJar(type: Jar) {

gradle.properties

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# Done to increase the memory available to gradle.
22
org.gradle.jvmargs=-Xmx1G
33

4-
enigma_version=2.0.0
4+
enigma_version=2.1.0
55
stitch_version=0.6.1
6-
unpick_version=2.2.0
7-
cfr_version=0.0.9
6+
unpick_version=2.3.0
7+
cfr_version=0.1.1
88
name_proposal_version=0.1.4
9+
tiny_remapper_version=0.8.1
10+
asm_version=9.3
911

1012
# Javadoc generation/linking
11-
fabric_loader_version=0.11.6
12-
jetbrains_annotations_version=22.0.0
13+
fabric_loader_version=0.13.3
14+
jetbrains_annotations_version=23.0.0
1315
mappingpoet_version=0.3.0

gradle/wrapper/gradle-wrapper.jar

285 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)