ObsidianMC/nugget
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Hypo to 1.2.2 (#102)

Browse source
This commit is contained in:
Jason 2021-10-24 00:14:34 -07:00 committed by GitHub
parent d76e04dae4
commit a1b1b140a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.editorconfig
View file

@ -1,7 +1,7 @@
# noinspection EditorConfigKeyCorrectness # noinspection EditorConfigKeyCorrectness
[*.{kt,kts}] [*.{kt,kts}]
max_line_length = 150 max_line_length = 150
ij_kotlin_imports_layout = ascii ij_kotlin_imports_layout = *
no-wildcard-imports = no-wildcard-imports no-wildcard-imports = no-wildcard-imports
ij_continuation_indent_size = 4 ij_continuation_indent_size = 4
ij_kotlin_packages_to_use_import_on_demand = io.papermc.paperweight.util.**, io.papermc.paperweight.tasks.*, org.gradle.kotlin.dsl.*, kotlin.io.path.* ij_kotlin_packages_to_use_import_on_demand = io.papermc.paperweight.util.**, io.papermc.paperweight.tasks.*, org.gradle.kotlin.dsl.*, kotlin.io.path.*

2
buildSrc/src/main/kotlin/config-publish.gradle.kts
View file

@ -47,6 +47,8 @@ val shadowJar by tasks.existing(ShadowJar::class) {
"org.objectweb.asm", "org.objectweb.asm",
"org.osgi", "org.osgi",
"org.tukaani.xz", "org.tukaani.xz",
"org.apache.logging.slf4j",
"org.slf4j"
).forEach { pack -> ).forEach { pack ->
relocate(pack, "$prefix.$pack") relocate(pack, "$prefix.$pack")
} }

3
gradle/libs.versions.toml
View file

@ -1,7 +1,7 @@
[versions] [versions]
asm = "9.1" asm = "9.1"
lorenz = "0.5.8" lorenz = "0.5.8"
hypo = "1.2.1" hypo = "1.2.2"
[libraries] [libraries]
asm-core = { module = "org.ow2.asm:asm", version.ref = "asm" } asm-core = { module = "org.ow2.asm:asm", version.ref = "asm" }
@ -23,6 +23,7 @@ hypo-hydrate = { module = "dev.denwav.hypo:hypo-hydrate", version.ref = "hypo" }
hypo-asm-core = { module = "dev.denwav.hypo:hypo-asm", version.ref = "hypo" } hypo-asm-core = { module = "dev.denwav.hypo:hypo-asm", version.ref = "hypo" }
hypo-asm-hydrate = { module = "dev.denwav.hypo:hypo-asm-hydrate", version.ref = "hypo" } hypo-asm-hydrate = { module = "dev.denwav.hypo:hypo-asm-hydrate", version.ref = "hypo" }
hypo-mappings = { module = "dev.denwav.hypo:hypo-mappings", version.ref = "hypo" } hypo-mappings = { module = "dev.denwav.hypo:hypo-mappings", version.ref = "hypo" }
slf4j-log4j2-impl = "org.apache.logging.log4j:log4j-slf4j-impl:2.14.1"
lorenzTiny = "org.quiltmc:lorenz-tiny:3.0.0" lorenzTiny = "org.quiltmc:lorenz-tiny:3.0.0"
jbsdiff = "io.sigpipe:jbsdiff:1.0" jbsdiff = "io.sigpipe:jbsdiff:1.0"

3
paperweight-lib/build.gradle.kts
View file

@ -10,6 +10,9 @@ dependencies {
implementation(libs.bundles.asm) implementation(libs.bundles.asm)
implementation(libs.bundles.hypo) implementation(libs.bundles.hypo)
implementation(libs.slf4j.log4j2.impl) {
isTransitive = false // we get slf4j-api from hypo, gradle provides log4j
}
implementation(libs.bundles.cadix) implementation(libs.bundles.cadix)
implementation(libs.lorenzTiny) implementation(libs.lorenzTiny)