update api

Author: isXander

build.gradle.kts

@@ -6,16 +6,17 @@ plugins {
 }
 
 group = "org.bundleproject"
-version = "0.2.5"
+version = "0.2.6"
 
 repositories {
     mavenCentral()
+    maven("https://jitpack.io")
 }
 
 dependencies {
-    implementation("io.ktor:ktor-client-gson:1.6.5")
-    implementation("io.ktor:ktor-client-core:1.6.5")
-    implementation("io.ktor:ktor-client-apache:1.6.5")
+    implementation("io.ktor:ktor-client-gson:1.6.6")
+    implementation("io.ktor:ktor-client-core:1.6.6")
+    implementation("io.ktor:ktor-client-apache:1.6.6")
 
     implementation(kotlin("stdlib-jdk8", "1.6.0"))
     implementation(kotlin("reflect", "1.6.0"))
@@ -25,6 +26,8 @@ dependencies {
     implementation("com.xenomachina:kotlin-argparser:2.0.7") {
         exclude(module = "kotlin-stdlib")
     }
+
+    implementation("org.bundleproject:libversion:0.0.2")
 }
 
 blossom {

src/main/kotlin/org/bundleproject/installer/Main.kt

@@ -19,6 +19,7 @@ import org.bundleproject.installer.utils.launcher.profiles.LauncherProfileTypes
 import org.bundleproject.installer.utils.launcher.profiles.LauncherProfilesJson
 import org.bundleproject.installer.utils.launcher.version.VersionJson
 import org.bundleproject.installer.utils.launcher.version.VersionLibrary
+import org.bundleproject.libversion.Version
 import java.awt.Desktop
 import java.io.File
 import java.io.InputStreamReader
@@ -34,15 +35,15 @@ import kotlin.system.exitProcess
  */
 fun main(args: Array<String>) = mainBody {
     if (vmVersion < 9) {
-        println("Bundle installer requires Java 9 or later.")
-        InstallerGui.err("Bundle installer requires Java 9 or later.")
+        println("Bundle installer requires Java 9 or later. This is due to a Ktor bug. The restriction will be lifted soon.")
+        InstallerGui.err("Bundle installer requires Java 9 or later. This is due to a Ktor bug. The restriction will be lifted soon.")
         exitProcess(-1)
     }
 
     ArgParser(args, helpFormatter = DefaultHelpFormatter()).parseInto(::InstallerParams).run {
         val update = try {
             if (!noUpdate) {
-                runBlocking { getLatestUpdate() }.takeIf { it != INSTALLER_VERSION }
+                runBlocking { Version.of(getLatestUpdate()) }.takeIf { it > INSTALLER_VERSION }
             } else null
         } catch (e: Exception) {
             e.printStackTrace()
@@ -91,7 +92,7 @@ suspend fun installOfficial(path: File, mcversion: String) {
     println("Installing using the official launcher.")
 
     val latest = try {
-        http.get<VersionResponse>("$API/$API_VERSION/bundle/version").data.launchWrapper
+        http.get<VersionResponse>("$API/$API_VERSION/bundle/version").data.let { if (PRERELEASE) it.prerelease else it.release }.launchWrapper
     } catch (e: ServerResponseException) {
         e.printStackTrace()
         InstallerGui.err("Couldn't get latest Bundle version to install: ${e.message}")
@@ -169,7 +170,7 @@ suspend fun installMultiMC(instanceFolder: File, instance: String) {
     val bundleMetaFolder = File(metaFolder, "org.bundleproject")
     bundleMetaFolder.mkdir()
 
-    val latest = http.get<VersionResponse>("$API/$API_VERSION/bundle/version").data.updater
+    val latest = http.get<VersionResponse>("$API/$API_VERSION/bundle/version").data.let { if (PRERELEASE) it.prerelease else it.release }.launchWrapper
 
     val versionFile = File(bundleMetaFolder, "$latest.json")
 

src/main/kotlin/org/bundleproject/installer/api/data/VersionData.kt

@@ -1,7 +1,9 @@
 package org.bundleproject.installer.api.data
 
+import com.google.gson.annotations.SerializedName
+
 data class VersionData(
     val installer: String,
     val updater: String,
-    val launchWrapper: String
+    @SerializedName("launchwrapper") val launchWrapper: String
 )

src/main/kotlin/org/bundleproject/installer/api/data/VersionsData.kt

@@ -0,0 +1,3 @@
+package org.bundleproject.installer.api.data
+
+data class VersionsData(val release: VersionData, val prerelease: VersionData)

src/main/kotlin/org/bundleproject/installer/api/response/VersionResponse.kt

@@ -1,5 +1,5 @@
 package org.bundleproject.installer.api.response
 
-import org.bundleproject.installer.api.data.VersionData
+import org.bundleproject.installer.api.data.VersionsData
 
-data class VersionResponse(val success: Boolean, val data: VersionData)
+data class VersionResponse(val success: Boolean, val data: VersionsData)

src/main/kotlin/org/bundleproject/installer/updater/UpdateChecker.kt

@@ -2,11 +2,13 @@ package org.bundleproject.installer.updater
 
 import io.ktor.client.request.*
 import org.bundleproject.installer.api.data.VersionData
+import org.bundleproject.installer.api.response.VersionResponse
 import org.bundleproject.installer.utils.API
 import org.bundleproject.installer.utils.API_VERSION
+import org.bundleproject.installer.utils.PRERELEASE
 import org.bundleproject.installer.utils.http
 
 suspend fun getLatestUpdate(): String =
-    http.get<VersionData>("$API/$API_VERSION/bundle/version").installer
+    http.get<VersionResponse>("$API/$API_VERSION/bundle/version").data.let { if (PRERELEASE) it.prerelease else it.release }.installer
 
 

src/main/kotlin/org/bundleproject/installer/utils/Constants.kt

@@ -1,6 +1,9 @@
 package org.bundleproject.installer.utils
 
+import org.bundleproject.libversion.Version
+
 const val API = "https://api.bundleproject.org"
 const val API_VERSION = "v1"
 
-const val INSTALLER_VERSION = "__GRADLE_VERSION__"
+val INSTALLER_VERSION = Version.of("__GRADLE_VERSION__")
+const val PRERELEASE = true