Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-11-25 12:25:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename slf4j-hack module to unrelocate

Browse Source
This commit is contained in:
Vankka 2022-04-26 14:56:32 +03:00
parent 4d9f6ca198
commit 5b8a139836
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildscript/relocations.gradle
View File

@ -63,6 +63,6 @@ shadowJar {
relocate it, 'com.discordsrv.dependencies.' + it relocate it, 'com.discordsrv.dependencies.' + it
} }
// SLF4J hack // Unrelocate package, in case a platform uses something we normally relocate
relocate('com.discordsrv.x.slf4j', 'org.slf4j') relocate('com.discordsrv.unrelocate.', '')
} }

2
common/build.gradle
View File

@ -55,7 +55,7 @@ dependencies {
runtimeDownloadApi(libs.configurate.hocon) runtimeDownloadApi(libs.configurate.hocon)
// Logging // Logging
compileOnlyApi project(':common:common-slf4j-hack') compileOnlyApi project(':common:common-unrelocate')
compileOnly(libs.log4j.core) compileOnly(libs.log4j.core)
// Adventure, MCDiscordReserializer, EnhancedLegacyText // Adventure, MCDiscordReserializer, EnhancedLegacyText

4
common/src/main/java/com/discordsrv/common/logging/backend/impl/SLF4JLoggerImpl.java
View File

@ -25,9 +25,9 @@ import org.jetbrains.annotations.Nullable;
public class SLF4JLoggerImpl implements Logger { public class SLF4JLoggerImpl implements Logger {
private final com.discordsrv.x.slf4j.Logger logger; private final com.discordsrv.unrelocate.org.slf4j.Logger logger;
public SLF4JLoggerImpl(com.discordsrv.x.slf4j.Logger logger) { public SLF4JLoggerImpl(com.discordsrv.unrelocate.org.slf4j.Logger logger) {
this.logger = logger; this.logger = logger;
} }

0
common/slf4j-hack/build.gradle → common/unrelocate/build.gradle
View File

2
common/slf4j-hack/src/main/java/com/discordsrv/x/slf4j/Logger.java → common/unrelocate/src/main/java/com/discordsrv/unrelocate/org/slf4j/Logger.java
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package com.discordsrv.x.slf4j; package com.discordsrv.unrelocate.org.slf4j;
/** /**
* A fake org.slf4j.Logger that is compileOnly scoped and relocated back to the real org.slf4j package. * A fake org.slf4j.Logger that is compileOnly scoped and relocated back to the real org.slf4j package.

2
settings.gradle
View File

@ -127,7 +127,7 @@ dependencyResolutionManagement {
rootProject.name = 'DiscordSRV2' rootProject.name = 'DiscordSRV2'
[ [
'common', 'common:api', 'common:server', 'common:proxy', 'common:slf4j-hack', 'common', 'common:api', 'common:server', 'common:proxy', 'common:unrelocate',
'i18n', 'i18n',
'api', 'api',
'bukkit', 'bukkit:loader', 'bukkit', 'bukkit:loader',

2
velocity/src/main/java/com/discordsrv/velocity/DiscordSRVVelocityBootstrap.java
View File

@ -56,7 +56,7 @@ public class DiscordSRVVelocityBootstrap implements IBootstrap {
private VelocityDiscordSRV discordSRV; private VelocityDiscordSRV discordSRV;
@Inject @Inject
public DiscordSRVVelocityBootstrap(com.discordsrv.x.slf4j.Logger logger, ProxyServer proxyServer, PluginContainer pluginContainer, @DataDirectory Path dataDirectory) throws IOException { public DiscordSRVVelocityBootstrap(com.discordsrv.unrelocate.org.slf4j.Logger logger, ProxyServer proxyServer, PluginContainer pluginContainer, @DataDirectory Path dataDirectory) throws IOException {
this.logger = new SLF4JLoggerImpl(logger); this.logger = new SLF4JLoggerImpl(logger);
this.classpathAppender = new VelocityClasspathAppender(this, proxyServer); this.classpathAppender = new VelocityClasspathAppender(this, proxyServer);
this.lifecycleManager = new LifecycleManager( this.lifecycleManager = new LifecycleManager(