Compare commits

..

4 Commits

Author SHA1 Message Date
Auxilor
364550d228 Pain 2022-04-06 13:47:01 +01:00
Auxilor
d5e8cbaf33 Updated to 6.32.1 2022-04-06 13:35:34 +01:00
Auxilor
c4d532fda9 Removed MySQL relocation 2022-04-06 13:34:33 +01:00
Auxilor
aa097cf7e2 Fixed wrong MySQL driver class 2022-04-06 13:08:29 +01:00
3 changed files with 6 additions and 4 deletions

View File

@@ -119,6 +119,7 @@ allprojects {
exclude(group = "com.darkblade12", module = "particleeffect") exclude(group = "com.darkblade12", module = "particleeffect")
exclude(group = "com.github.cryptomorin", module = "XSeries") exclude(group = "com.github.cryptomorin", module = "XSeries")
exclude(group = "net.wesjd", module = "anvilgui") exclude(group = "net.wesjd", module = "anvilgui")
exclude(group = "org.slf4j", module = "slf4j-api")
} }
configurations.testImplementation { configurations.testImplementation {
@@ -141,10 +142,10 @@ allprojects {
relocate("org.apache.maven", "com.willfp.eco.libs.maven") relocate("org.apache.maven", "com.willfp.eco.libs.maven")
relocate("org.checkerframework", "com.willfp.eco.libs.checkerframework") relocate("org.checkerframework", "com.willfp.eco.libs.checkerframework")
relocate("org.intellij", "com.willfp.eco.libs.intellij") relocate("org.intellij", "com.willfp.eco.libs.intellij")
relocate("org.jetbrains", "com.willfp.eco.libs.jetbrains") relocate("org.jetbrains.annotations", "com.willfp.eco.libs.jetbrains.annotations")
//relocate("org.jetbrains.exposed", "com.willfp.eco.libs.exposed")
relocate("org.objenesis", "com.willfp.eco.libs.objenesis") relocate("org.objenesis", "com.willfp.eco.libs.objenesis")
relocate("org.reflections", "com.willfp.eco.libs.reflections") relocate("org.reflections", "com.willfp.eco.libs.reflections")
relocate("org.slf4j", "com.willfp.eco.libs.slf4j")
relocate("javassist", "com.willfp.eco.libs.javassist") relocate("javassist", "com.willfp.eco.libs.javassist")
relocate("javax.annotation", "com.willfp.eco.libs.annotation") relocate("javax.annotation", "com.willfp.eco.libs.annotation")
relocate("com.google.errorprone", "com.willfp.eco.libs.errorprone") relocate("com.google.errorprone", "com.willfp.eco.libs.errorprone")
@@ -152,8 +153,8 @@ allprojects {
relocate("com.google.thirdparty", "com.willfp.eco.libs.google.thirdparty") relocate("com.google.thirdparty", "com.willfp.eco.libs.google.thirdparty")
relocate("com.google.protobuf", "com.willfp.eco.libs.google.protobuf") // No I don't know either relocate("com.google.protobuf", "com.willfp.eco.libs.google.protobuf") // No I don't know either
relocate("google.protobuf", "com.willfp.eco.libs.protobuf") // Still don't know relocate("google.protobuf", "com.willfp.eco.libs.protobuf") // Still don't know
relocate("com.mysql", "com.willfp.eco.libs.mysql")
relocate("com.zaxxer.hikari", "com.willfp.eco.libs.hikari") relocate("com.zaxxer.hikari", "com.willfp.eco.libs.hikari")
//relocate("com.mysql", "com.willfp.eco.libs.mysql")
/* /*
Kotlin and caffeine are not shaded so that they can be accessed directly by eco plugins. Kotlin and caffeine are not shaded so that they can be accessed directly by eco plugins.

View File

@@ -45,6 +45,7 @@ class MySQLDataHandler(
private val serverHandler: ImplementedMySQLHandler private val serverHandler: ImplementedMySQLHandler
init { init {
val config = HikariConfig() val config = HikariConfig()
config.driverClassName = "com.mysql.cj.jdbc.Driver" config.driverClassName = "com.mysql.cj.jdbc.Driver"
config.username = plugin.configYml.getString("mysql.user") config.username = plugin.configYml.getString("mysql.user")

View File

@@ -1,3 +1,3 @@
version = 6.32.0 version = 6.32.1
plugin-name = eco plugin-name = eco
kotlin.code.style = official kotlin.code.style = official