mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-24 14:16:44 +01:00
Update to gradle 5. gradlew clean assemble build actually WORKS
This commit is contained in:
parent
ac2d43db68
commit
69b05932eb
@ -7,15 +7,14 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
implementation project(':Core')
|
||||||
compile project(':Core')
|
compile project(':Core')
|
||||||
testCompile project(':Core')
|
|
||||||
compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
|
compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
|
||||||
compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT')
|
compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT')
|
||||||
compile(group: 'org.bstats', name: 'bstats-bukkit', version: '1.4')
|
compile(group: 'org.bstats', name: 'bstats-bukkit', version: '1.4')
|
||||||
compile("net.milkbowl.vault:VaultAPI:1.7") {
|
compile("net.milkbowl.vault:VaultAPI:1.7") {
|
||||||
exclude module: 'bukkit'
|
exclude module: 'bukkit'
|
||||||
}
|
}
|
||||||
compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceCompatibility = 1.8
|
sourceCompatibility = 1.8
|
||||||
|
@ -6,7 +6,11 @@ dependencies {
|
|||||||
testCompile 'junit:junit:4.12'
|
testCompile 'junit:junit:4.12'
|
||||||
compile 'org.yaml:snakeyaml:1.23'
|
compile 'org.yaml:snakeyaml:1.23'
|
||||||
compile 'com.google.code.gson:gson:2.8.5'
|
compile 'com.google.code.gson:gson:2.8.5'
|
||||||
compileOnly 'org.projectlombok:lombok:1.18.4'
|
compile("org.projectlombok:lombok:1.18.4")
|
||||||
|
compileOnly("org.projectlombok:lombok:1.18.4")
|
||||||
|
testCompileOnly("org.projectlombok:lombok:1.18.4")
|
||||||
|
annotationProcessor("org.projectlombok:lombok:1.18.4")
|
||||||
|
testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
|
||||||
|
|
||||||
compile 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'
|
compile 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'
|
||||||
compile 'com.squareup.okhttp3:okhttp:3.14.0'
|
compile 'com.squareup.okhttp3:okhttp:3.14.0'
|
||||||
|
22
build.gradle
22
build.gradle
@ -7,8 +7,7 @@ buildscript {
|
|||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
|
classpath 'com.github.jengelman.gradle.plugins:shadow:5.0.0'
|
||||||
classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
|
|
||||||
}
|
}
|
||||||
configurations.all {
|
configurations.all {
|
||||||
resolutionStrategy {
|
resolutionStrategy {
|
||||||
@ -18,7 +17,8 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'io.franzbecker.gradle-lombok' version '1.14'
|
id 'maven-publish'
|
||||||
|
id "org.ajoberstar.grgit" version "3.1.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
group = 'com.github.intellectualsites.plotsquared'
|
group = 'com.github.intellectualsites.plotsquared'
|
||||||
@ -32,7 +32,7 @@ ext {
|
|||||||
date = git.head().getDate().format("yy.MM.dd")
|
date = git.head().getDate().format("yy.MM.dd")
|
||||||
revision = "-${git.head().abbreviatedId}"
|
revision = "-${git.head().abbreviatedId}"
|
||||||
parents = git.head().parentIds;
|
parents = git.head().parentIds;
|
||||||
index = -2043; // Offset to match CI
|
index = -2042; // Offset to match CI
|
||||||
for (; parents != null && !parents.isEmpty(); index++) {
|
for (; parents != null && !parents.isEmpty(); index++) {
|
||||||
parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
|
parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
|
||||||
}
|
}
|
||||||
@ -53,11 +53,6 @@ subprojects {
|
|||||||
|
|
||||||
group = 'com.github.intellectualsites,plotsquared'
|
group = 'com.github.intellectualsites,plotsquared'
|
||||||
|
|
||||||
lombok {
|
|
||||||
version = '1.18.4'
|
|
||||||
sha256 = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(group: 'com.sk89q.worldedit', name: 'worldedit-core', version: '7.0.0-SNAPSHOT') {
|
compile(group: 'com.sk89q.worldedit', name: 'worldedit-core', version: '7.0.0-SNAPSHOT') {
|
||||||
exclude(module: 'bukkit-classloader-check')
|
exclude(module: 'bukkit-classloader-check')
|
||||||
@ -66,12 +61,13 @@ subprojects {
|
|||||||
}
|
}
|
||||||
//Minecraft uses Guava 21 as of 1.13.
|
//Minecraft uses Guava 21 as of 1.13.
|
||||||
compile 'com.google.guava:guava:21.0'
|
compile 'com.google.guava:guava:21.0'
|
||||||
compileOnly 'org.projectlombok:lombok:1.18.4'
|
compile("org.projectlombok:lombok:1.18.4")
|
||||||
|
compileOnly("org.projectlombok:lombok:1.18.4")
|
||||||
|
testCompileOnly("org.projectlombok:lombok:1.18.4")
|
||||||
|
annotationProcessor("org.projectlombok:lombok:1.18.4")
|
||||||
|
testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
|
||||||
testImplementation "junit:junit:4.12"
|
testImplementation "junit:junit:4.12"
|
||||||
}
|
}
|
||||||
clean {
|
|
||||||
delete file("../target")
|
|
||||||
}
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url "http://maven.sk89q.com/repo/" }
|
maven { url "http://maven.sk89q.com/repo/" }
|
||||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
#Fri Dec 21 16:11:33 EST 2018
|
#Fri Dec 21 16:11:33 EST 2018
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
|
|
||||||
|
Loading…
Reference in New Issue
Block a user