diff options
author | shedaniel <daniel@shedaniel.me> | 2021-01-18 09:08:38 +0800 |
---|---|---|
committer | shedaniel <daniel@shedaniel.me> | 2021-01-18 09:08:38 +0800 |
commit | e88f78bc6291cfeb6b0ec7c931a6969156ab5487 (patch) | |
tree | 91ea17c56eb08842098e846ab5c474bd66bce454 /build.gradle | |
parent | 3a49510c0189b787b82b4829a217e99053bfec39 (diff) | |
parent | 47097c65cede8a4200a55ad32be1d183f474b80d (diff) | |
download | architectury-loom-e88f78bc6291cfeb6b0ec7c931a6969156ab5487.tar.gz architectury-loom-e88f78bc6291cfeb6b0ec7c931a6969156ab5487.tar.bz2 architectury-loom-e88f78bc6291cfeb6b0ec7c931a6969156ab5487.zip |
Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
# .github/workflows/test-push.yml
# build.gradle
# src/main/java/net/fabricmc/loom/util/Constants.java
Diffstat (limited to 'build.gradle')
-rw-r--r-- | build.gradle | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/build.gradle b/build.gradle index 19294519..8c856f41 100644 --- a/build.gradle +++ b/build.gradle @@ -43,30 +43,34 @@ dependencies { implementation gradleApi() // libraries - implementation ('commons-io:commons-io:2.6') - implementation ('org.zeroturnaround:zt-zip:1.13') - implementation ('com.google.code.gson:gson:2.8.5') - implementation ('com.google.guava:guava:28.0-jre') + implementation ('commons-io:commons-io:2.8.0') + implementation ('org.zeroturnaround:zt-zip:1.14') + implementation ('com.google.code.gson:gson:2.8.6') + implementation ('com.google.guava:guava:30.1-jre') + implementation ('org.ow2.asm:asm:9.0') + implementation ('org.ow2.asm:asm-analysis:9.0') + implementation ('org.ow2.asm:asm-commons:9.0') + implementation ('org.ow2.asm:asm-tree:9.0') + implementation ('org.ow2.asm:asm-util:9.0') // game handling utils - implementation ('net.fabricmc:stitch:0.4.6+build.74') { + implementation ('net.fabricmc:stitch:0.5.1+build.77') { exclude module: 'mercury' exclude module: 'enigma' } // tinyfile management - implementation ('net.fabricmc:tiny-remapper:0.3.0.70') - implementation ('net.fabricmc:tiny-mappings-parser:0.2.2.14') + implementation ('net.fabricmc:tiny-remapper:0.3.2') + implementation ('net.fabricmc:tiny-mappings-parser:0.3.0+build.17') implementation 'net.fabricmc:access-widener:1.0.0' - implementation ('net.fabricmc:lorenz-tiny:2.0.0+build.2') { + implementation ('net.fabricmc:lorenz-tiny:3.0.0') { transitive = false } - implementation ('org.cadixdev:lorenz-io-proguard:0.5.5') + implementation ('org.cadixdev:lorenz-io-proguard:0.5.6') // decompilers - implementation ('net.fabricmc:procyon-fabric-compilertools:0.5.35.13') implementation ('net.fabricmc:fabric-fernflower:1.3.0') implementation ('org.benf:cfr:0.150') @@ -74,7 +78,7 @@ dependencies { implementation ('org.cadixdev:mercury:0.2.8') // Kapt integration - compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72') + compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21') // Forge patches implementation ('net.minecraftforge:binarypatcher:1.1.1') |