Clean up gradle dependencies. Tell me if this breaks downstream builds.

Either I broke something, or you were using WG's jar for some dep that we
don't consider to be API.
This commit is contained in:
wizjany 2019-04-28 20:36:28 -04:00
parent 5c8b6d3f95
commit 2aee42cbf2
3 changed files with 17 additions and 15 deletions

View File

@ -67,6 +67,7 @@
subprojects {
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'maven'
apply plugin: 'checkstyle'
apply plugin: 'com.github.johnrengelman.shadow'
@ -123,7 +124,6 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
include(dependency('org.khelekore:prtree:1.5.0'))
include(dependency('com.sk89q:squirrelid:0.2.0'))
include(dependency('org.flywaydb:flyway-core:3.0'))
include(dependency('com.googlecode.json-simple:json-simple:1.1.1'))
}
exclude 'GradleStart**'
exclude '.cache'

View File

@ -2,14 +2,15 @@
apply plugin: 'idea'
dependencies {
compile 'com.sk89q.worldedit:worldedit-core:7.0.0-SNAPSHOT'
compile 'com.sk89q.intake:intake:4.2-SNAPSHOT'
compile 'com.sk89q:squirrelid:0.2.0'
compile 'org.flywaydb:flyway-core:3.0'
compile 'org.khelekore:prtree:1.5.0'
compile 'com.google.code.findbugs:jsr305:1.3.9'
testCompile 'junit:junit:4.11'
testCompile 'org.hamcrest:hamcrest-library:1.2.1'
api 'com.sk89q.worldedit:worldedit-core:7.0.0-SNAPSHOT'
implementation 'com.sk89q.intake:intake:4.2-SNAPSHOT'
implementation 'com.sk89q:squirrelid:0.2.0'
implementation 'org.flywaydb:flyway-core:3.0'
implementation 'org.khelekore:prtree:1.5.0'
api 'com.google.code.findbugs:jsr305:1.3.9'
testImplementation 'junit:junit:4.11'
testImplementation 'org.hamcrest:hamcrest-library:1.2.1'
}
sourceSets {

View File

@ -9,14 +9,16 @@
}
dependencies {
compile project(path: ':worldguard-core', configuration: 'shadow')
compile 'org.bukkit:bukkit:1.13-R0.1-SNAPSHOT'
compile 'com.sk89q.worldedit:worldedit-bukkit:7.0.0-SNAPSHOT'
compile ('com.sk89q:commandbook:2.3') {
api project(path: ':worldguard-core', configuration: 'shadow')
api 'org.bukkit:bukkit:1.13-R0.1-SNAPSHOT'
api 'com.sk89q.worldedit:worldedit-bukkit:7.0.0-SNAPSHOT'
implementation ('com.sk89q:commandbook:2.3') {
exclude group: 'com.sk89q', module: 'worldedit'
exclude group: 'com.zachsthings.libcomponents'
exclude group: 'org.bukkit'
}
compile 'org.bstats:bstats-bukkit:1.4'
implementation 'org.bstats:bstats-bukkit:1.4'
}
processResources {
@ -45,7 +47,6 @@ compile project(path: ':worldguard-core', configuration: 'shadow')
}
relocate('org.flywaydb', 'com.sk89q.worldguard.internal.flywaydb')
relocate('org.json.simple', 'com.sk89q.worldguard.util.jsonsimple')
}