diff --git a/build.gradle.kts b/build.gradle.kts index 7264c72..efaa274 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.gradle.java") id("org.gradle.maven-publish") - id("org.jetbrains.kotlin.jvm") version "1.5.31" apply false + id("org.jetbrains.kotlin.jvm") version "1.8.22" apply false } subprojects { @@ -45,7 +45,7 @@ publishing { artifactId = "um" groupId = "ink.ptms" version = project.version.toString() - artifact(File("plugin/build/libs/plugin-${project.version}.jar")) + artifact(File("plugin/build/libs/${rootProject.name}-${project.version}.jar")) } } } diff --git a/gradle.properties b/gradle.properties index 6e2914d..881a4cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ group=ink.ptms.um -version=1.0.0-beta-34 -taboolib_version=6.0.12-26 +version=1.0.1 +taboolib_version=6.1.0 diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 1a36be0..8732239 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -13,10 +13,7 @@ dependencies { tasks { withType { archiveClassifier.set("") - exclude("META-INF/**") - exclude("module-info.java") - exclude("plugin.yml") - relocate("ink.ptms.um.taboolib", "taboolib") + archiveBaseName.set(rootProject.name) } build { dependsOn(shadowJar) diff --git a/project/common/build.gradle.kts b/project/common/build.gradle.kts index e7fb87d..13b2fce 100644 --- a/project/common/build.gradle.kts +++ b/project/common/build.gradle.kts @@ -1,17 +1,17 @@ +import io.izzel.taboolib.gradle.BUKKIT_ALL +import io.izzel.taboolib.gradle.UNIVERSAL + val taboolib_version: String by project plugins { - id("io.izzel.taboolib") version "1.55" + id("io.izzel.taboolib") version "2.0.0" } taboolib { - install("common") - install("module-configuration") - install("platform-bukkit") - options("skip-minimize", "keep-kotlin-module", "skip-kotlin-relocate", "skip-taboolib-relocate") - classifier = null - version = taboolib_version - exclude("taboolib") + subproject = true + env { + install(UNIVERSAL, BUKKIT_ALL) + } } dependencies { diff --git a/project/implementation-v4/build.gradle.kts b/project/implementation-v4/build.gradle.kts index 6a6e697..ba26a0d 100644 --- a/project/implementation-v4/build.gradle.kts +++ b/project/implementation-v4/build.gradle.kts @@ -1,19 +1,18 @@ +import io.izzel.taboolib.gradle.BUKKIT_ALL +import io.izzel.taboolib.gradle.NMS_UTIL +import io.izzel.taboolib.gradle.UNIVERSAL + val taboolib_version: String by project plugins { - id("io.izzel.taboolib") version "1.55" + id("io.izzel.taboolib") version "2.0.0" } taboolib { - install("common") - install("module-configuration") - install("module-nms") - install("module-nms-util") - install("platform-bukkit") - options("skip-minimize", "keep-kotlin-module", "skip-kotlin-relocate", "skip-taboolib-relocate") - classifier = null - version = taboolib_version - exclude("taboolib") + subproject = true + env { + install(UNIVERSAL, BUKKIT_ALL, NMS_UTIL) + } } dependencies { diff --git a/project/implementation-v5/build.gradle.kts b/project/implementation-v5/build.gradle.kts index 22a9764..b5e02d7 100644 --- a/project/implementation-v5/build.gradle.kts +++ b/project/implementation-v5/build.gradle.kts @@ -1,18 +1,18 @@ +import io.izzel.taboolib.gradle.BUKKIT_ALL +import io.izzel.taboolib.gradle.NMS_UTIL +import io.izzel.taboolib.gradle.UNIVERSAL + val taboolib_version: String by project plugins { - id("io.izzel.taboolib") version "1.55" + id("io.izzel.taboolib") version "2.0.0" } taboolib { - install("common") - install("module-configuration") - install("module-nms-util") - install("platform-bukkit") - options("skip-minimize", "keep-kotlin-module", "skip-kotlin-relocate", "skip-taboolib-relocate") - classifier = null - version = taboolib_version - exclude("taboolib") + subproject = true + env { + install(UNIVERSAL, BUKKIT_ALL, NMS_UTIL) + } } dependencies {