Merge branch 'develop' into kotlin

soloturn · soloturn · commit 9751a8e6a068 · 2024-11-10T12:26:56.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,10 @@
+# gestalt specific files to be excluded
+/gestalt-di/test-modules/
+# used to test if a module.jar is loaded correctly, so part of repo
+# despite it is recreated.
+/gestalt-es-perf/test-modules/moduleF.jar
+/gestalt-module/test-modules/*
+
 # Ignore general
 /.*
 !.gitignore
@@ -12,7 +19,6 @@
 #*.jar
 *.war
 *.ear
-/gestalt-module/test-modules/*
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
@@ -45,4 +51,3 @@ Icon
 ehthumbs.db
 Thumbs.db
 
-gestalt-di/test-modules/
diff --git a/gestalt-asset-core/build.gradle b/gestalt-asset-core/build.gradle
@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-apply from: "$rootDir/gradle/common.gradle"
+apply(from: "$rootDir/gradle/common.gradle.kts")
 
 // Primary dependencies definition
 dependencies {
diff --git a/gestalt-di/build.gradle b/gestalt-di/build.gradle
@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-apply from: "$rootDir/gradle/common.gradle"
+apply(from: "$rootDir/gradle/common.gradle.kts")
 
 task gatherJarModules(dependsOn: [':testpack:moduleA:jar', ':testpack:moduleB:jar', ':testpack:moduleC:jar', ':testpack:moduleD:jar'], type: Copy)
 
diff --git a/gestalt-entity-system/build.gradle b/gestalt-entity-system/build.gradle
@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-apply from: "$rootDir/gradle/common.gradle"
+apply(from: "$rootDir/gradle/common.gradle.kts")
 
 // Primary dependencies definition
 dependencies {
diff --git a/gestalt-es-perf/build.gradle b/gestalt-es-perf/build.gradle
@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-apply from: "$rootDir/gradle/common.gradle"
+apply(from: "$rootDir/gradle/common.gradle.kts")
 
 // Primary dependencies definition
 dependencies {
diff --git a/gestalt-es-perf/test-modules/moduleF.jar b/gestalt-es-perf/test-modules/moduleF.jar
diff --git a/gestalt-inject-java/build.gradle b/gestalt-inject-java/build.gradle
@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-apply from: "$rootDir/gradle/common.gradle"
+apply(from: "$rootDir/gradle/common.gradle.kts")
 
 // Primary dependencies definition
 dependencies {
diff --git a/gestalt-inject/build.gradle b/gestalt-inject/build.gradle
@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-apply from: "$rootDir/gradle/common.gradle"
+apply(from: "$rootDir/gradle/common.gradle.kts")
 
 // Primary dependencies definition
 dependencies {
diff --git a/gestalt-module/build.gradle b/gestalt-module/build.gradle
@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-apply from: "$rootDir/gradle/common.gradle"
+apply(from: "$rootDir/gradle/common.gradle.kts")
 
 // Primary dependencies definition
 dependencies {
diff --git a/gestalt-util/build.gradle b/gestalt-util/build.gradle
@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-apply from: "$rootDir/gradle/common.gradle"
+apply(from: "$rootDir/gradle/common.gradle.kts")
 
 // Primary dependencies definition
 dependencies {
diff --git a/gradle/common.gradle b/gradle/common.gradle
diff --git a/gradle/common.gradle.kts b/gradle/common.gradle.kts
@@ -0,0 +1,81 @@
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+// Most typical common config, but not quite global
+apply(plugin = "java-library")
+apply(plugin = "maven-publish")
+
+extensions.configure<JavaPluginExtension> {
+    withSourcesJar()
+    withJavadocJar()
+
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+// Extra details provided for unit tests
+tasks.withType<Test> {
+    useJUnit()
+
+    // ignoreFailures: Specifies whether the build should break when the verifications performed by this task fail.
+    ignoreFailures = true
+
+    // showStandardStreams: makes the standard streams (err and out) visible at console when running tests
+    testLogging.showStandardStreams = true
+
+    reports {
+        junitXml.required.set(true)
+    }
+
+    // Arguments to include while running tests
+    jvmArgs = listOf("-Xms512m", "-Xmx1024m")
+}
+
+// Javadoc configuration
+tasks.withType<Javadoc> {
+    isFailOnError = false
+}
+
+extensions.configure<PublishingExtension> {
+    publications {
+        create<MavenPublication>(project.name) {
+            // Without this we get a .pom with no dependencies
+            from(components["java"])
+
+            repositories {
+                maven {
+                    name = "TerasologyOrg"
+                    url = uri(
+                        if (rootProject.hasProperty("publishRepo")) {
+                            // This first option is good for local testing, you can set a full explicit target repo in gradle.properties
+                            "https://artifactory.terasology.io/artifactory/${rootProject.property("publishRepo")}"
+                        } else {
+                            // Support override from the environment to use a different target publish org
+                            val deducedPublishRepo = System.getenv("PUBLISH_ORG").takeIf { it?.isNotEmpty() == true }
+                                ?: "libs"
+
+                            val suffix = if (project.version.toString().endsWith("SNAPSHOT")) {
+                                "-snapshot-local"
+                            } else {
+                                "-release-local"
+                            }
+
+                            logger.info("The final deduced publish repo is {}", deducedPublishRepo + suffix)
+                            "https://artifactory.terasology.io/artifactory/$deducedPublishRepo$suffix"
+                        }
+                    )
+
+                    if (rootProject.hasProperty("mavenUser") && rootProject.hasProperty("mavenPass")) {
+                        credentials {
+                            username = rootProject.property("mavenUser").toString()
+                            password = rootProject.property("mavenPass").toString()
+                        }
+                        authentication {
+                            create<BasicAuthentication>("basic")
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
