Skip to content

Commit 991fcb9

Browse files
committed
fix: relocation problems
1 parent 03dab98 commit 991fcb9

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

build.gradle.kts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ subprojects {
3232

3333
dependencies {
3434
testImplementation(rootProject.libs.kotlin.test)
35-
compileOnly(rootProject.libs.kotlin.jvm)
35+
implementation(rootProject.libs.kotlin.jvm)
3636
}
3737

3838
kotlin {
@@ -52,6 +52,14 @@ subprojects {
5252

5353
named("shadowJar", ShadowJar::class) {
5454
mergeServiceFiles()
55+
relocate("com.google.protobuf", "app.simplecloud.relocate.google.protobuf")
56+
relocate("com.google.common", "app.simplecloud.relocate.google.common")
57+
relocate("io.grpc", "app.simplecloud.relocate.io.grpc")
58+
59+
60+
relocate("org.incendo", "app.simplecloud.signs.plugin.relocate.incendo")
61+
relocate("org.spongepowered", "app.simplecloud.signs.plugin.relocate.spongepowered")
62+
relocate("app.simplecloud.plugin.api", "app.simplecloud.signs.plugin.relocate.plugin.api")
5563
archiveFileName.set("${project.name}.jar")
5664
}
5765

sign-paper/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ dependencies {
1212
exclude(group = "org.jetbrains.kotlin")
1313
exclude(group = "org.jetbrains.kotlinx")
1414
}
15-
compileOnly(rootProject.libs.bundles.coroutine)
16-
compileOnly(rootProject.libs.simplecloud.controller.api)
15+
implementation(rootProject.libs.bundles.coroutine)
16+
implementation(rootProject.libs.simplecloud.controller.api)
1717
}
1818

1919
tasks {
2020
shadowJar {
2121
exclude("kotlin")
2222
exclude("kotlinx")
23+
relocate("app.simplecloud.controller", "app.simplecloud.signs.plugin.relocate.controller")
2324
mergeServiceFiles()
2425
}
2526
}
@@ -43,7 +44,7 @@ modrinth {
4344
"1.21.2",
4445
"1.21.3",
4546
"1.21.4",
46-
"1.21.5"
47+
"1.21.5"
4748
)
4849
loaders.add("paper")
4950
changelog.set("https://docs.simplecloud.app/changelog")

0 commit comments

Comments
 (0)