From 4c481499bd1d9b16bd719c2af74be77f3ddfe977 Mon Sep 17 00:00:00 2001
From: Syer10 <syer10@users.noreply.github.com>
Date: Tue, 17 Aug 2021 16:13:45 -0400
Subject: [PATCH] Migrate to a newer BuildConfig plugin, update gradle

---
 build.gradle.kts                         | 14 ++++++++------
 buildSrc/src/main/kotlin/Config.kt       |  1 +
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 02ad53df..bc71ab65 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
     kotlin("kapt") version "1.5.21"
     kotlin("plugin.serialization") version "1.5.21"
     id("org.jetbrains.compose") version "1.0.0-alpha4-build310"
-    id("de.fuerstenau.buildconfig") version "1.1.8"
+    id("com.github.gmazzo.buildconfig") version "3.0.2"
     id("org.jmailen.kotlinter") version "3.5.0"
     id("com.github.ben-manes.versions") version "0.39.0"
 }
@@ -183,15 +183,17 @@ compose.desktop {
     }
 }
 
+fun String.wrap() = """"$this""""
 buildConfig {
-    appName = project.name
-    version = project.version.toString()
+    className("BuildConfig")
+    packageName(project.group.toString())
+    useKotlinOutput { internalVisibility = true }
 
-    clsName = "BuildConfig"
-    packageName = project.group.toString()
+    buildConfigField("String", "NAME", project.name.wrap())
+    buildConfigField("String", "VERSION", project.version.toString().wrap())
 
     buildConfigField("boolean", "DEBUG", project.hasProperty("debugApp").toString())
-    buildConfigField("String", "TACHIDESK_SP_VERSION", tachideskVersion)
+    buildConfigField("String", "TACHIDESK_SP_VERSION", tachideskVersion.wrap())
     buildConfigField("int", "SERVER_CODE", serverCode.toString())
 }
 
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index d225a696..5ca49d45 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -2,6 +2,7 @@ import org.gradle.api.JavaVersion
 
 object Config {
     const val tachideskVersion = "v0.4.5"
+    // Bump this when updating the Tachidesk version or Preview commit
     const val serverCode = 1
     const val preview = true
     const val previewCommit = "8a986383fe0550d190090f14a9ac2fa0ddace448"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132..05679dc3 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-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists