From 5af02a4b7310c06dc66b916221f3e78df6e8ee55 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sun, 27 Sep 2020 02:32:57 +0800
Subject: [PATCH] Remove gitVersion
---
buildSrc/src/main/kotlin/MiraiConsoleBuildPlugin.kt | 6 ++++--
.../net/mamoe/mirai/console/gradle/VersionConstants.kt | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/buildSrc/src/main/kotlin/MiraiConsoleBuildPlugin.kt b/buildSrc/src/main/kotlin/MiraiConsoleBuildPlugin.kt
index b8567aaec..f18ecea8a 100644
--- a/buildSrc/src/main/kotlin/MiraiConsoleBuildPlugin.kt
+++ b/buildSrc/src/main/kotlin/MiraiConsoleBuildPlugin.kt
@@ -36,8 +36,8 @@ class MiraiConsoleBuildPlugin : Plugin<Project> {
attributes(
"Manifest-Version" to "1",
"Implementation-Vendor" to "Mamoe Technologies",
- "Implementation-Title" to target.name.toString(),
- "Implementation-Version" to target.version.toString() + "+" + gitVersion
+ "Implementation-Title" to target.name,
+ "Implementation-Version" to target.version.toString() //+ "+" + gitVersion
)
}
@Suppress("UNCHECKED_CAST")
@@ -120,6 +120,7 @@ fun Project.findLatestFile(): Pair<String, File> {
} ?: error("cannot find any file to upload")*/
}
+/*
val gitVersion: String by lazy {
runCatching {
val exec = Runtime.getRuntime().exec("git rev-parse HEAD")
@@ -132,3 +133,4 @@ val gitVersion: String by lazy {
return@lazy "UNKNOWN"
}.getOrThrow()
}
+*/
\ No newline at end of file
diff --git a/tools/gradle-plugin/src/main/kotlin/net/mamoe/mirai/console/gradle/VersionConstants.kt b/tools/gradle-plugin/src/main/kotlin/net/mamoe/mirai/console/gradle/VersionConstants.kt
index 2db0c82e2..c4fc5e2bf 100644
--- a/tools/gradle-plugin/src/main/kotlin/net/mamoe/mirai/console/gradle/VersionConstants.kt
+++ b/tools/gradle-plugin/src/main/kotlin/net/mamoe/mirai/console/gradle/VersionConstants.kt
@@ -10,6 +10,6 @@
package net.mamoe.mirai.console.gradle
internal object VersionConstants {
- const val CONSOLE_VERSION = "1.0-RC-dev-28" // value is written here automatically during build
+ const val CONSOLE_VERSION = "1.0-RC-dev-29" // value is written here automatically during build
const val CORE_VERSION = "1.3.0" // value is written here automatically during build
}
\ No newline at end of file