Some fixes for new libs shading

This commit is contained in:
Kenzie Togami 2019-04-20 23:33:54 -07:00
parent 1e7b4fc835
commit 5c19866809
No known key found for this signature in database
GPG Key ID: 5D200B325E157A81
6 changed files with 13 additions and 22 deletions

View File

@ -152,7 +152,8 @@ configure(['bukkit', 'forge', 'sponge'].collect { project(":worldedit-$it") }) {
shadowJar {
classifier 'dist'
dependencies {
include(project(":worldedit-libs"))
include(project(":worldedit-libs:core"))
include(project(":worldedit-libs:${project.name.replace("worldedit-", "")}"))
include(project(":worldedit-core"))
}
exclude 'GradleStart**'

View File

@ -15,6 +15,7 @@ dependencies {
compile 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT' // zzz
compile "io.papermc:paperlib:1.0.1"
compile 'org.slf4j:slf4j-jdk14:1.7.26'
compile 'org.bstats:bstats-bukkit:1.4'
testCompile 'org.mockito:mockito-core:1.9.0-rc1'
}

View File

@ -1,5 +1,3 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
apply plugin: 'eclipse'
apply plugin: 'idea'
@ -28,8 +26,3 @@ sourceSets {
}
}
}
task jar(type: ShadowJar, overwrite: true) {
from sourceSets.main.output
configurations = [project.configurations.runtime]
}

View File

@ -88,10 +88,8 @@ shadowJar {
relocate "org.slf4j", "com.sk89q.worldedit.slf4j"
relocate "org.apache.logging.slf4j", "com.sk89q.worldedit.log4jbridge"
include(dependency(':worldedit-core'))
include(dependency('org.slf4j:slf4j-api'))
include(dependency("org.apache.logging.log4j:log4j-slf4j-impl"))
include(dependency("net.kyori:text-serializer-gson:2.0.0"))
}
}

View File

@ -6,6 +6,7 @@ subprojects {
apply plugin: 'com.jfrog.artifactory'
configurations {
create("shade")
getByName("archives").extendsFrom(getByName("default"))
}
group = rootProject.group + ".worldedit-libs"
@ -51,11 +52,11 @@ subprojects {
artifacts {
add("default", jar)
add("default", sourcesJar)
add("archives", sourcesJar)
}
tasks.register("install", Upload) {
configuration = configurations.default
configuration = configurations.archives
repositories.mavenInstaller {
pom.version = project.version
pom.artifactId = project.name
@ -74,7 +75,9 @@ project("core") {
shade 'net.kyori:text-api:2.0.0'
shade 'net.kyori:text-serializer-gson:2.0.0'
shade 'net.kyori:text-serializer-legacy:2.0.0'
shade 'com.sk89q:jchronic:0.2.4a'
shade('com.sk89q:jchronic:0.2.4a') {
exclude(group: "junit", module: "junit")
}
shade 'com.thoughtworks.paranamer:paranamer:2.6'
shade 'com.sk89q.lib:jlibnoise:1.0.0'
}
@ -82,13 +85,11 @@ project("core") {
project("bukkit") {
dependencies {
shade 'net.kyori:text-adapter-bukkit:1.0.3'
shade 'org.bstats:bstats-bukkit:1.4'
}
}
project("sponge") {
dependencies {
shade 'net.kyori:text-adapter-spongeapi:1.0.3'
shade 'org.bstats:bstats-sponge:1.4'
}
}

View File

@ -19,6 +19,7 @@ dependencies {
compile project(':worldedit-core')
compile project(':worldedit-libs:sponge')
compile 'org.spongepowered:spongeapi:7.1.0'
compile 'org.bstats:bstats-sponge:1.4'
testCompile group: 'org.mockito', name: 'mockito-core', version:'1.9.0-rc1'
}
@ -40,14 +41,10 @@ jar {
shadowJar {
dependencies {
include(dependency(':worldedit-core'))
relocate ("org.bstats", "com.sk89q.worldedit.sponge.bstats") {
include(dependency('org.bstats:bstats-sponge:1.4'))
include(dependency("net.kyori:text-adapter-spongeapi:1.0.3"))
}
}
artifacts {
archives shadowJar
}
}
if (project.hasProperty("signing")) {