From a1b1b140a2e85cd9c8d0d0a5bc08944b0c4a72b6 Mon Sep 17 00:00:00 2001
From: Jason <11360596+jpenilla@users.noreply.github.com>
Date: Sun, 24 Oct 2021 00:14:34 -0700
Subject: [PATCH] Update Hypo to 1.2.2 (#102)

---
 .editorconfig                                      | 2 +-
 buildSrc/src/main/kotlin/config-publish.gradle.kts | 2 ++
 gradle/libs.versions.toml                          | 3 ++-
 paperweight-lib/build.gradle.kts                   | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 052f373..340d0e1 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,7 @@
 # noinspection EditorConfigKeyCorrectness
 [*.{kt,kts}]
 max_line_length = 150
-ij_kotlin_imports_layout = ascii
+ij_kotlin_imports_layout = *
 no-wildcard-imports = no-wildcard-imports
 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.*
diff --git a/buildSrc/src/main/kotlin/config-publish.gradle.kts b/buildSrc/src/main/kotlin/config-publish.gradle.kts
index a530654..af3f3b1 100644
--- a/buildSrc/src/main/kotlin/config-publish.gradle.kts
+++ b/buildSrc/src/main/kotlin/config-publish.gradle.kts
@@ -47,6 +47,8 @@ val shadowJar by tasks.existing(ShadowJar::class) {
         "org.objectweb.asm",
         "org.osgi",
         "org.tukaani.xz",
+        "org.apache.logging.slf4j",
+        "org.slf4j"
     ).forEach { pack ->
         relocate(pack, "$prefix.$pack")
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 53ca3a6..57903dd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 asm = "9.1"
 lorenz = "0.5.8"
-hypo = "1.2.1"
+hypo = "1.2.2"
 
 [libraries]
 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-hydrate = { module = "dev.denwav.hypo:hypo-asm-hydrate", 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"
 jbsdiff = "io.sigpipe:jbsdiff:1.0"
diff --git a/paperweight-lib/build.gradle.kts b/paperweight-lib/build.gradle.kts
index f58708f..0e7d3c6 100644
--- a/paperweight-lib/build.gradle.kts
+++ b/paperweight-lib/build.gradle.kts
@@ -10,6 +10,9 @@ dependencies {
     implementation(libs.bundles.asm)
 
     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.lorenzTiny)