Tweak buildscript

This commit is contained in:
Jesse Boyd 2017-06-09 17:08:57 +10:00
parent f26543f7da
commit ac0e255a93
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
6 changed files with 15 additions and 9 deletions

View File

@ -28,7 +28,7 @@ ext {
date = git.head().date.format("yy.MM.dd") date = git.head().date.format("yy.MM.dd")
revision = "-${git.head().abbreviatedId}" revision = "-${git.head().abbreviatedId}"
parents = git.head().parentIds; parents = git.head().parentIds;
index = -91; // Offset to match CI index = -92; // Offset to match CI
int major, minor, patch; int major, minor, patch;
major = minor = patch = 0; major = minor = patch = 0;
for (;parents != null && !parents.isEmpty();index++) { for (;parents != null && !parents.isEmpty();index++) {
@ -81,7 +81,7 @@ subprojects {
mavenCentral() mavenCentral()
maven { url = "https://mvnrepository.com/artifact/"} maven { url = "https://mvnrepository.com/artifact/"}
maven {url "http://ci.emc.gs/nexus/content/groups/aikar/" } maven {url "http://ci.emc.gs/nexus/content/groups/aikar/" }
maven {url "http://ci.regularbox.com/plugin/repository/everything/"} maven {url "http://ci.mengcraft.com:8080/plugin/repository/everything/"}
maven {url "http://ci.athion.net/job/PlotSquared/ws/mvn/"} maven {url "http://ci.athion.net/job/PlotSquared/ws/mvn/"}
maven {url "http://empcraft.com/maven2"} maven {url "http://empcraft.com/maven2"}
maven {url "https://hub.spigotmc.org/nexus/content/groups/public/"} maven {url "https://hub.spigotmc.org/nexus/content/groups/public/"}

View File

@ -5,7 +5,7 @@ dependencies {
compile project(':core') compile project(':core')
compile 'org.bukkit.craftbukkitv1_10:craftbukkitv1_10:1.10' compile 'org.bukkit.craftbukkitv1_10:craftbukkitv1_10:1.10'
compile 'org.bukkit.craftbukkitv1_11:Craftbukkit:1.11' compile 'org.bukkit.craftbukkitv1_11:Craftbukkit:1.11'
compile 'org.bukkit.craftbukkitv1_12_P2:Craftbukkit:1.12' compile 'org.bukkit.craftbukkitv1_12:Craftbukkit:1.12'
compile 'net.milkbowl.vault:VaultAPI:1.5' compile 'net.milkbowl.vault:VaultAPI:1.5'
compile 'com.massivecraft:factions:2.8.0' compile 'com.massivecraft:factions:2.8.0'
compile 'com.drtshock:factions:1.6.9.5' compile 'com.drtshock:factions:1.6.9.5'

View File

@ -36,14 +36,20 @@ task createPom << {
artifactId 'fawe-api' artifactId 'fawe-api'
version project.parent.version version project.parent.version
} }
}.writeTo("../mvn/com/boydti/fawe-api/${project.parent.version}/fawe-api-${project.parent.version}.pom") }
.getEffectivePom()
.setDependencies(new ArrayList<>())
.writeTo("../mvn/com/boydti/fawe-api/${project.parent.version}/fawe-api-${project.parent.version}.pom")
pom { pom {
project { project {
groupId 'com.boydti' groupId 'com.boydti'
artifactId 'fawe-api' artifactId 'fawe-api'
version 'latest' version 'latest'
} }
}.writeTo("../mvn/com/boydti/fawe-api/latest/fawe-api-latest.pom") }
.getEffectivePom()
.setDependencies(new ArrayList<>())
.writeTo("../mvn/com/boydti/fawe-api/latest/fawe-api-latest.pom")
} }
task copyFiles { task copyFiles {

View File

@ -117,7 +117,7 @@ public class OptionsCommands {
) )
@CommandPermissions("worldedit.global-mask") @CommandPermissions("worldedit.global-mask")
public void gsmask(Player player, LocalSession session, EditSession editSession, @Optional CommandContext context) throws WorldEditException { public void gsmask(Player player, LocalSession session, EditSession editSession, @Optional CommandContext context) throws WorldEditException {
if (context.argsLength() == 0) { if (context == null || context.argsLength() == 0) {
session.setSourceMask((Mask) null); session.setSourceMask((Mask) null);
BBC.SOURCE_MASK_DISABLED.send(player); BBC.SOURCE_MASK_DISABLED.send(player);
} else { } else {
@ -141,7 +141,7 @@ public class OptionsCommands {
) )
@CommandPermissions("worldedit.global-trasnform") @CommandPermissions("worldedit.global-trasnform")
public void gtransform(Player player, EditSession editSession, LocalSession session, @Optional CommandContext context) throws WorldEditException { public void gtransform(Player player, EditSession editSession, LocalSession session, @Optional CommandContext context) throws WorldEditException {
if (context.argsLength() == 0) { if (context == null || context.argsLength() == 0) {
session.setTransform(null); session.setTransform(null);
BBC.TRANSFORM_DISABLED.send(player); BBC.TRANSFORM_DISABLED.send(player);
} else { } else {

View File

@ -1,5 +1,5 @@
#org.gradle.java.home=C:/PROGRA~2/Java/jdk1.7.0_79 #org.gradle.java.home=C:/PROGRA~2/Java/jdk1.7.0_79
#org.gradle.java.home=C:/PROGRA~1/Java/jdk1.8.0_51 #org.gradle.java.home=C:/PROGRA~1/Java/jdk1.8.0_51
org.gradle.daemon=false org.gradle.daemon=true
org.gradle.configureondemand=true org.gradle.configureondemand=true
org.gradle.parallel=true org.gradle.parallel=true

View File

@ -4,7 +4,7 @@ repositories {
dependencies { dependencies {
compile project(':core') compile project(':core')
compile 'cn.nukkit:nukkit:1.0-SNAPSHOT' compile 'cn.nukkit:nukkit:1.0-SNAPSHOT'
compile name: 'worldedit-core-6.1.4-SNAPSHOT-dist' compile name: 'worldedit-core-6.1.4-SNAPSHOT-dist', changing: true
} }
processResources { processResources {