change: move tests into default test source set

update machinelib
add more manifest attributes

Author: marcus8448

.github/workflows/build.yml

@@ -22,8 +22,20 @@ jobs:
           java-version: 17
           distribution: temurin
 
+      - name: License headers
+        id: license_headers
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: checkLicenses
+
       - name: Build
         id: build
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: checkLicenses build runGametest
+          arguments: build
+
+      - name: Gametest
+        id: gametest
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: runGametest

.github/workflows/codeql.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Build
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: checkLicenses build
+          arguments: build
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2

.github/workflows/pr_check.yml

@@ -3,6 +3,8 @@ name: Pull Request Check
 on:
   pull_request:
     types: [ synchronize, opened ]
+    branches:
+      - main
 
 jobs:
   Build:
@@ -21,7 +23,20 @@ jobs:
           java-version: 17
           distribution: temurin
 
+      - name: License headers
+        id: license_headers
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: checkLicenses
+
       - name: Build
+        id: build
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build
+
+      - name: Gametest
+        id: gametest
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: checkLicenses build runGametest
+          arguments: runGametest

build.gradle.kts

@@ -20,16 +20,21 @@
  * SOFTWARE.
  */
 
+import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
 plugins {
     java
     `maven-publish`
-    id("fabric-loom") version "0.12-SNAPSHOT"
-    id("org.cadixdev.licenser") version "0.6.1"
+    id("fabric-loom") version("1.0-SNAPSHOT")
+    id("org.cadixdev.licenser") version("0.6.1")
     id("io.github.juuxel.loom-quiltflower") version("1.7.3")
 }
 
+val buildNumber = System.getenv("BUILD_NUMBER") ?: ""
+val commitHash = (System.getenv("GITHUB_SHA") ?: grgit.head().id)!!
+val prerelease = (System.getenv("PRE_RELEASE") ?: "false") == "true"
+
 val modId           = project.property("mod.id").toString()
 val modVersion      = project.property("mod.version").toString()
 val modName         = project.property("mod.name").toString()
@@ -50,16 +55,10 @@ java {
     targetCompatibility = JavaVersion.VERSION_17
     sourceCompatibility = JavaVersion.VERSION_17
 
+    withSourcesJar()
     withJavadocJar()
 }
 
-sourceSets {
-    create("gametest") {
-        compileClasspath += main.get().compileClasspath + main.get().output;
-        runtimeClasspath += main.get().runtimeClasspath + main.get().output;
-    }
-}
-
 loom {
     accessWidenerPath.set(project.file("src/main/resources/${modId}.accesswidener"))
     mixin {
@@ -71,21 +70,21 @@ loom {
             sourceSet(sourceSets.main.get())
         }
         create("gc-api-test") {
-            sourceSet(sourceSets.getByName("gametest"))
+            sourceSet(sourceSets.test.get())
         }
     }
 
     runs {
         register("gametest") {
             server()
             name("Game Test")
-            source(sourceSets.getByName("gametest"))
+            source(sourceSets.test.get())
             vmArgs("-Dfabric-api.gametest", "-Dfabric-api.gametest.report-file=${project.buildDir}/junit.xml", "-ea")
         }
         register("gametestClient") {
             server()
             name("Game Test Client")
-            source(sourceSets.getByName("gametest"))
+            source(sourceSets.test.get())
             vmArgs("-Dfabric-api.gametest", "-Dfabric-api.gametest.report-file=${project.buildDir}/junit.xml", "-ea")
         }
     }
@@ -138,12 +137,14 @@ tasks.jar {
     from("LICENSE")
     manifest {
         attributes(
-            "Implementation-Title"     to modName,
-            "Implementation-Version"   to "${project.version}",
-            "Implementation-Vendor"    to "Team Galacticraft",
-            "Implementation-Timestamp" to DateTimeFormatter.ISO_DATE_TIME,
-            "Maven-Artifact"           to "${project.group}:${modName}:${project.version}",
-            "ModSide"                  to "BOTH"
+            "Specification-Title" to modName,
+            "Specification-Vendor" to "Team Galacticraft",
+            "Specification-Version" to modVersion,
+            "Implementation-Title" to project.name,
+            "Implementation-Version" to "${project.version}",
+            "Implementation-Vendor" to "Team Galacticraft",
+            "Implementation-Timestamp" to LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME),
+            "Built-On-Java" to "${System.getProperty("java.vm.version")} (${System.getProperty("java.vm.vendor")})"
         )
     }
 }
@@ -185,9 +186,3 @@ license {
         set("company", "Team Galacticraft")
     }
 }
-
-tasks.named<ProcessResources>("processGametestResources") {
-    duplicatesStrategy = DuplicatesStrategy.WARN
-}
-
-tasks.getByName("gametestClasses").dependsOn("classes")

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G
 # Mod Information
 mod.id=galacticraft-api
 mod.name=GalacticraftAPI
-mod.version=0.4.0-prealpha.24
+mod.version=0.4.0-prealpha.25
 mod.group=dev.galacticraft
 
 # Minecraft and Fabric Loader
@@ -12,5 +12,5 @@ loader.version=0.14.9
 
 # Mod Dependencies
 fabric.version=0.60.0+1.19.2
-machinelib.version=0.1.0+1.19.2
+machinelib.version=0.1.0+eaeb4e6f
 dyndims.version=0.3.0