diff --git a/forge-gui-desktop/src/main/java/forge/control/FControl.java b/forge-gui-desktop/src/main/java/forge/control/FControl.java index 753e6ed3544..f8653712ff4 100644 --- a/forge-gui-desktop/src/main/java/forge/control/FControl.java +++ b/forge-gui-desktop/src/main/java/forge/control/FControl.java @@ -72,7 +72,7 @@ import forge.util.TextUtil; import forge.view.FFrame; import forge.view.FView; -import static forge.localinstance.properties.ForgeConstants.DAILY_SNAPSHOT_URL; +import static forge.localinstance.properties.ForgeConstants.GITHUB_SNAPSHOT_URL; /** *

@@ -246,9 +246,9 @@ public enum FControl implements KeyEventDispatcher { //get version string try { if (isSnapshot && prefs.getPrefBoolean(FPref.CHECK_SNAPSHOT_AT_STARTUP)) { - URL url = new URL(DAILY_SNAPSHOT_URL + "version.txt"); + URL url = new URL(GITHUB_SNAPSHOT_URL + "version.txt"); snapsVersion = FileUtil.readFileToString(url); - url = new URL(DAILY_SNAPSHOT_URL + "build.txt"); + url = new URL(GITHUB_SNAPSHOT_URL + "build.txt"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); snapsTimestamp = simpleDateFormat.parse(FileUtil.readFileToString(url)); buildTimeStamp = BuildInfo.getTimestamp(); diff --git a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java index 132b62d9847..a7e3d864571 100644 --- a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java +++ b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java @@ -23,7 +23,7 @@ import forge.util.FileUtil; import static forge.localinstance.properties.ForgeConstants.ADV_TEXTURE_BG_FILE; import static forge.localinstance.properties.ForgeConstants.ASSETS_DIR; -import static forge.localinstance.properties.ForgeConstants.DAILY_SNAPSHOT_URL; +import static forge.localinstance.properties.ForgeConstants.GITHUB_SNAPSHOT_URL; import static forge.localinstance.properties.ForgeConstants.DEFAULT_SKINS_DIR; import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_ATOM; import static forge.localinstance.properties.ForgeConstants.GITHUB_FORGE_URL; @@ -51,7 +51,7 @@ public class AssetsDownloader { final String apkSize = "12MB"; final boolean isSnapshots = versionString.contains("SNAPSHOT"); - final String snapsURL = DAILY_SNAPSHOT_URL; + final String snapsURL = GITHUB_SNAPSHOT_URL; // desktop and mobile-dev share the same package final String guiChannel = GuiBase.isAndroid() ? "forge/forge-gui-android/" : "forge/forge-gui-desktop/"; final String releaseURL = RELEASE_URL + guiChannel; @@ -82,7 +82,7 @@ public class AssetsDownloader { //current release on github is tar.bz2, update this to jar installer in the future... filename = isSnapshots ? "forge-installer-" + version + ".jar" : releaseTag.replace("forge-", "forge-gui-desktop-") + ".tar.bz2"; String releaseBZ2URL = GITHUB_FORGE_URL + "releases/download/" + releaseTag + "/" + filename; - String snapsBZ2URL = DAILY_SNAPSHOT_URL + filename; + String snapsBZ2URL = GITHUB_SNAPSHOT_URL + filename; installerURL = isSnapshots ? snapsBZ2URL : releaseBZ2URL; } String snapsBuildDate = "", buildDate = ""; diff --git a/forge-gui/src/main/java/forge/download/AutoUpdater.java b/forge-gui/src/main/java/forge/download/AutoUpdater.java index 9dff1d5c6a7..d5406d15581 100644 --- a/forge-gui/src/main/java/forge/download/AutoUpdater.java +++ b/forge-gui/src/main/java/forge/download/AutoUpdater.java @@ -22,7 +22,7 @@ import java.util.concurrent.ExecutionException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static forge.localinstance.properties.ForgeConstants.DAILY_SNAPSHOT_URL; +import static forge.localinstance.properties.ForgeConstants.GITHUB_SNAPSHOT_URL; import static forge.localinstance.properties.ForgeConstants.RELEASE_URL; public class AutoUpdater { @@ -96,7 +96,7 @@ public class AutoUpdater { return false; } - versionUrlString = DAILY_SNAPSHOT_URL + "version.txt"; + versionUrlString = GITHUB_SNAPSHOT_URL + "version.txt"; } else { if (!updateChannel.equalsIgnoreCase(localizer.getMessageorUseDefault("lblRelease", "Release"))) { System.out.println("Release build versions must use release update channel to work"); @@ -128,7 +128,7 @@ public class AutoUpdater { try { retrieveVersion(); if (buildVersion.contains("SNAPSHOT")) { - URL url = new URL(DAILY_SNAPSHOT_URL + "build.txt"); + URL url = new URL(GITHUB_SNAPSHOT_URL + "build.txt"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date snapsTimestamp = simpleDateFormat.parse(FileUtil.readFileToString(url)); snapsBuildDate = snapsTimestamp.toString(); @@ -161,7 +161,7 @@ public class AutoUpdater { if (updateChannel.equalsIgnoreCase(localizer.getMessageorUseDefault("lblRelease", "Release"))) { packageUrl = RELEASE_URL + "forge/forge-gui-desktop/" + version + "/forge-gui-desktop-" + version + ".tar.bz2"; } else { - packageUrl = DAILY_SNAPSHOT_URL + "forge-installer-" + version + ".jar"; + packageUrl = GITHUB_SNAPSHOT_URL + "forge-installer-" + version + ".jar"; } } diff --git a/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java index e646a0b8816..cf42809704a 100644 --- a/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java @@ -28,7 +28,7 @@ public final class ForgeConstants { public static final String GITHUB_FORGE_URL = "https://github.com/Card-Forge/forge/"; public static final String GITHUB_RELEASES_ATOM = GITHUB_FORGE_URL + "releases.atom"; public static final String GITHUB_COMMITS_ATOM = GITHUB_FORGE_URL + "commits/master.atom"; - public static final String DAILY_SNAPSHOT_URL = "https://downloads.cardforge.org/dailysnapshots/"; + public static final String GITHUB_SNAPSHOT_URL = GITHUB_FORGE_URL + "releases/download/daily-snapshots/"; public static final String RELEASE_URL = "https://releases.cardforge.org/"; public static final String PATH_SEPARATOR = File.separator; public static final String ASSETS_DIR = GuiBase.getInterface().getAssetsDir();