Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2025-02-06 00:01:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove some workarounds for dependencydownload + exclude some mcauth transitives

Browse Source
This commit is contained in:
Vankka 2022-05-11 19:26:02 +03:00
parent 02f46d2182
commit 964db4bb20
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildscript/relocations.gradle
View File

@ -35,7 +35,6 @@ shadowJar {
'me.minecraftauth.lib', 'me.minecraftauth.lib',
'com.github.kevinsawicki.http', 'com.github.kevinsawicki.http',
'org.json.simple', 'org.json.simple',
'org.hamcrest',
'alexh', 'alexh',
// Adventure (API isn't relocated always) // Adventure (API isn't relocated always)

9
common/build.gradle
View File

@ -13,8 +13,6 @@ task generateResourceForHikari(type: GenerateDependencyDownloadResourceTask) {
var conf = configurations.hikari var conf = configurations.hikari
configuration = conf configuration = conf
file = 'dependencies/' + conf.name + '.txt' file = 'dependencies/' + conf.name + '.txt'
relocate 'com.zaxxer.hikari', 'com.discordsrv.dependencies.com.zaxxer.hikari'
relocate 'org.slf4j', 'com.discordsrv.dependencies.org.slf4j'
} }
task generateResourceForH2Driver(type: GenerateDependencyDownloadResourceTask) { task generateResourceForH2Driver(type: GenerateDependencyDownloadResourceTask) {
var conf = configurations.h2Driver var conf = configurations.h2Driver
@ -73,12 +71,15 @@ dependencies {
runtimeDownloadApi(libs.enhancedlegacytext) runtimeDownloadApi(libs.enhancedlegacytext)
// Database // Database
hikari(libs.hikaricp) { exclude group: 'org.slf4j' } hikari(libs.hikaricp)
h2Driver(libs.h2) h2Driver(libs.h2)
mysqlDriver(libs.mysql) mysqlDriver(libs.mysql)
// MinecraftAuthentication library // MinecraftAuthentication library
mcAuthLib(libs.minecraftauth.lib) mcAuthLib(libs.minecraftauth.lib) {
exclude group: 'junit', module: 'junit'
exclude group: 'org.jetbrains', module: 'annotations'
}
// Brigadier // Brigadier
compileOnlyApi(libs.brigadier) compileOnlyApi(libs.brigadier)