geforkt von Mirrors/FastAsyncWorldEdit
Some fixes for new libs shading
Dieser Commit ist enthalten in:
Ursprung
1e7b4fc835
Commit
5c19866809
@ -152,7 +152,8 @@ configure(['bukkit', 'forge', 'sponge'].collect { project(":worldedit-$it") }) {
|
|||||||
shadowJar {
|
shadowJar {
|
||||||
classifier 'dist'
|
classifier 'dist'
|
||||||
dependencies {
|
dependencies {
|
||||||
include(project(":worldedit-libs"))
|
include(project(":worldedit-libs:core"))
|
||||||
|
include(project(":worldedit-libs:${project.name.replace("worldedit-", "")}"))
|
||||||
include(project(":worldedit-core"))
|
include(project(":worldedit-core"))
|
||||||
}
|
}
|
||||||
exclude 'GradleStart**'
|
exclude 'GradleStart**'
|
||||||
|
@ -15,6 +15,7 @@ dependencies {
|
|||||||
compile 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT' // zzz
|
compile 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT' // zzz
|
||||||
compile "io.papermc:paperlib:1.0.1"
|
compile "io.papermc:paperlib:1.0.1"
|
||||||
compile 'org.slf4j:slf4j-jdk14:1.7.26'
|
compile 'org.slf4j:slf4j-jdk14:1.7.26'
|
||||||
|
compile 'org.bstats:bstats-bukkit:1.4'
|
||||||
testCompile 'org.mockito:mockito-core:1.9.0-rc1'
|
testCompile 'org.mockito:mockito-core:1.9.0-rc1'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
|
||||||
|
|
||||||
apply plugin: 'eclipse'
|
apply plugin: 'eclipse'
|
||||||
apply plugin: 'idea'
|
apply plugin: 'idea'
|
||||||
|
|
||||||
@ -28,8 +26,3 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task jar(type: ShadowJar, overwrite: true) {
|
|
||||||
from sourceSets.main.output
|
|
||||||
configurations = [project.configurations.runtime]
|
|
||||||
}
|
|
@ -88,10 +88,8 @@ shadowJar {
|
|||||||
relocate "org.slf4j", "com.sk89q.worldedit.slf4j"
|
relocate "org.slf4j", "com.sk89q.worldedit.slf4j"
|
||||||
relocate "org.apache.logging.slf4j", "com.sk89q.worldedit.log4jbridge"
|
relocate "org.apache.logging.slf4j", "com.sk89q.worldedit.log4jbridge"
|
||||||
|
|
||||||
include(dependency(':worldedit-core'))
|
|
||||||
include(dependency('org.slf4j:slf4j-api'))
|
include(dependency('org.slf4j:slf4j-api'))
|
||||||
include(dependency("org.apache.logging.log4j:log4j-slf4j-impl"))
|
include(dependency("org.apache.logging.log4j:log4j-slf4j-impl"))
|
||||||
include(dependency("net.kyori:text-serializer-gson:2.0.0"))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ subprojects {
|
|||||||
apply plugin: 'com.jfrog.artifactory'
|
apply plugin: 'com.jfrog.artifactory'
|
||||||
configurations {
|
configurations {
|
||||||
create("shade")
|
create("shade")
|
||||||
|
getByName("archives").extendsFrom(getByName("default"))
|
||||||
}
|
}
|
||||||
|
|
||||||
group = rootProject.group + ".worldedit-libs"
|
group = rootProject.group + ".worldedit-libs"
|
||||||
@ -51,11 +52,11 @@ subprojects {
|
|||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
add("default", jar)
|
add("default", jar)
|
||||||
add("default", sourcesJar)
|
add("archives", sourcesJar)
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register("install", Upload) {
|
tasks.register("install", Upload) {
|
||||||
configuration = configurations.default
|
configuration = configurations.archives
|
||||||
repositories.mavenInstaller {
|
repositories.mavenInstaller {
|
||||||
pom.version = project.version
|
pom.version = project.version
|
||||||
pom.artifactId = project.name
|
pom.artifactId = project.name
|
||||||
@ -74,7 +75,9 @@ project("core") {
|
|||||||
shade 'net.kyori:text-api:2.0.0'
|
shade 'net.kyori:text-api:2.0.0'
|
||||||
shade 'net.kyori:text-serializer-gson:2.0.0'
|
shade 'net.kyori:text-serializer-gson:2.0.0'
|
||||||
shade 'net.kyori:text-serializer-legacy: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.thoughtworks.paranamer:paranamer:2.6'
|
||||||
shade 'com.sk89q.lib:jlibnoise:1.0.0'
|
shade 'com.sk89q.lib:jlibnoise:1.0.0'
|
||||||
}
|
}
|
||||||
@ -82,13 +85,11 @@ project("core") {
|
|||||||
project("bukkit") {
|
project("bukkit") {
|
||||||
dependencies {
|
dependencies {
|
||||||
shade 'net.kyori:text-adapter-bukkit:1.0.3'
|
shade 'net.kyori:text-adapter-bukkit:1.0.3'
|
||||||
shade 'org.bstats:bstats-bukkit:1.4'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
project("sponge") {
|
project("sponge") {
|
||||||
dependencies {
|
dependencies {
|
||||||
shade 'net.kyori:text-adapter-spongeapi:1.0.3'
|
shade 'net.kyori:text-adapter-spongeapi:1.0.3'
|
||||||
shade 'org.bstats:bstats-sponge:1.4'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@ dependencies {
|
|||||||
compile project(':worldedit-core')
|
compile project(':worldedit-core')
|
||||||
compile project(':worldedit-libs:sponge')
|
compile project(':worldedit-libs:sponge')
|
||||||
compile 'org.spongepowered:spongeapi:7.1.0'
|
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'
|
testCompile group: 'org.mockito', name: 'mockito-core', version:'1.9.0-rc1'
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -40,16 +41,12 @@ jar {
|
|||||||
|
|
||||||
shadowJar {
|
shadowJar {
|
||||||
dependencies {
|
dependencies {
|
||||||
include(dependency(':worldedit-core'))
|
relocate ("org.bstats", "com.sk89q.worldedit.sponge.bstats") {
|
||||||
include(dependency('org.bstats:bstats-sponge:1.4'))
|
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")) {
|
if (project.hasProperty("signing")) {
|
||||||
apply plugin: 'signing'
|
apply plugin: 'signing'
|
||||||
|
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren