Skip to content

Commit

Permalink
Update dependencies (#3093)
Browse files Browse the repository at this point in the history
  • Loading branch information
modmuss50 authored Apr 15, 2022
1 parent a664192 commit 7a9cbb5
Show file tree
Hide file tree
Showing 12 changed files with 283 additions and 228 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.mapping text eol=lf
* text eol=lf
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
- run: ./gradlew build javadocJar checkMappings --stacktrace
- run: ./gradlew build javadocJar checkMappings --stacktrace --warning-mode fail
- name: Build artifacts
if: ${{ matrix.java == '18-jdk' }}
continue-on-error: true
Expand Down
5 changes: 4 additions & 1 deletion HEADER
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
This file is free for everyone to use under the Creative Commons Zero license.
/*
* This file is free for everyone to use under the Creative Commons Zero license.
*/

25 changes: 13 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ buildscript {
dependencies {
classpath "cuchaz:enigma-cli:${project.enigma_version}"
classpath "net.fabricmc:stitch:${project.stitch_version}"
classpath "commons-io:commons-io:2.8.0"
classpath 'de.undercouch:gradle-download-task:4.1.1'
classpath 'net.fabricmc:tiny-remapper:0.7.0'
classpath "commons-io:commons-io:2.11.0"
classpath "de.undercouch:gradle-download-task:4.1.1"
classpath "net.fabricmc:tiny-remapper:${project.tiny_remapper_version}"
classpath "net.fabricmc.unpick:unpick:${project.unpick_version}"
classpath "net.fabricmc.unpick:unpick-format-utils:${project.unpick_version}"
classpath "net.fabricmc:name-proposal:${project.name_proposal_version}"
Expand All @@ -21,9 +21,9 @@ buildscript {

plugins {
id 'java' // for constants, packages, javadoc
id 'de.undercouch.download' version '4.1.1'
id 'de.undercouch.download' version '4.1.2'
id 'maven-publish'
id 'org.cadixdev.licenser' version '0.6.1'
id "com.diffplug.spotless" version "6.4.2"
id 'net.fabricmc.filament' version '0.3.0'
}

Expand Down Expand Up @@ -82,10 +82,10 @@ dependencies {
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"
unpick "org.ow2.asm:asm:${project.asm_version}"
unpick "org.ow2.asm:asm-tree:${project.asm_version}"
unpick "org.ow2.asm:asm-commons:${project.asm_version}"
unpick "org.ow2.asm:asm-util:${project.asm_version}"
}

def setupGroup = "jar setup"
Expand Down Expand Up @@ -700,9 +700,10 @@ sourceSets {
packageDocs // package info files
}

license {
header file("HEADER")
include '**/*.java'
spotless {
java {
licenseHeaderFile(rootProject.file("HEADER"))
}
}

task constantsJar(type: Jar) {
Expand Down
12 changes: 7 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G

enigma_version=2.0.0
enigma_version=2.1.0
stitch_version=0.6.1
unpick_version=2.2.0
cfr_version=0.0.9
unpick_version=2.3.0
cfr_version=0.1.1
name_proposal_version=0.1.4
tiny_remapper_version=0.8.1
asm_version=9.3

# Javadoc generation/linking
fabric_loader_version=0.11.6
jetbrains_annotations_version=22.0.0
fabric_loader_version=0.13.3
jetbrains_annotations_version=23.0.0
mappingpoet_version=0.3.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 7a9cbb5

Please sign in to comment.