From 439fb12480b7e223678bde9d7ce552a7e9292690 Mon Sep 17 00:00:00 2001 From: destro174 <40720638+destro174@users.noreply.github.com> Date: Wed, 23 Feb 2022 15:50:21 +0100 Subject: [PATCH] Workaround for minimessage --- .github/workflows/build.yml | 7 +------ api/build.gradle.kts | 3 ++- galaxy/build.gradle.kts | 3 ++- settings.gradle.kts | 1 - velocity/build.gradle.kts | 10 +++++----- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index daf9307..b710e65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,9 +15,4 @@ jobs: - name: Configure Git run: git config --global user.email "no-reply@github.com" && git config --global user.name "Github Actions" - name: Build - run: ./gradlew build --stacktrace - - name: Upload artifact - uses: actions/upload-artifact@v2 - with: - name: Chat.jar - path: build/libs/Chat*.jar \ No newline at end of file + run: ./gradlew build --stacktrace \ No newline at end of file diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 2c41d59..3711744 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -4,9 +4,10 @@ plugins { dependencies { compileOnly("com.alttd:Galaxy-API:1.18.1-R0.1-SNAPSHOT") - compileOnly("net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT") // Minimessage +// compileOnly("net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT") // Minimessage compileOnly("org.spongepowered:configurate-yaml:4.1.2") // Configurate compileOnly("net.luckperms:api:5.3") // Luckperms + compileOnly(files("../libs/minimessage-4.10.0-SNAPSHOT.jar")) // Workaround for minimessage } publishing { diff --git a/galaxy/build.gradle.kts b/galaxy/build.gradle.kts index 98cbe67..d32f6a7 100644 --- a/galaxy/build.gradle.kts +++ b/galaxy/build.gradle.kts @@ -6,8 +6,9 @@ plugins { dependencies { implementation(project(":api")) // API compileOnly("com.alttd:Galaxy-API:1.18.1-R0.1-SNAPSHOT") // Galaxy - compileOnly("net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT") // Minimessage +// compileOnly("net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT") // Minimessage compileOnly("com.gitlab.ruany:LiteBansAPI:0.3.5") // move to proxy + compileOnly(files("../libs/minimessage-4.10.0-SNAPSHOT.jar")) // Workaround for minimessage } tasks { diff --git a/settings.gradle.kts b/settings.gradle.kts index a18b545..74f2c26 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,6 @@ dependencyResolutionManagement { mavenLocal() mavenCentral() maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy -// maven("https://oss.sonatype.org/content/groups/public/") // Adventure // maven("https://oss.sonatype.org/content/repositories/snapshots/") // Minimessage maven("https://nexus.velocitypowered.com/repository/") // Velocity maven("https://nexus.velocitypowered.com/repository/maven-public/") // Velocity diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index ec29230..c2f61d8 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -7,14 +7,14 @@ dependencies { implementation(project(":api")) // API compileOnly("com.velocitypowered:velocity-api:3.0.1") // Velocity annotationProcessor("com.velocitypowered:velocity-api:3.0.1") -// compileOnly("com.velocitypowered:velocity-brigadier:1.0.0-SNAPSHOT") implementation("mysql:mysql-connector-java:8.0.27") // mysql implementation("org.spongepowered", "configurate-yaml", "4.1.2") compileOnly("com.alttd.proxydiscordlink:ProxyDiscordLink:1.0.0-BETA-SNAPSHOT") - implementation("net.kyori", "adventure-text-minimessage", "4.10.0-SNAPSHOT") { - exclude("net.kyori") - exclude("net.kyori.examination") - } +// implementation("net.kyori", "adventure-text-minimessage", "4.10.0-SNAPSHOT") { +// exclude("net.kyori") +// exclude("net.kyori.examination") +// } + implementation(files("../libs/minimessage-4.10.0-SNAPSHOT.jar")) // Workaround for minimessage compileOnly("com.gitlab.ruany:LiteBansAPI:0.3.5") }