Remove unnecessary files from jar and relocate Jetty

This commit is contained in:
Rsl1122 2022-07-03 10:54:01 +03:00
parent b32c4afe3f
commit aa67794881
7 changed files with 18 additions and 7 deletions

View File

@ -20,6 +20,6 @@ dependencies {
}
shadowJar {
relocate 'org.bstats', 'com.djrapitops.plan.utilities.metrics'
relocate 'org.bstats', 'net.playeranalytics.bstats.utilities.metrics'
relocate 'org.slf4j', 'plan.org.slf4j'
}

View File

@ -15,6 +15,6 @@ dependencies {
}
shadowJar {
relocate 'org.bstats', 'com.djrapitops.plan.utilities.metrics'
relocate 'org.bstats', 'net.playeranalytics.bstats.utilities.metrics'
relocate 'org.slf4j', 'plan.org.slf4j'
}

View File

@ -140,6 +140,7 @@ shadowJar {
// Exclude these files
exclude "**/*.svg"
exclude "**/*.psd"
exclude "**/*.map"
exclude "**/module-info.class"
exclude "module-info.class"

View File

@ -55,6 +55,10 @@ shadowJar {
relocate 'javax.inject', 'plan.javax.inject'
relocate 'com.github.benmanes', 'plan.com.github.benmanes'
relocate 'dev.vankka.dependencydownload', 'plan.dev.vankka.dependencydownload'
relocate 'org.eclipse.jetty', 'plan.org.eclipse.jetty'
relocate 'jakarta.servlet', 'plan.jakarta.servlet'
relocate 'javax.servlet', 'plan.javax.servlet'
}
remapJar {

View File

@ -34,6 +34,10 @@ shadowJar {
relocate 'com.github.benmanes', 'plan.com.github.benmanes'
relocate 'dev.vankka.dependencydownload', 'plan.dev.vankka.dependencydownload'
relocate 'org.eclipse.jetty', 'plan.org.eclipse.jetty'
relocate 'jakarta.servlet', 'plan.jakarta.servlet'
relocate 'javax.servlet', 'plan.javax.servlet'
destinationDirectory.set(file("$rootDir/builds/"))
archiveBaseName.set('Plan')
archiveClassifier.set('')

View File

@ -11,12 +11,12 @@ dependencies {
implementation project(path: ":common", configuration: 'shadow')
compileOnly project(":api")
implementation "net.playeranalytics:platform-abstraction-layer-sponge:$palVersion"
implementation "org.bstats:bstats-sponge:$bstatsVersion"
shadow "net.playeranalytics:platform-abstraction-layer-sponge:$palVersion"
shadow "org.bstats:bstats-sponge:$bstatsVersion"
testImplementation "org.spongepowered:spongeapi:$spongeVersion"
annotationProcessor "org.spongepowered:spongeapi:$spongeVersion"
implementation "org.spongepowered:mixin:0.7.11-SNAPSHOT"
shadow "org.spongepowered:mixin:0.7.11-SNAPSHOT"
testImplementation project(path: ":common", configuration: 'testArtifacts')
}
@ -72,5 +72,7 @@ compileJava {
}
shadowJar {
relocate "org.bstats", "com.djrapitops.plan.utilities.metrics"
configurations = [project.configurations.shadow]
relocate "org.bstats", "net.playeranalytics.bstats.utilities.metrics"
}

View File

@ -24,5 +24,5 @@ dependencies {
}
shadowJar {
relocate 'org.bstats', 'com.djrapitops.plan.utilities.metrics'
relocate 'org.bstats', 'net.playeranalytics.bstats.utilities.metrics'
}