From 2616675918b2f735cbeb1f11af44d71e80ec4da7 Mon Sep 17 00:00:00 2001 From: Project_IO Date: Thu, 19 Sep 2024 00:58:53 +0900 Subject: [PATCH] feat: add version for terminal --- build.gradle.kts | 26 ++++++++++++++++++- .../net/projecttl/p/x32/DefaultConfig.kt | 16 ------------ src/main/kotlin/net/projecttl/p/x32/Px32.kt | 2 ++ src/main/resources/default.properties | 2 +- 4 files changed, 28 insertions(+), 18 deletions(-) delete mode 100644 src/main/kotlin/net/projecttl/p/x32/DefaultConfig.kt diff --git a/build.gradle.kts b/build.gradle.kts index 3b861ba..c8496ff 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,7 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { - id("java") kotlin("jvm") version "2.0.20" id("com.gradleup.shadow") version "8.3.0" } @@ -41,6 +43,28 @@ dependencies { } tasks { + withType { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_21) + } + } + + processResources { + filesMatching("*.properties") { + expand(project.properties) + } + } + + shadowJar { + archiveBaseName.set(project.name) + archiveClassifier.set("") + archiveVersion.set("") + + manifest { + attributes["Main-Class"] = "net.projecttl.p.x32.Px32Kt" + } + } + test { useJUnitPlatform() } diff --git a/src/main/kotlin/net/projecttl/p/x32/DefaultConfig.kt b/src/main/kotlin/net/projecttl/p/x32/DefaultConfig.kt deleted file mode 100644 index 99ec715..0000000 --- a/src/main/kotlin/net/projecttl/p/x32/DefaultConfig.kt +++ /dev/null @@ -1,16 +0,0 @@ -package net.projecttl.p.x32 - -import java.util.* -import kotlin.reflect.KProperty - -private class DefaultConfigDelegate { - private val props = Properties() - - init { - props.load(this.javaClass.getResourceAsStream("/default.properties")) - } - - operator fun getValue(thisRef: Any?, property: KProperty<*>): String { - return props.getProperty(property.name).toString() - } -} diff --git a/src/main/kotlin/net/projecttl/p/x32/Px32.kt b/src/main/kotlin/net/projecttl/p/x32/Px32.kt index 0316b9d..324f113 100644 --- a/src/main/kotlin/net/projecttl/p/x32/Px32.kt +++ b/src/main/kotlin/net/projecttl/p/x32/Px32.kt @@ -2,6 +2,7 @@ package net.projecttl.p.x32 import net.projecttl.p.x32.command.Avatar import net.projecttl.p.x32.command.Ping +import net.projecttl.p.x32.config.DefaultConfig import net.projecttl.p.x32.handler.Ready import net.projecttl.p.x32.kernel.CoreKernel import org.slf4j.Logger @@ -10,6 +11,7 @@ import org.slf4j.LoggerFactory val logger: Logger = LoggerFactory.getLogger(Px32::class.java) fun main() { + logger.info("PX32 version v${DefaultConfig.version}") val kernel = CoreKernel(System.getenv("TOKEN")) kernel.addHandler(Ready) diff --git a/src/main/resources/default.properties b/src/main/resources/default.properties index a50bf5c..defbd48 100644 --- a/src/main/resources/default.properties +++ b/src/main/resources/default.properties @@ -1 +1 @@ -version=${version} +version=${project.version}