From 1e97392244ba2b04cb626bd1dd743fadbf26f76f Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Tue, 23 Apr 2019 22:27:32 +0100 Subject: [PATCH] Update to gradle 5.4 --- Bukkit/build.gradle | 8 ++++---- Core/build.gradle | 6 +++--- build.gradle | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index c22f4d681..19e71c895 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -37,11 +37,11 @@ shadowJar { include(dependency(':Core')) include(dependency('org.bstats:bstats-bukkit:1.4')) // update notification stuff - include(dependency('com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT')) - include(dependency('com.squareup.retrofit2:retrofit:2.4.0')) - include(dependency('com.squareup.okhttp3:okhttp:3.14.0')) + include(dependency('com.github.Sauilitired:Jenkins4J:3.0-SNAPSHOT')) + include(dependency('com.squareup.retrofit2:retrofit:2.5.0')) + include(dependency('com.squareup.okhttp3:okhttp:3.14.1')) include(dependency('com.squareup.okio:okio:2.2.2')) - include(dependency('org.jetbrains.kotlin:kotlin-stdlib:1.3.21')) + include(dependency('org.jetbrains.kotlin:kotlin-stdlib:1.3.30')) } archiveName = "${parent.name}-${project.name}-${parent.version}.jar" destinationDir = file '../target' diff --git a/Core/build.gradle b/Core/build.gradle index 48fa09110..0e24504f9 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -12,10 +12,10 @@ dependencies { annotationProcessor("org.projectlombok:lombok:1.18.4") testAnnotationProcessor("org.projectlombok:lombok:1.18.4") - compile 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT' - compile 'com.squareup.okhttp3:okhttp:3.14.0' + compile 'com.github.Sauilitired:Jenkins4J:3.0-SNAPSHOT' + compile 'com.squareup.okhttp3:okhttp:3.14.1' compile 'com.squareup.okio:okio:2.2.2' - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.21' + compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.30' } sourceCompatibility = 1.8 diff --git a/build.gradle b/build.gradle index 0edf1ecb7..b99c5bbdc 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } configurations.all { resolutionStrategy { - force 'org.ow2.asm:asm:7.0' + force 'org.ow2.asm:asm:7.1' } } } @@ -69,11 +69,11 @@ subprojects { } //Minecraft uses Guava 21 as of 1.13. compile 'com.google.guava:guava:21.0' - 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("org.projectlombok:lombok:1.18.6") + compileOnly("org.projectlombok:lombok:1.18.6") + testCompileOnly("org.projectlombok:lombok:1.18.6") + annotationProcessor("org.projectlombok:lombok:1.18.6") + testAnnotationProcessor("org.projectlombok:lombok:1.18.6") testImplementation "junit:junit:4.12" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2b3219323..db5043d4e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Dec 21 16:11:33 EST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists