From 584acdb8c382e63ed2eb8faab953ed5b52dd5fdb Mon Sep 17 00:00:00 2001 From: Gravita <12893402+gravit0@users.noreply.github.com> Date: Fri, 5 Jul 2024 14:15:22 +0700 Subject: [PATCH] [ANY] Update dependencies --- LaunchServer/build.gradle | 10 ++-------- .../manangers/LaunchServerGsonManager.java | 4 ---- LauncherCore/build.gradle | 1 - props.gradle | 6 ++---- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index fbf36cdc..bfed90ec 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -71,7 +71,6 @@ dependencies { pack project(':LauncherAPI') bundle group: 'me.tongfei', name: 'progressbar', version: '0.10.1' - bundle group: 'com.github.Marcono1234', name: 'gson-record-type-adapter-factory', version: 'v0.3.0' bundle group: 'org.fusesource.jansi', name: 'jansi', version: rootProject['verJansi'] bundle group: 'org.jline', name: 'jline', version: rootProject['verJline'] bundle group: 'org.jline', name: 'jline-reader', version: rootProject['verJline'] @@ -96,17 +95,12 @@ pack project(':LauncherAPI') annotationProcessor(group: 'org.apache.logging.log4j', name: 'log4j-core', version: rootProject['verLog4j']) testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit'] - hikari 'io.micrometer:micrometer-core:1.8.4' - hikari('com.zaxxer:HikariCP:5.0.1') { + hikari 'io.micrometer:micrometer-core:1.13.1' + hikari('com.zaxxer:HikariCP:5.1.0') { exclude group: 'javassist' exclude group: 'io.micrometer' exclude group: 'org.slf4j' } - - compileOnlyA group: 'com.google.guava', name: 'guava', version: rootProject['verGuavaC'] - // Do not update (laggy deps). - compileOnlyA 'log4j:log4j:1.2.17' - compileOnlyA 'org.apache.logging.log4j:log4j-core:2.14.1' } tasks.register('hikari', Copy) { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java index 07deb093..7f26c486 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java @@ -1,7 +1,6 @@ package pro.gravit.launchserver.manangers; import com.google.gson.GsonBuilder; -import marcono1234.gson.recordadapter.RecordTypeAdapterFactory; import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent; import pro.gravit.launcher.core.managers.GsonManager; import pro.gravit.launcher.base.modules.events.PreGsonPhase; @@ -34,9 +33,6 @@ public LaunchServerGsonManager(LaunchServerModulesManager modulesManager) { @Override public void registerAdapters(GsonBuilder builder) { super.registerAdapters(builder); - builder.registerTypeAdapterFactory(RecordTypeAdapterFactory.builder() - .allowMissingComponentValues() - .create()); builder.registerTypeAdapter(ClientProfile.Version.class, new ClientProfile.Version.GsonSerializer()); builder.registerTypeAdapter(TextureProvider.class, new UniversalJsonAdapter<>(TextureProvider.providers)); builder.registerTypeAdapter(AuthCoreProvider.class, new UniversalJsonAdapter<>(AuthCoreProvider.providers)); diff --git a/LauncherCore/build.gradle b/LauncherCore/build.gradle index efd55c0a..068bbf70 100644 --- a/LauncherCore/build.gradle +++ b/LauncherCore/build.gradle @@ -6,7 +6,6 @@ compileOnly group: 'org.jline', name: 'jline', version: rootProject['verJline'] compileOnly group: 'org.jline', name: 'jline-reader', version: rootProject['verJline'] compileOnly group: 'org.jline', name: 'jline-terminal', version: rootProject['verJline'] - compileOnly group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: rootProject['verBcprov'] compileOnly group: 'org.slf4j', name: 'slf4j-api', version: rootProject['verSlf4j'] api group: 'com.google.code.gson', name: 'gson', version: rootProject['verGson'] testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit'] diff --git a/props.gradle b/props.gradle index 8b85574d..af811c06 100644 --- a/props.gradle +++ b/props.gradle @@ -1,18 +1,16 @@ project.ext { verAsm = '9.7' - verNetty = '4.1.110.Final' + verNetty = '4.1.111.Final' verOshiCore = '6.6.1' verJunit = '5.10.2' - verGuavaC = '30.1.1-jre' verJansi = '2.4.1' verJline = '3.26.1' verJwt = '0.12.5' - verBcprov = '1.70' verGson = '2.11.0' verBcpkix = '1.78.1' verSlf4j = '2.0.13' verLog4j = '2.23.1' - verMySQLConn = '8.4.0' + verMySQLConn = '9.0.0' verMariaDBConn = '3.4.0' verPostgreSQLConn = '42.7.3' verH2Conn = '2.2.224'