From fcdda6406eca2c4014276c62ee2de9871003fd8f Mon Sep 17 00:00:00 2001
From: Aria Moradi <aria.moradi007@gmail.com>
Date: Tue, 17 Aug 2021 23:52:21 +0430
Subject: [PATCH] update dependencies

---
 build.gradle.kts        | 11 +++++++----
 server/build.gradle.kts | 28 +++++++++++++++++-----------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9697908b..28e03259 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,10 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.4.32"
-    kotlin("plugin.serialization") version "1.4.32" apply false
+    val kotlinVersion = "1.5.21"
+
+    kotlin("jvm") version kotlinVersion
+    kotlin("plugin.serialization") version kotlinVersion
 }
 
 allprojects {
@@ -46,12 +48,12 @@ configure(projects) {
         testImplementation(kotlin("test-junit5"))
 
         // coroutines
-        val coroutinesVersion = "1.4.3"
+        val coroutinesVersion = "1.5.0"
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutinesVersion")
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
 
-        val kotlinSerializationVersion = "1.1.0"
+        val kotlinSerializationVersion = "1.2.1"
         implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion")
         implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion")
 
@@ -80,6 +82,7 @@ configure(projects) {
         implementation("net.harawata:appdirs:1.2.1")
 
         // dex2jar: https://github.com/DexPatcher/dex2jar/releases/tag/v2.1-20190905-lanchon
+        // note: watch https://github.com/ThexXTURBOXx/dex2jar for future development
         implementation("com.github.DexPatcher.dex2jar:dex-tools:v2.1-20190905-lanchon")
 
         // APK parser
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index 764f80f6..b5aaf467 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     application
     id("com.github.johnrengelman.shadow") version "7.0.0"
     id("org.jmailen.kotlinter") version "3.4.3"
-    id("de.fuerstenau.buildconfig") version "1.1.8"
+    id("com.github.gmazzo.buildconfig") version "3.0.2"
 }
 
 buildscript {
@@ -128,23 +128,29 @@ val tachideskRevision = runCatching {
 }.getOrDefault("r0")
 
 buildConfig {
-    clsName = "BuildConfig"
-    packageName = "suwayomi.tachidesk.server"
+    className("BuildConfig")
+    packageName("suwayomi.tachidesk.server")
+
+    useKotlinOutput()
 
 
-    buildConfigField("String", "NAME", rootProject.name)
-    buildConfigField("String", "VERSION", tachideskVersion)
-    buildConfigField("String", "REVISION", tachideskRevision)
-    buildConfigField("String", "BUILD_TYPE", if (System.getenv("ProductBuildType") == "Stable") "Stable" else "Preview")
+    fun str(obj: Any): String {
+        return "\"${obj}\""
+    }
+
+    buildConfigField("String", "NAME", str(rootProject.name))
+    buildConfigField("String", "VERSION", str(tachideskVersion))
+    buildConfigField("String", "REVISION", str(tachideskRevision))
+    buildConfigField("String", "BUILD_TYPE", str(if (System.getenv("ProductBuildType") == "Stable") "Stable" else "Preview"))
     buildConfigField("long", "BUILD_TIME", Instant.now().epochSecond.toString())
 
 
-    buildConfigField("String", "WEBUI_REPO", "https://github.com/Suwayomi/Tachidesk-WebUI-preview")
-    buildConfigField("String", "WEBUI_TAG", webUIRevisionTag)
+    buildConfigField("String", "WEBUI_REPO", str("https://github.com/Suwayomi/Tachidesk-WebUI-preview"))
+    buildConfigField("String", "WEBUI_TAG", str(webUIRevisionTag))
 
 
-    buildConfigField("String", "GITHUB", "https://github.com/Suwayomi/Tachidesk")
-    buildConfigField("String", "DISCORD", "https://discord.gg/DDZdqZWaHA")
+    buildConfigField("String", "GITHUB", str("https://github.com/Suwayomi/Tachidesk"))
+    buildConfigField("String", "DISCORD", str("https://discord.gg/DDZdqZWaHA"))
 }
 
 tasks {