diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3c4101c3..af7be50b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index b5aaf467..a21effd6 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -134,23 +134,21 @@ buildConfig {
     useKotlinOutput()
 
 
-    fun str(obj: Any): String {
-        return "\"${obj}\""
-    }
+    fun quoteWrap(obj: Any): String = """"$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("String", "NAME", quoteWrap(rootProject.name))
+    buildConfigField("String", "VERSION", quoteWrap(tachideskVersion))
+    buildConfigField("String", "REVISION", quoteWrap(tachideskRevision))
+    buildConfigField("String", "BUILD_TYPE", quoteWrap(if (System.getenv("ProductBuildType") == "Stable") "Stable" else "Preview"))
     buildConfigField("long", "BUILD_TIME", Instant.now().epochSecond.toString())
 
 
-    buildConfigField("String", "WEBUI_REPO", str("https://github.com/Suwayomi/Tachidesk-WebUI-preview"))
-    buildConfigField("String", "WEBUI_TAG", str(webUIRevisionTag))
+    buildConfigField("String", "WEBUI_REPO", quoteWrap("https://github.com/Suwayomi/Tachidesk-WebUI-preview"))
+    buildConfigField("String", "WEBUI_TAG", quoteWrap(webUIRevisionTag))
 
 
-    buildConfigField("String", "GITHUB", str("https://github.com/Suwayomi/Tachidesk"))
-    buildConfigField("String", "DISCORD", str("https://discord.gg/DDZdqZWaHA"))
+    buildConfigField("String", "GITHUB", quoteWrap("https://github.com/Suwayomi/Tachidesk"))
+    buildConfigField("String", "DISCORD", quoteWrap("https://discord.gg/DDZdqZWaHA"))
 }
 
 tasks {