From 8fadf22fc032b1c26b4d21e7b5883b2498a9fba7 Mon Sep 17 00:00:00 2001
From: Kevin Turner <83819+keturn@users.noreply.github.com>
Date: Sat, 21 May 2022 13:41:22 -0700
Subject: [PATCH] build: make terasology-common for easy inclusion of things
 applicable to all subprojects

---
 build-logic/src/main/kotlin/facade.gradle.kts            | 3 ++-
 build-logic/src/main/kotlin/terasology-common.gradle.kts | 7 +++++++
 build-logic/src/main/kotlin/terasology-module.gradle.kts | 4 ++--
 engine-tests/build.gradle                                | 2 +-
 facades/PC/build.gradle.kts                              | 1 -
 subsystems/DiscordRPC/build.gradle.kts                   | 5 +++--
 subsystems/TypeHandlerLibrary/build.gradle.kts           | 3 ++-
 7 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 build-logic/src/main/kotlin/terasology-common.gradle.kts

diff --git a/build-logic/src/main/kotlin/facade.gradle.kts b/build-logic/src/main/kotlin/facade.gradle.kts
index 906f29e200d..3a7e5d17b45 100644
--- a/build-logic/src/main/kotlin/facade.gradle.kts
+++ b/build-logic/src/main/kotlin/facade.gradle.kts
@@ -1,4 +1,4 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 import org.terasology.gradology.JAR_COLLECTION
@@ -6,6 +6,7 @@ import org.terasology.gradology.namedAttribute
 
 plugins {
     application
+    id("terasology-common")
 }
 
 val dirNatives: String by rootProject.extra
diff --git a/build-logic/src/main/kotlin/terasology-common.gradle.kts b/build-logic/src/main/kotlin/terasology-common.gradle.kts
new file mode 100644
index 00000000000..295a77a9709
--- /dev/null
+++ b/build-logic/src/main/kotlin/terasology-common.gradle.kts
@@ -0,0 +1,7 @@
+// Copyright 2022 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+plugins {
+    id("terasology-repositories")
+    id("terasology-metrics")
+}
diff --git a/build-logic/src/main/kotlin/terasology-module.gradle.kts b/build-logic/src/main/kotlin/terasology-module.gradle.kts
index 39ff890b29d..0fe9adfa049 100644
--- a/build-logic/src/main/kotlin/terasology-module.gradle.kts
+++ b/build-logic/src/main/kotlin/terasology-module.gradle.kts
@@ -1,4 +1,4 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 // Simple build file for modules - the one under the Core module is the template, will be copied as needed to modules
@@ -11,7 +11,7 @@ plugins {
     `java-library`
     idea
     eclipse
-    id("terasology-metrics")
+    id("terasology-common")
 }
 
 val moduleMetadata = ModuleMetadataForGradle.forProject(project)
diff --git a/engine-tests/build.gradle b/engine-tests/build.gradle
index 1dc83eed609..d0205c1a3b8 100644
--- a/engine-tests/build.gradle
+++ b/engine-tests/build.gradle
@@ -6,7 +6,7 @@
 plugins {
     id "java-library"
     id "org.jetbrains.gradle.plugin.idea-ext"
-    id "terasology-metrics"
+    id "terasology-common"
 }
 
 // Grab all the common stuff like plugins to use, artifact repositories, code analysis config
diff --git a/facades/PC/build.gradle.kts b/facades/PC/build.gradle.kts
index 75bac4831c0..741fed95abd 100644
--- a/facades/PC/build.gradle.kts
+++ b/facades/PC/build.gradle.kts
@@ -15,7 +15,6 @@ import kotlin.test.fail
 plugins {
     application
     id("terasology-dist")
-    id("terasology-metrics")
     id("facade")
 }
 
diff --git a/subsystems/DiscordRPC/build.gradle.kts b/subsystems/DiscordRPC/build.gradle.kts
index df6cd5c98cc..d309e0170bf 100644
--- a/subsystems/DiscordRPC/build.gradle.kts
+++ b/subsystems/DiscordRPC/build.gradle.kts
@@ -1,9 +1,10 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 plugins {
     java
     `java-library`
+    id("terasology-common")
 }
 
 apply(from = "$rootDir/config/gradle/common.gradle")
@@ -12,4 +13,4 @@ dependencies {
     implementation(project(":engine"))
     api("com.jagrosh:DiscordIPC:0.4")
     implementation("ch.qos.logback:logback-classic:1.2.3")
-}
\ No newline at end of file
+}
diff --git a/subsystems/TypeHandlerLibrary/build.gradle.kts b/subsystems/TypeHandlerLibrary/build.gradle.kts
index 4fc9250f370..04d08725f1d 100644
--- a/subsystems/TypeHandlerLibrary/build.gradle.kts
+++ b/subsystems/TypeHandlerLibrary/build.gradle.kts
@@ -1,9 +1,10 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 plugins {
     java
     `java-library`
+    id("terasology-common")
 }
 
 apply(from = "$rootDir/config/gradle/publish.gradle")