build: make terasology-common for easy inclusion of things applicable…

… to all subprojects
MovingBlocks · May 21, 2022 · 8fadf22 · 8fadf22
1 parent 8a322cb
commit 8fadf22
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/build-logic/src/main/kotlin/facade.gradle.kts b/build-logic/src/main/kotlin/facade.gradle.kts
@@ -1,11 +1,12 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 import org.terasology.gradology.JAR_COLLECTION
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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")
-}
+}
diff --git 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")