Skip to content

Commit e26d9dc

Browse files
committed
fix: re-add slf4j-api
1 parent 14737c1 commit e26d9dc

3 files changed

Lines changed: 20 additions & 19 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66

77
allprojects {
88
group = "org.sayandev"
9-
version = "1.8.9.129"
9+
version = "1.8.9.132"
1010
description = "A modular Kotlin framework for Minecraft: JE"
1111

1212
plugins.apply("maven-publish")

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ implementation-core = [
146146
"checker-qual",
147147
"javassist",
148148
"annotations",
149-
"slf4j-api",
149+
# "slf4j-api",
150150
"error_prone_annotations",
151151
"geantyref",
152152
# transitives - end

stickynote-loader/stickynote-loader-common/src/main/java/org/sayandev/loader/common/StickyNoteLoader.java

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public void load(String id, File dataDirectory, Logger logger, LibraryManager li
5959

6060
relocations.put("com{}mysql", relocationTo + "{}lib{}mysql");
6161
relocations.put("kotlinx{}coroutines", relocationTo + "{}lib{}kotlinx{}coroutines");
62+
// relocations.put("org{}slf4j", relocationTo + "{}lib{}slf4j");
6263

6364
boolean hasSQLite = false;
6465
try {
@@ -292,23 +293,23 @@ private List<Library> resolveTransitiveLibraries(String id, TransitiveDependency
292293
.groupId(dependency.getGroup())
293294
.artifactId(dependency.getName())
294295
.version(dependency.getVersion())
295-
.excludeTransitiveDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm")
296-
.excludeTransitiveDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")
297-
.excludeTransitiveDependency("org.jetbrains.kotlin", "kotlin-stdlib")
298-
.excludeTransitiveDependency("org.jetbrains.kotlin", "kotlin-stdlib")
299-
.excludeTransitiveDependency("org.jetbrains.kotlin", "kotlin-stdlib")
300-
.excludeTransitiveDependency("org.jetbrains.kotlin", "kotlin-stdlib-common")
301-
.excludeTransitiveDependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
302-
.excludeTransitiveDependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
303-
.excludeTransitiveDependency("org.jetbrains", "annotations")
304-
.excludeTransitiveDependency("org.checkerframework", "checker-qual")
305-
.excludeTransitiveDependency("org.javassist", "javassist")
306-
.excludeTransitiveDependency("org.slf4j", "slf4j-api")
307-
.excludeTransitiveDependency("org.yaml", "snakeyaml")
308-
.excludeTransitiveDependency("com.google.gson", "gson")
309-
.excludeTransitiveDependency("com.google.errorprone", "error_prone_annotations")
310-
.excludeTransitiveDependency("io.leangen.geantyref", "geantyref")
311-
.excludeTransitiveDependency("org.xerial", "sqlite-jdbc")
296+
.excludeTransitiveDependency("org{}jetbrains{}kotlinx".replace("{}", "."), "kotlinx-coroutines-core-jvm")
297+
.excludeTransitiveDependency("org{}jetbrains{}kotlinx".replace("{}", "."), "kotlinx-coroutines-core")
298+
.excludeTransitiveDependency("org{}jetbrains{}kotlin".replace("{}", "."), "kotlin-stdlib")
299+
.excludeTransitiveDependency("org{}jetbrains{}kotlin".replace("{}", "."), "kotlin-stdlib")
300+
.excludeTransitiveDependency("org{}jetbrains{}kotlin".replace("{}", "."), "kotlin-stdlib")
301+
.excludeTransitiveDependency("org{}jetbrains{}kotlin".replace("{}", "."), "kotlin-stdlib-common")
302+
.excludeTransitiveDependency("org{}jetbrains{}kotlin".replace("{}", "."), "kotlin-stdlib-jdk7")
303+
.excludeTransitiveDependency("org{}jetbrains{}kotlin".replace("{}", "."), "kotlin-stdlib-jdk8")
304+
.excludeTransitiveDependency("org{}jetbrains".replace("{}", "."), "annotations")
305+
.excludeTransitiveDependency("org{}checkerframework".replace("{}", "."), "checker-qual")
306+
.excludeTransitiveDependency("org{}javassist".replace("{}", "."), "javassist")
307+
// .excludeTransitiveDependency("org{}slf4j".replace("{}", "."), "slf4j-api")
308+
.excludeTransitiveDependency("org{}yaml".replace("{}", "."), "snakeyaml")
309+
.excludeTransitiveDependency("com{}google{}gson".replace("{}", "."), "gson")
310+
.excludeTransitiveDependency("com{}google{}errorprone".replace("{}", "."), "error_prone_annotations")
311+
.excludeTransitiveDependency("io{}leangen{}geantyref".replace("{}", "."), "geantyref")
312+
.excludeTransitiveDependency("org{}xerial".replace("{}", "."), "sqlite-jdbc")
312313
// .loaderId(id + "_" + dependency.getName())
313314
// .isolatedLoad(true)
314315
.build()

0 commit comments

Comments
 (0)