Fix build for gradlew clean assemble build

This commit is contained in:
dordsor21 2018-12-21 13:38:28 +00:00
parent 8bc0bcd9e6
commit aaed3f622a
3 changed files with 9 additions and 8 deletions

View File

@ -12,7 +12,7 @@ dependencies {
compile("net.milkbowl.vault:VaultAPI:1.6") { compile("net.milkbowl.vault:VaultAPI:1.6") {
exclude module: 'bukkit' exclude module: 'bukkit'
} }
compileOnly 'org.projectlombok:lombok:1.16.18' compileOnly 'org.projectlombok:lombok:1.18.4'
} }
sourceCompatibility = 1.8 sourceCompatibility = 1.8

View File

@ -2,7 +2,7 @@ dependencies {
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile 'org.yaml:snakeyaml:1.16' compile 'org.yaml:snakeyaml:1.16'
compile 'com.google.code.gson:gson:2.2.4' compile 'com.google.code.gson:gson:2.2.4'
compileOnly 'org.projectlombok:lombok:1.16.18' compileOnly 'org.projectlombok:lombok:1.18.4'
} }
sourceCompatibility = 1.8 sourceCompatibility = 1.8

View File

@ -1,3 +1,5 @@
import org.ajoberstar.grgit.Grgit
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
@ -5,7 +7,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3' classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
classpath 'org.ajoberstar:grgit:1.7.0' classpath 'org.ajoberstar:grgit:1.7.0'
} }
configurations.all { configurations.all {
@ -16,7 +18,6 @@ buildscript {
} }
plugins { plugins {
id 'maven-publish'
id 'io.franzbecker.gradle-lombok' version '1.14' id 'io.franzbecker.gradle-lombok' version '1.14'
} }
@ -27,7 +28,7 @@ def revision = ""
def buildNumber = "" def buildNumber = ""
def date = "" def date = ""
ext { ext {
git = org.ajoberstar.grgit.Grgit.open(file(".git")) git = Grgit.open(file(".git"))
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;
@ -42,7 +43,7 @@ version = String.format("%s.%s%s%s", rootVersion, date, revision, buildNumber)
description = rootProject.name description = rootProject.name
if (project.hasProperty("lzNoVersion")) { // gradle build -PlzNoVersion if (project.hasProperty("lzNoVersion")) { // gradle build -PlzNoVersion
version = "unknown"; version = "unknown"
} }
subprojects { subprojects {
@ -53,7 +54,7 @@ subprojects {
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
lombok { lombok {
version = '1.18.2' version = '1.18.4'
sha256 = "" sha256 = ""
} }
@ -63,7 +64,7 @@ subprojects {
exclude(module: 'mockito-core') exclude(module: 'mockito-core')
exclude(module: 'dummypermscompat') exclude(module: 'dummypermscompat')
} }
compile 'com.google.guava:guava:10.0' compile 'com.google.guava:guava:27.0.1-jre'
compileOnly 'org.projectlombok:lombok:1.18.4' compileOnly 'org.projectlombok:lombok:1.18.4'
} }
clean { clean {