Skip to content

Commit d1d2ce7

Browse files
committed
chore: relocate gson
1 parent bbf1eff commit d1d2ce7

3 files changed

Lines changed: 3 additions & 1 deletion

File tree

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ implementation-core = [
142142
"reflections",
143143
"kotlin-reflect",
144144
"hikari",
145-
# "gson",
145+
"gson",
146146
"exposed-core",
147147
"exposed-jdbc",
148148
"exposed-dao",

stickynote-loader/src/main/kotlin/org/sayandev/plugin/StickyNoteProjectPlugin.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ class StickyNoteProjectPlugin : Plugin<Project> {
114114
// relocate("com.alessiodp.libby", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.libby")
115115
// relocate("org.sqlite", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.sqlite")
116116
relocate("com.mysql", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.mysql")
117+
relocate("com.google.gson", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.gson")
117118
for (bundleAlias in libs.bundleAliases.filter { config.modules.get().map { "implementation.".plus(it.type.artifact.removePrefix("stickynote-").replace("-", ".")) }.contains(it) }) {
118119
val bundle = libs.findBundle(bundleAlias).get().get()
119120
for (alias in bundle) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public void load(String id, File dataFolder, Logger logger, LibraryManager libra
9090
if (name.contains("stickynote")) {
9191
relocations.put(relocationFrom, relocationTo + "{}lib{}stickynote");
9292
}
93+
relocations.put("com{}google{}gson", relocationTo + "{}lib{}gson");
9394
// relocations.put("org.sqlite", relocationTo + "{}lib{}sqlite");
9495
relocations.put("com.mysql", relocationTo + "{}lib{}mysql");
9596
if (exclusions.stream().anyMatch(excluded -> cachedDependency.getName().contains(excluded))) continue;

0 commit comments

Comments
 (0)