diff --git a/.gitignore b/.gitignore index 51854a9d2e..28626d1e7c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ git classes/artifacts/client_jar/run.bat classes/artifacts/client_jar/client.jar *.jar +.live/ diff --git a/bootstrap.json b/live/bootstrap.json similarity index 90% rename from bootstrap.json rename to live/bootstrap.json index 2052530dbe..9045d19d54 100644 --- a/bootstrap.json +++ b/live/bootstrap.json @@ -1,5 +1,5 @@ { - "buildCommit": "2d0c2b8eb66a8088b41b29d42ec2a58ead460581", + "buildCommit": "92e2fa38572d949c7cd871dc799706487e436143", "artifacts": [ { "hash": "b12331da8683e5f107d294adeebb83ecf9124abc1db533554d2a8d3c62832d75", @@ -20,10 +20,10 @@ "size": "3168921" }, { - "hash": "4c388a85fb538bbb8cb6e0fd93e0ba0666605123d77b976764818be6f090bbe5", - "name": "client-1.5.28-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/client-1.5.28-SNAPSHOT.jar", - "size": "5871886" + "hash": "8cf9a48969c6c6808d919bd5af94e743a73ab0438db53e540eb91ece77ae9d20", + "name": "client-1.5.29-SNAPSHOT.jar", + "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/client-1.5.29-SNAPSHOT.jar", + "size": "6021185" }, { "hash": "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79", @@ -212,22 +212,22 @@ "size": "2327547" }, { - "hash": "440c629bec3905eb21dc5965fa38464f160a4cb8f87ca76806cdecc18b2c5992", - "name": "runelite-api-1.5.28-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runelite-api-1.5.28-SNAPSHOT.jar", - "size": "1019717" + "hash": "b40a6c04bb69c812985058332e80e7e1c5e25cc7e25f42da5474813a36eea138", + "name": "runelite-api-1.5.29-SNAPSHOT.jar", + "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runelite-api-1.5.29-SNAPSHOT.jar", + "size": "1027651" }, { - "hash": "45e3bcec9e7bae4ca2facd0fbee1f3da5e0700584e8419deed784a95255552c1", - "name": "runescape-api-1.5.28-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runescape-api-1.5.28-SNAPSHOT.jar", - "size": "56079" + "hash": "051f8c8fb6dfbcdf35c6b266bf4dddbfb1eca44ea3e5319b622dda57a83b0eea", + "name": "runescape-api-1.5.29-SNAPSHOT.jar", + "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runescape-api-1.5.29-SNAPSHOT.jar", + "size": "58029" }, { - "hash": "811aadce9ce35ac638712da86123d4cb99570a9550614931471295cb26f91c36", - "name": "http-api-1.5.28-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/http-api-1.5.28-SNAPSHOT.jar", - "size": "101785" + "hash": "542ef6f3b6948da98edbb631e2b07d2e61b446104c8bffabc1209930a5b22449", + "name": "http-api-1.5.29-SNAPSHOT.jar", + "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/http-api-1.5.29-SNAPSHOT.jar", + "size": "115764" }, { "hash": "f55abda036da75e1af45bd43b9dfa79b2a3d90905be9cb38687c6621597a8165", @@ -254,10 +254,10 @@ "size": "617294" }, { - "hash": "a3cab9293960d1d61968ce1591c87859ddcaa6cb2faca554cc938961c8fb3d3a", - "name": "injected-client-1.5.28-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/injected-client-1.5.28-SNAPSHOT.jar", - "size": "2193046" + "hash": "f5ef960f1f639254c164d72585c2ea0ccd7cd4e707b45a5209142479f075eede", + "name": "injected-client-1.5.29-SNAPSHOT.jar", + "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/injected-client-1.5.29-SNAPSHOT.jar", + "size": "2196522" } ], "client": { diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 50735fa911..bf9d9ef83d 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -284,6 +284,12 @@ asm-all 6.0_BETA + + org.codehaus.plexus + plexus-utils + 3.0.21 + compile + diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 862ddd2981..7acdecb815 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -83,7 +83,7 @@ import org.slf4j.LoggerFactory; @Slf4j public class RuneLite { - public static final String RUNELIT_VERSION = "2.0.1-1"; + public static final String RUNELIT_VERSION = "2.0.2"; public static final File RUNELITE_DIR = new File(System.getProperty("user.home"), ".runelite"); public static final File PROFILES_DIR = new File(RUNELITE_DIR, "profiles"); public static final File PLUGIN_DIR = new File(RUNELITE_DIR, "plugins"); diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java index b8e6d60d94..58db27b079 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java +++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java @@ -11,6 +11,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import javax.xml.bind.DatatypeConverter; import net.runelite.http.api.RuneLiteAPI; +import org.codehaus.plexus.util.FileUtils; public class Bootstrap { @@ -84,6 +85,14 @@ public class Bootstrap } + public void copyTodir(String origPath, String newPath) { + try { + FileUtils.copyFileToDirectory(new File(origPath), new File(newPath)); + } catch (IOException e) { + e.printStackTrace(); + } + } + private static String bytesToHex(byte[] hashInBytes) { @@ -300,26 +309,31 @@ public class Bootstrap artifacts[3].hash = getChecksumFile("./runelite-client/target/" + artifacts[3].name); artifacts[3].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[3].name; artifacts[3].size = Long.toString(getFileSize("./runelite-client/target/" + artifacts[3].name)); + copyTodir("./runelite-client/target/" + artifacts[3].name, "./live/"); artifacts[35] = new Artifact(); artifacts[35].name = "runelite-api-" + RuneLiteAPI.getVersion() + ".jar"; artifacts[35].hash = getChecksumFile("./runelite-api/target/" + artifacts[35].name); artifacts[35].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[35].name; artifacts[35].size = Long.toString(getFileSize("./runelite-api/target/" + artifacts[35].name)); + copyTodir("./runelite-api/target/" + artifacts[35].name, "./live/"); artifacts[36] = new Artifact(); artifacts[36].name = "runescape-api-" + RuneLiteAPI.getVersion() + ".jar"; artifacts[36].hash = getChecksumFile("./runescape-api/target/" + artifacts[36].name); artifacts[36].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[36].name; artifacts[36].size = Long.toString(getFileSize("./runescape-api/target/" + artifacts[36].name)); + copyTodir("./runescape-api/target/" + artifacts[36].name, "./live/"); artifacts[37] = new Artifact(); artifacts[37].name = "http-api-" + RuneLiteAPI.getVersion() + ".jar"; artifacts[37].hash = getChecksumFile("./http-api/target/" + artifacts[37].name); artifacts[37].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[37].name; artifacts[37].size = Long.toString(getFileSize("./http-api/target/" + artifacts[37].name)); + copyTodir("./http-api/target/" + artifacts[37].name, "./live/"); artifacts[42] = new Artifact(); artifacts[42].name = "injected-client-" + RuneLiteAPI.getVersion() + ".jar"; artifacts[42].hash = getChecksumFile("./injected-client/target/" + artifacts[42].name); artifacts[42].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[42].name; artifacts[42].size = Long.toString(getFileSize("./injected-client/target/" + artifacts[42].name)); + copyTodir("./injected-client/target/" + artifacts[42].name, "./live/"); } catch (IOException | NoSuchAlgorithmException e) { diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java index b74b0453c2..7e21bed246 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java +++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java @@ -2,6 +2,8 @@ package net.runelite.client.util.bootstrap; import com.google.gson.Gson; import com.google.gson.GsonBuilder; + +import java.io.File; import java.io.FileWriter; public class Bootstrapper @@ -10,7 +12,9 @@ public class Bootstrapper public static void main(String[] args) { Gson gson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create(); - try (FileWriter fw = new FileWriter("./bootstrap.json")) + File dir = new File("./live/"); + dir.mkdir(); + try (FileWriter fw = new FileWriter("./live/bootstrap.json")) { gson.toJson(new Bootstrap(), fw); }