From e1b6c18017793a0f5b05507f655cd05506a69656 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sun, 29 Jul 2018 19:07:48 +0800 Subject: [PATCH] Remove HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING --- HMCL/build.gradle | 3 --- HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/HMCL/build.gradle b/HMCL/build.gradle index 8e8fafb67..9cb2c579b 100644 --- a/HMCL/build.gradle +++ b/HMCL/build.gradle @@ -30,9 +30,6 @@ dependencies { task generateSources(type: Sync) { from 'src/main/java' into "$buildDir/generated-src" - filter(ReplaceTokens, tokens: [ - 'HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING': mavenVersion - ]) } compileJava.setSource "$buildDir/generated-src" diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java b/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java index c0a683140..e5f5d8973 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java @@ -17,13 +17,15 @@ */ package org.jackhuang.hmcl; +import java.util.Optional; + /** * Stores metadata about this application. */ public final class Metadata { private Metadata() {} - public static final String VERSION = System.getProperty("hmcl.version.override", "@HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING@"); + public static final String VERSION = System.getProperty("hmcl.version.override", Optional.ofNullable(Metadata.class.getPackage().getImplementationVersion()).orElse("@develop@")); public static final String NAME = "HMCL"; public static final String TITLE = NAME + " " + VERSION;