Paper and java 17 make everything happier
This commit is contained in:
parent
6c07268446
commit
498547a3fa
@ -18,7 +18,6 @@ tasks.withType<JavaCompile> {
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
// PaperMC
|
||||
maven("https://repo.papermc.io/repository/maven-public/")
|
||||
maven("https://repo.opencollab.dev/main/")
|
||||
maven("https://repo.opencollab.dev/maven-snapshots/")
|
||||
@ -56,11 +55,7 @@ dependencies {
|
||||
// Libby
|
||||
implementation(libs.libby.bukkit)
|
||||
// Database Connection Pool
|
||||
implementation(libs.hikaricp) {
|
||||
exclude("org.slf4j", "slf4j-api")
|
||||
}
|
||||
// HikariCP Logger
|
||||
implementation(libs.slf4j.simple) // We can't update to 2.x as long as we use HikariCP for java 8
|
||||
implementation(libs.hikaricp)
|
||||
// PBKDF2 implementation
|
||||
implementation(libs.pbkdf2)
|
||||
// MySQL connector, shaded into the legacy jar
|
||||
@ -70,40 +65,36 @@ dependencies {
|
||||
implementation(libs.argon2.jvm.nolibs)
|
||||
// TOTP client
|
||||
implementation(libs.googleauth)
|
||||
// Keep in sync with spigot 1.19
|
||||
implementation(libs.guava) {
|
||||
exclude("org.checkerframework", "checker-qual")
|
||||
}
|
||||
// ConfigMe
|
||||
implementation(libs.configme) {
|
||||
exclude("org.yaml", "snakeyaml")
|
||||
}
|
||||
// bStats metrics
|
||||
implementation("org.bstats:bstats-bukkit:3.0.2")
|
||||
implementation(libs.bstats)
|
||||
// ProtocolLib
|
||||
compileOnly("net.dmulloy2:ProtocolLib:5.4.0")
|
||||
compileOnly(libs.protocollib)
|
||||
// LuckPerms plugin
|
||||
compileOnly("net.luckperms:api:5.4")
|
||||
compileOnly(libs.luckperms)
|
||||
// PermissionsEx plugin
|
||||
compileOnly("ru.tehkode:PermissionsEx:1.23.5-SNAPSHOT")
|
||||
compileOnly(libs.pex)
|
||||
// zPermissions plugin
|
||||
compileOnly("org.tyrannyofheaven.bukkit:zPermissions:1.4.3-SNAPSHOT") {
|
||||
compileOnly(libs.zpermissions) {
|
||||
exclude("org.avaje", "ebean")
|
||||
}
|
||||
// Vault, https://dev.bukkit.org/bukkit-plugins/vault/
|
||||
compileOnly("net.milkbowl.vault:VaultAPI:1.7")
|
||||
// Multi World plugin, https://www.spigotmc.org/resources/multiverse-core.390/
|
||||
compileOnly("com.onarandombox.multiversecore:multiverse-core:4.3.14")
|
||||
// Vault
|
||||
compileOnly(libs.vault)
|
||||
// Multi World plugin
|
||||
compileOnly(libs.multiverse)
|
||||
// EssentialsX plugin
|
||||
compileOnly("net.essentialsx:EssentialsX:2.20.1") {
|
||||
compileOnly(libs.essentialsx) {
|
||||
exclude("io.papermc", "paperlib")
|
||||
}
|
||||
// BCrypt implementation
|
||||
implementation(libs.bcrypt)
|
||||
// PlaceholderAPI
|
||||
compileOnly("me.clip:placeholderapi:2.11.6")
|
||||
// XAuth, another authentication plugin, required by the database converter
|
||||
compileOnly("de.luricos.bukkit:xAuth:2.6.1-SNAPSHOT")
|
||||
compileOnly(libs.placeholderapi)
|
||||
// XAuth plugin
|
||||
compileOnly(libs.xauth)
|
||||
implementation(libs.datasourcecolumns)
|
||||
implementation(libs.postgresql) {
|
||||
exclude("org.checkerframework", "checker-qual")
|
||||
@ -169,9 +160,6 @@ tasks {
|
||||
relocate("io.netty", "fr.xephi.authme.libs.io.netty")
|
||||
relocate("org.apache.commons.validator", "fr.xephi.authme.libs.org.apache.commons.validator")
|
||||
relocate("com.alessiodp.libby", "fr.xephi.authme.libs.com.alessiodp.libby")
|
||||
relocate("net.kyori.adventure", "fr.xephi.authme.libs.net.kyori.adventure")
|
||||
relocate("net.kyori.examination", "fr.xephi.authme.libs.net.kyori.examination")
|
||||
relocate("net.kyori.option", "fr.xephi.authme.libs.net.kyori.option")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -8,15 +8,12 @@ javatar = "2.5"
|
||||
commons-email = "1.6-SNAPSHOT"
|
||||
log4j-core = "2.20.0"
|
||||
libby-bukkit = "2.0.0-SNAPSHOT"
|
||||
hikaricp = "4.0.3"
|
||||
slf4j-simple = "1.7.36"
|
||||
hikaricp = "7.0.2"
|
||||
pbkdf2 = "1.1.4"
|
||||
mysql-connector-j = "9.1.0"
|
||||
mariadb-java-client = "3.5.1"
|
||||
argon2-jvm-nolibs = "2.11"
|
||||
googleauth = "1.5.0"
|
||||
guava = "33.2.1-jre"
|
||||
gson = "2.10.1"
|
||||
configme = "1.3.1"
|
||||
bcrypt = "0.10.2"
|
||||
datasourcecolumns = "0.1.1-SNAPSHOT"
|
||||
@ -25,6 +22,16 @@ checker-qual = "3.48.0"
|
||||
universalscheduler = "0.1.6"
|
||||
sqlite-jdbc = "3.47.1.0"
|
||||
h2 = "2.2.224"
|
||||
bstats = "3.0.2"
|
||||
protocollib = "5.4.0"
|
||||
luckperms = "5.4"
|
||||
pex = "1.23.5-SNAPSHOT"
|
||||
zpermissions = "1.4.3-SNAPSHOT"
|
||||
vault = "1.7"
|
||||
multiverse = "4.3.14"
|
||||
essentialsx = "2.20.1"
|
||||
placeholderapi = "2.11.6"
|
||||
xauth = "2.6.1-SNAPSHOT"
|
||||
|
||||
[libraries]
|
||||
paper-api = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper-api" }
|
||||
@ -37,14 +44,11 @@ commons-email = { group = "org.apache.commons", name = "commons-email", version.
|
||||
log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j-core" }
|
||||
libby-bukkit = { group = "com.alessiodp.libby", name = "libby-bukkit", version.ref = "libby-bukkit" }
|
||||
hikaricp = { group = "com.zaxxer", name = "HikariCP", version.ref = "hikaricp" }
|
||||
slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j-simple" }
|
||||
pbkdf2 = { group = "de.rtner", name = "PBKDF2", version.ref = "pbkdf2" }
|
||||
mysql-connector-j = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql-connector-j" }
|
||||
mariadb-java-client = { group = "org.mariadb.jdbc", name = "mariadb-java-client", version.ref = "mariadb-java-client" }
|
||||
argon2-jvm-nolibs = { group = "de.mkammerer", name = "argon2-jvm-nolibs", version.ref = "argon2-jvm-nolibs" }
|
||||
googleauth = { group = "com.warrenstrange", name = "googleauth", version.ref = "googleauth" }
|
||||
guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
|
||||
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
|
||||
configme = { group = "ch.jalu", name = "configme", version.ref = "configme" }
|
||||
bcrypt = { group = "at.favre.lib", name = "bcrypt", version.ref = "bcrypt" }
|
||||
datasourcecolumns = { group = "ch.jalu", name = "datasourcecolumns", version.ref = "datasourcecolumns" }
|
||||
@ -53,3 +57,13 @@ checker-qual = { group = "org.checkerframework", name = "checker-qual", version.
|
||||
universalscheduler = { group = "com.github.Anon8281", name = "UniversalScheduler", version.ref = "universalscheduler" }
|
||||
sqlite-jdbc = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite-jdbc" }
|
||||
h2 = { group = "com.h2database", name = "h2", version.ref = "h2" }
|
||||
bstats = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
|
||||
protocollib = { group = "net.dmulloy2", name = "ProtocolLib", version.ref = "protocollib" }
|
||||
luckperms = { group = "net.luckperms", name = "api", version.ref = "luckperms" }
|
||||
pex = { group = "ru.tehkode", name = "PermissionsEx", version.ref = "pex" }
|
||||
zpermissions = { group = "org.tyrannyofheaven.bukkit", name = "zPermissions", version.ref = "zpermissions" }
|
||||
vault = { group = "net.milkbowl.vault", name = "VaultAPI", version.ref = "vault" }
|
||||
multiverse = { group = "com.onarandombox.multiversecore", name = "multiverse-core", version.ref = "multiverse" }
|
||||
essentialsx = { group = "net.essentialsx", name = "EssentialsX", version.ref = "essentialsx" }
|
||||
placeholderapi = { group = "me.clip", name = "placeholderapi", version.ref = "placeholderapi" }
|
||||
xauth = { group = "de.luricos.bukkit", name = "xAuth", version.ref = "xauth" }
|
||||
Loading…
x
Reference in New Issue
Block a user