Merge pull request #769 from electronicboy/gradle/improvements

Gradle/improvements

.gitignore

@@ -18,4 +18,8 @@ gradle-app.setting
 # Eclipse Core
 .project
 # JDT-specific (Eclipse Java Development Tools)
-.classpath
+.classpath
+
+**/.idea
+*.iml
+*.ipr

build.gradle.kts

@@ -37,6 +37,7 @@ subprojects {
         toolchain {
             languageVersion = JavaLanguageVersion.of(21)
         }
+        disableAutoTargetJvm()
     }
 
     tasks.withType<JavaCompile> {
@@ -52,4 +53,4 @@ subprojects {
         compileOnly(rootProject.libs.org.projectlombok.lombok)
         annotationProcessor(rootProject.libs.org.projectlombok.lombok)
     }
-}
+}

gradle/libs.versions.toml

@@ -41,7 +41,7 @@ org-spigotmc-spigot = { module = "org.spigotmc:spigot", version.ref = "org-spigo
 org-spigotmc-spigot-api = { module = "org.spigotmc:spigot-api", version.ref = "org-spigotmc-spigot-latest" }
 com-retro-packetevents = { module = "com.github.retrooper:packetevents-spigot", version.ref = "com-retro-packetevents-version" }
 org-projectlombok-lombok = { module = "org.projectlombok:lombok", version.ref = "lombok-version" }
-libsdisguises-minimessage = { module = "me.libraryaddict.disguises:minimessage", version = "1.0-SNAPSHOT" }
+#libsdisguises-minimessage = { module = "me.libraryaddict.disguises:minimessage", version = "1.0-SNAPSHOT" }
 junit-plugin = { module = "junit:junit", version.ref = "junit-version" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter-version" }
 mockito = { module = "org.mockito:mockito-core", version.ref = "mockito-version" }

plugin/build.gradle.kts

@@ -7,13 +7,13 @@ version = "10.0.44-SNAPSHOT"
 
 dependencies {
     compileOnly(project(":shared"))
+    compileOnly(project(":minimessage", "shadow"))
     compileOnly(libs.io.netty.netty.buffer)
     compileOnly(libs.io.netty.netty.codec)
     compileOnly(libs.commons.lang.commons.lang)
     compileOnly(libs.com.mojang.authlib.new)
     compileOnly(libs.org.spigotmc.spigot.api)
     compileOnly(libs.com.retro.packetevents)
-    compileOnly(libs.libsdisguises.minimessage)
     compileOnly(libs.io.papermc.paper.paper.api);
     compileOnly(libs.it.unimi.dsi.fastutil)
 }
@@ -43,4 +43,4 @@ publishing {
             artifactId = "LibsDisguises"
         }
     }
-}
+}

shaded/build.gradle.kts

@@ -72,7 +72,7 @@ testing {
 }
 
 dependencies {
-    shadow(libs.libsdisguises.minimessage) {
+    shadow(project(":minimessage", "shadow")) {
         exclude("*")
     }
     shadow(project(":shared")) {
@@ -96,7 +96,7 @@ dependencies {
     // Dependencies that are used to compile, and will also be provided at test runtime
     testImplementation(project(":shared"))
     testImplementation(project(":plugin"))
-    testImplementation(libs.libsdisguises.minimessage)
+    testImplementation(project(":minimessage", "shadow"))
     testImplementation(libs.mockito)
     testImplementation(libs.com.retro.packetevents)
     testImplementation(libs.net.kyori.adventure.api)
@@ -115,4 +115,4 @@ dependencies {
 java {
     sourceCompatibility = JavaVersion.VERSION_21
     targetCompatibility = JavaVersion.VERSION_21
-}
+}