Cleanup to build.gradle and fixing GH Actions

Removes the spotbugs and delombok steps, and updates fabric-loom to 1.12-SNAPSHOT to fix builds involving injected interfaces.

Author: ellellie

.github/workflows/build.yml

@@ -4,14 +4,36 @@ on: [ push, pull_request ]
 
 jobs:
   build:
-    uses: constellation-mc/actions/.github/workflows/gradle-build.yml@main
-    with:
-      java: 21
-      gradle_tasks: spotbugs
-      reviewdog: |
-        cat ./build/reports/spotbugs/main/spotbugs.sarif | reviewdog -name="spotbugs" -f=sarif -reporter=github-check -level=warning
-
-  run_tests:
-    uses: constellation-mc/actions/.github/workflows/mc-tests.yml@main
-    with:
-      java: 21
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: gradle/actions/[email protected]
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Setup Gradle
+        uses: gradle/actions/[email protected]
+      - name: Build project
+        run: ./gradlew buildAndCollect
+      - name: Find jars
+        id: find_jars
+        run: |
+          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+          echo "jars<<$EOF" >> $GITHUB_OUTPUT
+          find ./build/libs/ -type f -name "*.jar" ! -name "*-sources.jar" >> $GITHUB_OUTPUT
+          echo "$EOF" >> $GITHUB_OUTPUT
+      - name: Get MC version and mod version
+        uses: christian-draeger/[email protected]
+        id: read_properties
+        with:
+            path: gradle.properties
+            properties: 'mod_version'
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: linkart-refabricated-${{ steps.read_properties.outputs.mod_version }}+build.${{ github.run_number }}
+          path: ${{ steps.find_jars.outputs.jars }}

.github/workflows/publish.yml

@@ -1,11 +1,6 @@
-import com.github.spotbugs.snom.SpotBugsTask
-
 plugins {
-    id 'fabric-loom' version '1.11-SNAPSHOT'
+    id 'fabric-loom' version '1.12-SNAPSHOT'
     id 'maven-publish'
-    id 'io.freefair.lombok' version '8.6'
-    id 'com.github.spotbugs-base' version '6.0.14'
-    //id 'com.diffplug.spotless' version '6.25.0'
     id 'me.modmuss50.mod-publish-plugin' version "0.5.1"
 }
 
@@ -37,36 +32,6 @@ base {
     archivesName = "linkart-refabricated"
 }
 
-tasks.register("spotbugs", SpotBugsTask) { task ->
-    sourceSets.each {
-        task.sourceDirs.from(task.sourceDirs.files, it.allSource.sourceDirectories)
-        task.classDirs.from(task.classDirs.files, it.output)
-        task.auxClassPaths.from(task.auxClassPaths.files, it.compileClasspath)
-    }
-    excludeFilter = rootProject.file("spotbugs.xml")
-    ignoreFailures = true
-    reports {
-        html {
-            required = true
-            outputLocation = rootProject.file("${rootProject.buildDir}/reports/spotbugs/main/spotbugs.html")
-            stylesheet = 'fancy-hist.xsl'
-        }
-        sarif {
-            required = true
-            outputLocation = rootProject.file("${rootProject.buildDir}/reports/spotbugs/main/spotbugs.sarif")
-        }
-    }
-}
-
-/*spotless {
-    java {
-        removeUnusedImports()
-        trimTrailingWhitespace()
-        formatAnnotations()
-        importOrder('', 'java|javax', '\\#')
-    }
-}*/
-
 processResources {
     inputs.property "minecraft", mcVersion
     inputs.property "version", mod_version
@@ -88,6 +53,8 @@ loom {
         ideConfigGenerated true // Run configurations are not created for subprojects by default
         runDir "../../run" // Use a shared run folder and create separate worlds
     }
+
+    fabricModJsonPath = rootProject.file("src/main/resources/fabric.mod.json")
 }
 
 def targetJavaVersion = 17
@@ -110,77 +77,18 @@ java {
     withSourcesJar()
 }
 
-jar {
-    from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}" }
-    }
-}
-
-sourcesJar {
-    exclude {
-        sourceSets.main.allSource.contains it.file
-    }
-    from delombok
-}
+tasks.register('buildAndCollect', Copy) {
+    group = 'build'
 
-/*
-// configure the maven publication
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifactId 'linkart'
-            from components.java
-        }
-    }
+    from(tasks.named('remapJar').flatMap { it.archiveFile })
+    from(tasks.named('remapSourcesJar').flatMap { it.archiveFile })
+    into rootProject.layout.buildDirectory.dir("libs/${project.mod_version}").get().asFile
 
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = "https://maven.pkg.github.com/constellation-mc/Linkart"
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
+    dependsOn 'build'
 }
 
-publishMods {
-    file = remapJar.archiveFile
-    additionalFiles.from(remapSourcesJar.archiveFile)
-
-    changelog = file("CHANGELOG.md").text
-    type = ReleaseType.valueOf(providers.environmentVariable("VERSION_TYPE").getOrElse("BETA"))
-    modLoaders.add("fabric")
-
-    displayName = "${project.mod_version} (${project.minecraft_version})"
-
-    modrinth {
-        projectId = "sc4Mu9Zu"
-        accessToken = providers.environmentVariable("MODRINTH_TOKEN")
-        minecraftVersions.add("${project.minecraft_version}")
-        minecraftVersions.add("1.21")
-
-        requires("fabric-api")
-        embeds("midnightlib")
-    }
-    curseforge {
-        projectId = "622736"
-        accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
-        minecraftVersions.add("${project.minecraft_version}")
-        minecraftVersions.add("1.21")
-
-        requires("fabric-api")
-        embeds("midnightlib")
-    }
-    github {
-        repository = "constellation-mc/Linkart"
-        accessToken = providers.environmentVariable("GITHUB_TOKEN")
-        commitish = providers.environmentVariable("GITHUB_SHA").getOrElse("${project.minecraft_version}-fabric")
-
-        type = STABLE
+jar {
+    from("LICENSE") {
+        rename { "${it}_${project.archivesBaseName}" }
     }
-
-    dryRun = local
-}
-*/
+}

build.gradle

@@ -1,5 +1,5 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx2G
+org.gradle.jvmargs=-Xmx3G
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
 minecraft_version=[VERSIONED]