From a7b85f98c361d11280e2704a6d1a76997fa8acef Mon Sep 17 00:00:00 2001 From: Him188 Date: Wed, 2 Sep 2020 08:24:17 +0800 Subject: [PATCH] Update versions --- backend/mirai-console/build.gradle.kts | 14 ++++++++------ .../console/internal/MiraiConsoleBuildConstants.kt | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/backend/mirai-console/build.gradle.kts b/backend/mirai-console/build.gradle.kts index 15a3549d4..e6401e5bd 100644 --- a/backend/mirai-console/build.gradle.kts +++ b/backend/mirai-console/build.gradle.kts @@ -122,13 +122,15 @@ tasks { file.writeText( file.readText() .replace( - """val buildDate: Instant = Instant.ofEpochSecond(0)""", - """val buildDate: Instant = Instant.ofEpochSecond(${Instant.now().getEpochSecond()})""" - ) + Regex("""val buildDate: Instant = Instant.ofEpochSecond\(.*\)""") + ) { + """val buildDate: Instant = Instant.ofEpochSecond(${ + Instant.now().getEpochSecond() + })""" + } .replace( - """val version: Semver = Semver("0", Semver.SemverType.LOOSE)""", - """val version: Semver = Semver("${project.version}", Semver.SemverType.LOOSE)""" - ) + Regex("""val version: Semver = Semver\(".*", Semver.SemverType.LOOSE\)""") + ) { """val version: Semver = Semver("${project.version}", Semver.SemverType.LOOSE)""" } ) } } diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/MiraiConsoleBuildConstants.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/MiraiConsoleBuildConstants.kt index b1a779868..462efe49a 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/MiraiConsoleBuildConstants.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/MiraiConsoleBuildConstants.kt @@ -14,8 +14,8 @@ import java.time.Instant internal object MiraiConsoleBuildConstants { // auto-filled on build (task :mirai-console:fillBuildConstants) @JvmStatic - val buildDate: Instant = Instant.ofEpochSecond(1598539421) + val buildDate: Instant = Instant.ofEpochSecond(1599005996) @JvmStatic - val version: Semver = Semver("1.0-M3-1", Semver.SemverType.LOOSE) + val version: Semver = Semver("1.0-M4-dev-3", Semver.SemverType.LOOSE) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1ee034fe0..7743a94c2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Wed Mar 04 22:27:09 CST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists