From 0a4dc6961d1db232327c959df37c815b436d03e5 Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Sat, 10 Feb 2018 11:13:41 -0700 Subject: [PATCH] make development version reference GIT not SVN Signed-off-by: Jamin W. Collins --- forge-core/src/main/java/forge/util/BuildInfo.java | 6 +++--- forge-gui-desktop/src/main/java/forge/GuiDesktop.java | 2 +- forge-gui-desktop/src/test/java/forge/model/FModelTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-core/src/main/java/forge/util/BuildInfo.java b/forge-core/src/main/java/forge/util/BuildInfo.java index 1532d179bb2..391bdd2d776 100644 --- a/forge-core/src/main/java/forge/util/BuildInfo.java +++ b/forge-core/src/main/java/forge/util/BuildInfo.java @@ -30,19 +30,19 @@ public class BuildInfo { /** * Get the current version of Forge. * - * @return a String representing the version specifier, or "SVN" if unknown. + * @return a String representing the version specifier, or "GIT" if unknown. */ public static final String getVersionString() { String version = BuildInfo.class.getPackage().getImplementationVersion(); if (StringUtils.isEmpty(version)) { - return "SVN"; + return "GIT"; } return version; } public static boolean isDevelopmentVersion() { String forgeVersion = getVersionString(); - return StringUtils.containsIgnoreCase(forgeVersion, "svn") || + return StringUtils.containsIgnoreCase(forgeVersion, "git") || StringUtils.containsIgnoreCase(forgeVersion, "snapshot"); } } diff --git a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java index 3d9dad98e59..05e306e4ff9 100644 --- a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java +++ b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java @@ -59,7 +59,7 @@ public class GuiDesktop implements IGuiBase { @Override public String getAssetsDir() { - return StringUtils.containsIgnoreCase(BuildInfo.getVersionString(), "svn") ? + return StringUtils.containsIgnoreCase(BuildInfo.getVersionString(), "git") ? "../forge-gui/" : ""; } diff --git a/forge-gui-desktop/src/test/java/forge/model/FModelTest.java b/forge-gui-desktop/src/test/java/forge/model/FModelTest.java index a8bb7fcaf4a..7f11d82e16d 100644 --- a/forge-gui-desktop/src/test/java/forge/model/FModelTest.java +++ b/forge-gui-desktop/src/test/java/forge/model/FModelTest.java @@ -69,7 +69,7 @@ public class FModelTest { public final void test_getVersion() throws FileNotFoundException { final String version = BuildInfo.getVersionString(); - Assert.assertEquals(version, "SVN", "version is default"); + Assert.assertEquals(version, "GIT", "version is default"); } /**