Merge pull request #22 from Fernthedev/stable

Merge base to stable
Fernthedev · Mar 17, 2020 · cb8be9e · cb8be9e
2 parents 6dd454a + e1ad8b1
commit cb8be9e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/all/build.gradle b/all/build.gradle
@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'junit', name: 'junit', version: '4.13'
 
     compile project(':core')
     compile project(':bungee')

diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 plugins {
     id 'java'
     id 'org.jetbrains.kotlin.jvm' version '1.3.70'
-    id 'net.nemerosa.versioning' version '2.8.2'
+    id 'net.nemerosa.versioning' version '2.12.1'
     id "io.freefair.lombok" version "5.0.0-rc4"
     id 'signing'
     id 'maven-publish'
@@ -152,7 +152,7 @@ allprojects {
     dependencies {
         implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-        compileOnly 'org.projectlombok:lombok:1.18.8'
+        compileOnly 'org.projectlombok:lombok:1.18.12'
         annotationProcessor 'org.projectlombok:lombok:1.18.8'
     }
 

diff --git a/bungee/build.gradle b/bungee/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm'// version '1.3.61'
+    id 'org.jetbrains.kotlin.jvm'// version '1.3.70'
 }
 sourceCompatibility = 1.8
 archivesBaseName = "bungee"
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'junit', name: 'junit', version: '4.13'
     compileOnly 'net.md-5:bungeecord-api:1.14-SNAPSHOT'
 }
 

diff --git a/core/build.gradle b/core/build.gradle
@@ -7,22 +7,22 @@ sourceCompatibility = 1.8
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'junit', name: 'junit', version: '4.13'
 
-    implementation ('com.google.code.gson:gson:2.6.2')
+    implementation ('com.google.code.gson:gson:2.8.6')
 
 //    compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.17'
-    implementation 'org.mariadb.jdbc:mariadb-java-client:2.1.2'
+    implementation 'org.mariadb.jdbc:mariadb-java-client:2.5.4'
     compile 'com.github.Fernthedev:fern-configmanager:1.1.3' // Check github releases tag for the version.
 
     // 2. Use Guava types in your public API:
-    implementation("com.google.guava:guava:28.1-jre")
+    implementation("com.google.guava:guava:28.2-jre")
 
 //    api group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.29'
 
 
 //
-    compileOnly 'org.projectlombok:lombok:1.18.8'
+    compileOnly 'org.projectlombok:lombok:1.18.12'
     annotationProcessor 'org.projectlombok:lombok:1.18.8'
 }
 

diff --git a/spigot/build.gradle b/spigot/build.gradle
@@ -24,7 +24,7 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'junit', name: 'junit', version: '4.13'
     compileOnly group: 'me.clip', name: 'placeholderapi', version: '2.9.2'
 
     compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT' // The Spigot API with no shadowing. Requires the OSS repo.

diff --git a/sponge/build.gradle b/sponge/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
 //    id 'org.jetbrains.kotlin.jvm' version '1.3.61'
-    id 'net.nemerosa.versioning'// version '2.6.1'
+    id 'net.nemerosa.versioning'// version '2.12.1'
     id 'org.spongepowered.plugin' version '0.9.0'
 }
 
@@ -13,7 +13,7 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'junit', name: 'junit', version: '4.13'
     compileOnly 'org.spongepowered:spongeapi:7.1.0'
 }
 

diff --git a/velocity/build.gradle b/velocity/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm'// version '1.3.61'
+    id 'org.jetbrains.kotlin.jvm'// version '1.3.70'
 }
 
 sourceCompatibility = 1.8
@@ -20,7 +20,7 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'junit', name: 'junit', version: '4.13'
     compileOnly 'com.velocitypowered:velocity-api:1.1.0-SNAPSHOT'
     annotationProcessor 'com.velocitypowered:velocity-api:1.1.0-SNAPSHOT'
 }