From cd5c78c41311f8095933ad9679362747dfdf36b4 Mon Sep 17 00:00:00 2001 From: Gravita Date: Sat, 20 Mar 2021 16:49:49 +0700 Subject: [PATCH] [ANY] 5.2.0 dev --- LaunchServer/build.gradle | 8 ++++---- LauncherCore/src/main/java/pro/gravit/utils/Version.java | 4 ++-- build.gradle | 3 +++ props.gradle | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index e61c4063..91e939bd 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -8,7 +8,7 @@ url "https://oss.sonatype.org/content/repositories/snapshots" } maven { - url "https://maven.geomajas.org/" + url "https://jcenter.bintray.com/" } } @@ -84,11 +84,11 @@ pack project(':LauncherAPI') bundle group: 'org.hibernate', name: 'hibernate-hikaricp', version: rootProject['verHibernate'] bundle group: 'mysql', name: 'mysql-connector-java', version: rootProject['verMySQLConn'] bundle group: 'org.postgresql', name: 'postgresql', version: rootProject['verPostgreSQLConn'] - bundle group: 'net.sf.proguard', name: 'proguard-base', version: rootProject['verProguard'] + bundle group: 'com.guardsquare', name: 'proguard-base', version: rootProject['verProguard'] testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit'] - hikari 'io.micrometer:micrometer-core:1.0.6' - hikari('com.zaxxer:HikariCP:3.4.1') { + hikari 'io.micrometer:micrometer-core:1.5.10' + hikari('com.zaxxer:HikariCP:4.0.3') { exclude group: 'javassist' exclude group: 'io.micrometer' exclude group: 'org.slf4j' diff --git a/LauncherCore/src/main/java/pro/gravit/utils/Version.java b/LauncherCore/src/main/java/pro/gravit/utils/Version.java index 0991cf21..0a8e2e27 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/Version.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/Version.java @@ -5,8 +5,8 @@ public final class Version { public static final int MAJOR = 5; - public static final int MINOR = 1; - public static final int PATCH = 11; + public static final int MINOR = 2; + public static final int PATCH = 0; public static final int BUILD = 1; public static final Version.Type RELEASE = Type.DEV; public final int major; diff --git a/build.gradle b/build.gradle index 574f9d74..8a623945 100644 --- a/build.gradle +++ b/build.gradle @@ -24,6 +24,9 @@ maven { url "https://clojars.org/repo/" } + maven { + url "https://jcenter.bintray.com/" + } } jar { diff --git a/props.gradle b/props.gradle index 2c647b25..0cf55ec8 100644 --- a/props.gradle +++ b/props.gradle @@ -12,7 +12,7 @@ verSlf4j = '1.7.30' verMySQLConn = '8.0.23' verPostgreSQLConn = '42.2.19' - verProguard = '6.2.2' + verProguard = '7.1.0-beta1' verLaunch4j = '3.14' verHibernate = '5.4.29.Final' }