From 291c2e692dbbea818dcfac2d4dbcecd1bc735487 Mon Sep 17 00:00:00 2001
From: Aria Moradi <aria.moradi007@gmail.com>
Date: Wed, 18 Aug 2021 04:24:58 +0430
Subject: [PATCH] clean up build.gradle files, move constants to buildSrc

---
 AndroidCompat/Config/build.gradle.kts |  4 ----
 build.gradle.kts                      |  2 --
 buildSrc/build.gradle.kts             | 11 +++++++++
 buildSrc/src/main/kotlin/Constants.kt | 33 ++++++++++++++++++++++++++
 server/build.gradle.kts               | 34 ++-------------------------
 5 files changed, 46 insertions(+), 38 deletions(-)
 create mode 100644 buildSrc/build.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/Constants.kt

diff --git a/AndroidCompat/Config/build.gradle.kts b/AndroidCompat/Config/build.gradle.kts
index de1b5858..e69de29b 100644
--- a/AndroidCompat/Config/build.gradle.kts
+++ b/AndroidCompat/Config/build.gradle.kts
@@ -1,4 +0,0 @@
-dependencies {
-    // Config API, moved to the global build.gradle
-//    implementation("com.typesafe:config:1.4.0")
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 28e03259..26649187 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,6 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    val kotlinVersion = "1.5.21"
-
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 00000000..44116137
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("net.lingala.zip4j:zip4j:2.9.0")
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt
new file mode 100644
index 00000000..c461b8ab
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Constants.kt
@@ -0,0 +1,33 @@
+import java.io.BufferedReader
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+const val kotlinVersion = "1.5.21"
+
+const val MainClass = "suwayomi.tachidesk.MainKt"
+
+// should be bumped with each stable release
+val tachideskVersion = System.getenv("ProductVersion") ?: "v0.4.5"
+
+val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r24"
+
+// counts commit count on master
+val tachideskRevision = runCatching {
+    System.getenv("ProductRevision") ?: Runtime
+        .getRuntime()
+        .exec("git rev-list HEAD --count")
+        .let { process ->
+            process.waitFor()
+            val output = process.inputStream.use {
+                it.bufferedReader().use(BufferedReader::readText)
+            }
+            process.destroy()
+            "r" + output.trim()
+        }
+}.getOrDefault("r0")
+
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index a0adf738..15bad474 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -1,8 +1,8 @@
+
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jmailen.gradle.kotlinter.tasks.FormatTask
 import org.jmailen.gradle.kotlinter.tasks.LintTask
-import java.io.BufferedReader
 import java.time.Instant
 
 plugins {
@@ -12,15 +12,6 @@ plugins {
     id("com.github.gmazzo.buildconfig") version "3.0.2"
 }
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath("net.lingala.zip4j:zip4j:2.9.0")
-    }
-}
-
 repositories {
     maven {
         url = uri("https://repo1.maven.org/maven2/")
@@ -89,11 +80,10 @@ dependencies {
 //    implementation(fileTree("lib/"))
 }
 
-val MainClass = "suwayomi.tachidesk.MainKt"
 application {
     mainClass.set(MainClass)
 
-    // for testing electron
+    // uncomment for testing electron
 //    applicationDefaultJvmArgs = listOf(
 //            "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron",
 //            "-Dsuwayomi.tachidesk.config.server.electronPath=/usr/bin/electron"
@@ -108,32 +98,12 @@ sourceSets {
     }
 }
 
-// should be bumped with each stable release
-val tachideskVersion = System.getenv("ProductVersion") ?: "v0.4.5"
-val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r24"
-
-// counts commit count on master
-val tachideskRevision = runCatching {
-    System.getenv("ProductRevision") ?: Runtime
-        .getRuntime()
-        .exec("git rev-list HEAD --count")
-        .let { process ->
-            process.waitFor()
-            val output = process.inputStream.use {
-                it.bufferedReader().use(BufferedReader::readText)
-            }
-            process.destroy()
-            "r" + output.trim()
-        }
-}.getOrDefault("r0")
-
 buildConfig {
     className("BuildConfig")
     packageName("suwayomi.tachidesk.server")
 
     useKotlinOutput()
 
-
     fun quoteWrap(obj: Any): String = """"$obj""""
 
     buildConfigField("String", "NAME", quoteWrap(rootProject.name))