From 531b8e193e2a4bf4629f7e83891b877bfcf94080 Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Sun, 30 Oct 2022 17:13:03 +0100
Subject: [PATCH] tidy up gradle plugins (mostly removing comments)

---
 .../builder-plugins/build.gradle.kts          | 20 ------------
 .../factorio-gradle/build.gradle.kts          | 32 +------------------
 .../gradle/factorio/FactorioModPlugin.kt      |  3 --
 .../settings-plugins/build.gradle.kts         |  2 ++
 modules/web-map/build.gradle.kts              |  2 --
 5 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/gradle-plugins/builder-plugins/build.gradle.kts b/gradle-plugins/builder-plugins/build.gradle.kts
index 9708397..ee54055 100644
--- a/gradle-plugins/builder-plugins/build.gradle.kts
+++ b/gradle-plugins/builder-plugins/build.gradle.kts
@@ -2,8 +2,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   id("kafkatorio.conventions.kotlin-dsl")
-//  `kotlin-dsl`
-//  kotlin("jvm") version embeddedKotlinVersion
 }
 
 dependencies {
@@ -43,21 +41,3 @@ tasks.withType<KotlinCompile>().configureEach {
     "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
   )
 }
-
-//val gradleJvmTarget = "11"
-//
-//kotlin {
-//  jvmToolchain {
-//    (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(gradleJvmTarget))
-//  }
-//}
-//
-//kotlinDslPluginOptions {
-//  jvmTarget.set(gradleJvmTarget)
-//}
-//
-//tasks.withType<KotlinCompile>().configureEach {
-//  kotlinOptions {
-//    jvmTarget = gradleJvmTarget
-//  }
-//}
diff --git a/gradle-plugins/factorio-gradle/build.gradle.kts b/gradle-plugins/factorio-gradle/build.gradle.kts
index 6b19f3b..77a630f 100644
--- a/gradle-plugins/factorio-gradle/build.gradle.kts
+++ b/gradle-plugins/factorio-gradle/build.gradle.kts
@@ -33,23 +33,6 @@ dependencies {
   implementation(libs.ktorSerialization.kotlinxJson)
 }
 
-
-//val gradleJvmTarget = 11
-//
-//kotlin {
-//  jvmToolchain(gradleJvmTarget)
-//}
-//
-//kotlinDslPluginOptions {
-//  jvmTarget.set("$gradleJvmTarget")
-//}
-//
-//tasks.withType<KotlinCompile>().configureEach {
-//  kotlinOptions {
-//    jvmTarget = "$gradleJvmTarget"
-//  }
-//}
-
 gradlePlugin {
   plugins {
     create("factorioMod") {
@@ -60,20 +43,7 @@ gradlePlugin {
   }
 }
 
-
-overrideKotlinLanguageVersion("1.7")
-
-//val gradleKotlinTarget = "1.7"
-//
-//afterEvaluate {
-//  tasks.withType<KotlinCompile>().configureEach {
-//    kotlinOptions {
-//      apiVersion = gradleKotlinTarget
-//      languageVersion = gradleKotlinTarget
-//    }
-//  }
-//}
-
+overrideKotlinLanguageVersion("1.7") // required for Kotlinx Serialization
 
 tasks.withType<KotlinCompile>().configureEach {
   kotlinOptions.freeCompilerArgs += listOf(
diff --git a/gradle-plugins/factorio-gradle/src/main/kotlin/dev/adamko/gradle/factorio/FactorioModPlugin.kt b/gradle-plugins/factorio-gradle/src/main/kotlin/dev/adamko/gradle/factorio/FactorioModPlugin.kt
index 06146b6..920a7d6 100644
--- a/gradle-plugins/factorio-gradle/src/main/kotlin/dev/adamko/gradle/factorio/FactorioModPlugin.kt
+++ b/gradle-plugins/factorio-gradle/src/main/kotlin/dev/adamko/gradle/factorio/FactorioModPlugin.kt
@@ -14,14 +14,11 @@ abstract class FactorioModPlugin @Inject constructor(
   override fun apply(target: Project) {
     target.createSettings()
 
-
     val factorioModConfiguration =
       target.configurations.register(FACTORIO_GRADLE_CONFIGURATION_NAME) {
         asConsumer()
         factorioModAttributes(objects)
       }
-
-
   }
 
   private fun Project.createSettings(): FactorioModSettings {
diff --git a/gradle-plugins/settings-plugins/build.gradle.kts b/gradle-plugins/settings-plugins/build.gradle.kts
index 10e849f..667932d 100644
--- a/gradle-plugins/settings-plugins/build.gradle.kts
+++ b/gradle-plugins/settings-plugins/build.gradle.kts
@@ -8,6 +8,8 @@ plugins {
 
 val gradleJvmTarget = "11"
 
+description = "Provide Gradle settings plugins, used to configure base Gradle behaviour"
+
 dependencies {
   // This project should only be providing simple plugins for configuring Gradle without
   // dependencies. Try to avoid setting dependencies here, else the Gradle script classpath might
diff --git a/modules/web-map/build.gradle.kts b/modules/web-map/build.gradle.kts
index 2166dcb..e8175a8 100644
--- a/modules/web-map/build.gradle.kts
+++ b/modules/web-map/build.gradle.kts
@@ -38,7 +38,6 @@ kotlin {
               "ws" to true,
             ),
           ),
-//          static = mutableListOf("$buildDir/processedResources/frontend/main")
           static = mutableListOf("$buildDir/processedResources/js/main")
         )
       }
@@ -139,7 +138,6 @@ val runWebMap by tasks.registering {
   group = rootProject.name
 
   dependsOn(tasks.withName("browserDevelopmentRun"))
-
 }