From aaed3f622a498751fdd56b79f7912bc8db88dd49 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Fri, 21 Dec 2018 13:38:28 +0000 Subject: [PATCH] Fix build for gradlew clean assemble build --- Bukkit/build.gradle | 2 +- Core/build.gradle | 2 +- build.gradle | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index aa4131cdd..9b807ee0d 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -12,7 +12,7 @@ dependencies { compile("net.milkbowl.vault:VaultAPI:1.6") { exclude module: 'bukkit' } - compileOnly 'org.projectlombok:lombok:1.16.18' + compileOnly 'org.projectlombok:lombok:1.18.4' } sourceCompatibility = 1.8 diff --git a/Core/build.gradle b/Core/build.gradle index f7d9f78eb..ee8cd6834 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -2,7 +2,7 @@ dependencies { testCompile 'junit:junit:4.12' compile 'org.yaml:snakeyaml:1.16' 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 diff --git a/build.gradle b/build.gradle index 4d4a3a3bc..d3586fd93 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import org.ajoberstar.grgit.Grgit + buildscript { repositories { mavenCentral() @@ -5,7 +7,7 @@ buildscript { jcenter() } 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' } configurations.all { @@ -16,7 +18,6 @@ buildscript { } plugins { - id 'maven-publish' id 'io.franzbecker.gradle-lombok' version '1.14' } @@ -27,7 +28,7 @@ def revision = "" def buildNumber = "" def date = "" ext { - git = org.ajoberstar.grgit.Grgit.open(file(".git")) + git = Grgit.open(file(".git")) date = git.head().date.format("yy.MM.dd") revision = "-${git.head().abbreviatedId}" parents = git.head().parentIds; @@ -42,7 +43,7 @@ version = String.format("%s.%s%s%s", rootVersion, date, revision, buildNumber) description = rootProject.name if (project.hasProperty("lzNoVersion")) { // gradle build -PlzNoVersion - version = "unknown"; + version = "unknown" } subprojects { @@ -53,7 +54,7 @@ subprojects { apply plugin: 'com.github.johnrengelman.shadow' lombok { - version = '1.18.2' + version = '1.18.4' sha256 = "" } @@ -63,7 +64,7 @@ subprojects { exclude(module: 'mockito-core') 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' } clean {