external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-to-git' into 'master'

Browse Source 
make development version reference GIT not SVN

See merge request core-developers/forge!198
This commit is contained in:
Michael Kamensky
2018-02-10 18:53:39 +00:00
parent ce343ffcdb 0a4dc6961d
commit a1f2f8d944
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-core/src/main/java/forge/util/BuildInfo.java
View File

@@ -30,19 +30,19 @@ public class BuildInfo {
/** /**
* Get the current version of Forge. * 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() { public static final String getVersionString() {
String version = BuildInfo.class.getPackage().getImplementationVersion(); String version = BuildInfo.class.getPackage().getImplementationVersion();
if (StringUtils.isEmpty(version)) { if (StringUtils.isEmpty(version)) {
return "SVN"; return "GIT";
} }
return version; return version;
} }
public static boolean isDevelopmentVersion() { public static boolean isDevelopmentVersion() {
String forgeVersion = getVersionString(); String forgeVersion = getVersionString();
return StringUtils.containsIgnoreCase(forgeVersion, "svn") || return StringUtils.containsIgnoreCase(forgeVersion, "git") ||
StringUtils.containsIgnoreCase(forgeVersion, "snapshot"); StringUtils.containsIgnoreCase(forgeVersion, "snapshot");
} }
} }

2
forge-gui-desktop/src/main/java/forge/GuiDesktop.java
View File

@@ -59,7 +59,7 @@ public class GuiDesktop implements IGuiBase {
@Override @Override
public String getAssetsDir() { public String getAssetsDir() {
return StringUtils.containsIgnoreCase(BuildInfo.getVersionString(), "svn") ? return StringUtils.containsIgnoreCase(BuildInfo.getVersionString(), "git") ?
"../forge-gui/" : ""; "../forge-gui/" : "";
} }

2
forge-gui-desktop/src/test/java/forge/model/FModelTest.java
View File

@@ -69,7 +69,7 @@ public class FModelTest {
public final void test_getVersion() throws FileNotFoundException { public final void test_getVersion() throws FileNotFoundException {
final String version = BuildInfo.getVersionString(); final String version = BuildInfo.getVersionString();
Assert.assertEquals(version, "SVN", "version is default"); Assert.assertEquals(version, "GIT", "version is default");
} }
/** /**