Move more utils(Fix build work 3)

This commit is contained in:
MC~蛟龙 2024-07-11 21:35:43 +08:00
parent 34e52d7ece
commit 7ba3d46416
9 changed files with 4 additions and 4 deletions

View File

@ -58,8 +58,6 @@ subprojects {
// MySQL connector, shaded into the legacy jar // MySQL connector, shaded into the legacy jar
implementation("com.mysql:mysql-connector-j:8.4.0") implementation("com.mysql:mysql-connector-j:8.4.0")
implementation("org.mariadb.jdbc:mariadb-java-client:3.3.3") implementation("org.mariadb.jdbc:mariadb-java-client:3.3.3")
// Argon2 implementation
implementation("de.mkammerer:argon2-jvm-nolibs:2.11")
// TOTP client // TOTP client
implementation("com.warrenstrange:googleauth:1.5.0") implementation("com.warrenstrange:googleauth:1.5.0")
// Keep in sync with spigot 1.19 // Keep in sync with spigot 1.19
@ -134,7 +132,6 @@ subprojects {
relocate("org.picketbox", "${project.group}.libs.org.picketbox") relocate("org.picketbox", "${project.group}.libs.org.picketbox")
relocate("org.jboss.crypto", "${project.group}.libs.org.jboss.crypto") relocate("org.jboss.crypto", "${project.group}.libs.org.jboss.crypto")
relocate("org.jboss.security", "${project.group}.libs.org.jboss.security") relocate("org.jboss.security", "${project.group}.libs.org.jboss.security")
relocate("de.mkammerer", "${project.group}.libs.de.mkammerer")
relocate("com.warrenstrange", "${project.group}.libs.com.warrenstrange") relocate("com.warrenstrange", "${project.group}.libs.com.warrenstrange")
relocate("javax.inject", "${project.group}.libs.javax.inject") relocate("javax.inject", "${project.group}.libs.javax.inject")
relocate("at.favre.lib", "${project.group}.libs.at.favre.lib") relocate("at.favre.lib", "${project.group}.libs.at.favre.lib")

View File

@ -1,7 +1,6 @@
dependencies { dependencies {
compileOnly(project(":project:module-util")) compileOnly(project(":project:module-util"))
compileOnly(project(":project:module-logger")) compileOnly(project(":project:module-logger"))
compileOnly(project(":project:module-security"))
compileOnly(libs.configme) compileOnly(libs.configme)
compileOnly(libs.guava) compileOnly(libs.guava)
} }

View File

@ -1,6 +1,7 @@
dependencies { dependencies {
compileOnly(project(":project:module-util")) compileOnly(project(":project:module-util"))
compileOnly(project(":project:module-logger")) compileOnly(project(":project:module-logger"))
compileOnly(project(":project:module-common"))
compileOnly(libs.guava) compileOnly(libs.guava)
compileOnly(libs.configme) compileOnly(libs.configme)
compileOnly(libs.jalu.injector) compileOnly(libs.jalu.injector)
@ -8,9 +9,12 @@ dependencies {
implementation("de.rtner:PBKDF2:1.1.4") implementation("de.rtner:PBKDF2:1.1.4")
// BCrypt implementation // BCrypt implementation
implementation("at.favre.lib:bcrypt:0.10.2") implementation("at.favre.lib:bcrypt:0.10.2")
// Argon2 implementation
implementation("de.mkammerer:argon2-jvm-nolibs:2.11")
} }
tasks.shadowJar { tasks.shadowJar {
relocate("de.rtner", "${project.group}.libs.de.rtner") relocate("de.rtner", "${project.group}.libs.de.rtner")
relocate("at.favre.lib", "${project.group}.libs.at.favre.lib") relocate("at.favre.lib", "${project.group}.libs.at.favre.lib")
relocate("de.mkammerer", "${project.group}.libs.de.mkammerer")
} }