From 80281986676faf9ef47c25f98b801046bedb465f Mon Sep 17 00:00:00 2001
From: Syer10 <syer10@users.noreply.github.com>
Date: Sun, 30 Jan 2022 21:03:53 -0500
Subject: [PATCH] Cleanup build files

---
 build.gradle.kts         | 21 ++++++++++++++++++++-
 desktop/build.gradle.kts | 39 ---------------------------------------
 2 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 28b0b978..91ce20d0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -39,6 +39,12 @@ allprojects {
     }
 }
 
+tasks.withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask> {
+    rejectVersionIf {
+        isNonStable(candidate.version) && !isNonStable(currentVersion)
+    }
+}
+
 subprojects {
     tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
         kotlinOptions {
@@ -116,4 +122,17 @@ subprojects {
             }
         }
     }
-}
\ No newline at end of file
+
+    plugins.withType<JacocoPlugin> {
+        configure<JacocoPluginExtension> {
+            toolVersion = "0.8.7"
+        }
+    }
+}
+
+fun isNonStable(version: String): Boolean {
+    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.contains(it, true) }
+    val regex = "^[0-9,.v-]+(-r)?$".toRegex()
+    val isStable = stableKeyword || regex.matches(version)
+    return isStable.not()
+}
diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
index 67ccc5c0..5296e48e 100644
--- a/desktop/build.gradle.kts
+++ b/desktop/build.gradle.kts
@@ -6,8 +6,6 @@ import org.jetbrains.compose.compose
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import proguard.gradle.ProGuardTask
-import java.nio.file.Files
-import kotlin.streams.asSequence
 
 plugins {
     kotlin("jvm")
@@ -102,15 +100,6 @@ tasks {
             jvmTarget = Config.desktopJvmTarget.toString()
             freeCompilerArgs = listOf(
                 "-Xopt-in=kotlin.RequiresOptIn",
-                "-Xopt-in=kotlin.time.ExperimentalTime",
-                "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                "-Xopt-in=androidx.compose.foundation.ExperimentalFoundationApi",
-                "-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi",
-                "-Xopt-in=com.russhwolf.settings.ExperimentalSettingsApi",
-                "-Xopt-in=com.russhwolf.settings.ExperimentalSettingsImplementation",
-                "-Xopt-in=com.google.accompanist.pager.ExperimentalPagerApi",
-                "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi",
-                "-Xopt-in=androidx.compose.material.ExperimentalMaterialApi",
                 "-Xopt-in=androidx.compose.ui.ExperimentalComposeUiApi"
             )
         }
@@ -125,26 +114,6 @@ tasks {
 
     registerTachideskTasks(project)
 
-    task("generateResourceConstants") {
-        val buildResources = buildConfig.forClass("${project.group}.build", "BuildResources")
-
-        doFirst {
-            val langs = listOf("en") + Files.list(rootDir.toPath().resolve("i18n/src/commonMain/resources/MR/values")).asSequence()
-                .map { it.fileName.toString().replace("-r", "-") }
-                .filter { it != "base" }
-                .toList()
-            buildResources.buildConfigField("ca.gosyer.i18n.StringList", "LANGUAGES", langs.joinToString(prefix = "listOf(", postfix = ")") { it.wrap() })
-        }
-
-        generateBuildConfig {
-            dependsOn(this@task)
-        }
-    }
-    withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask> {
-        rejectVersionIf {
-            isNonStable(candidate.version) && !isNonStable(currentVersion)
-        }
-    }
     register<ProGuardTask>("optimizeUberJar") {
         group = "compose desktop"
         val packageUberJarForCurrentOS = getByName("packageUberJarForCurrentOS")
@@ -172,14 +141,6 @@ kotlin {
     }
 }
 
-fun isNonStable(version: String): Boolean {
-    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.contains(it, true) }
-    val regex = "^[0-9,.v-]+(-r)?$".toRegex()
-    val isStable = stableKeyword || regex.matches(version)
-    return isStable.not()
-}
-
-
 compose.desktop {
     application {
         mainClass = "ca.gosyer.MainKt"