build.gradle and actions update

Author: zenfyrdev

.github/dependabot.yml

@@ -0,0 +1,24 @@
+version: 2
+registries:
+  fabric:
+    url: "https://maven.fabricmc.net/"
+    type: maven-repository
+  gradle-plugins:
+    url: "https://plugins.gradle.org/m2/"
+    type: maven-repository
+  maven-central:
+    url: "https://repo1.maven.org/maven2/"
+    type: maven-repository
+
+updates:
+  - package-ecosystem: gradle
+    registries:
+      - fabric
+      - gradle-plugins
+      - maven-central
+    ignore:
+      - dependency-name: me.melontini:dark-matter*
+      - dependency-name: net.fabricmc.fabric-api:fabric-api
+    directory: /
+    schedule:
+      interval: weekly

.github/workflows/build.yml

@@ -1,113 +1,17 @@
 
 name: build
-on:
-  push:
-  workflow_dispatch:
-    inputs:
-      version_type:
-        description: "The type of this version. e.g alpha"
-        type: choice
-        default: beta
-        options:
-          - release
-          - beta
-          - alpha
-        required: false
+on: [ push, pull_request ]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    if: |
-      !contains(github.event.head_commit.message, '[ci skip]')
-    outputs:
-      version_info: ${{ steps.get_version.outputs.version_info }}
-      version_plain: ${{ steps.get_version.outputs.version_plain }}
-      game_versions: ${{ steps.get_version.outputs.game_versions }}
-    steps:
-      - name: checkout repository
-        uses: actions/[email protected]
-      - name: validate gradle wrapper
-        uses: gradle/[email protected]
-      - name: setup jdk
-        uses: actions/[email protected]
-        with:
-          distribution: 'temurin'
-          java-version: 17
-          cache: gradle
-      - name: make gradle wrapper executable
-        run: chmod +x ./gradlew
-      - name: build
-        run: ./gradlew build
-      - name: get version #https://stackoverflow.com/questions/71089787/how-to-get-version-name-from-android-gradle-file-in-github-actions
-        id: get_version
-        run: |
-          echo "version_info=$(${{github.workspace}}/gradlew -q printVersionName)" >> $GITHUB_OUTPUT
-          echo "version_plain=$(${{github.workspace}}/gradlew -q printVersion)" >> $GITHUB_OUTPUT
-          echo "game_versions=$(${{github.workspace}}/gradlew -q printGameVersions)" >> $GITHUB_OUTPUT
-      - name: capture build artifacts
-        uses: actions/[email protected]
-        with:
-          name: Artifacts #https://stackoverflow.com/questions/58886293/getting-current-branch-and-commit-hash-in-github-action
-          path: build/libs/
-
-  packages:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout repository
-        uses: actions/[email protected]
-      - name: setup jdk
-        uses: actions/[email protected]
-        with:
-          distribution: 'temurin'
-          java-version: 17
-          cache: gradle
-      - name: make gradle wrapper executable
-        run: chmod +x ./gradlew
-      - name: publish
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          ./gradlew publish
-
-  publish:
-    needs: build
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'workflow_dispatch' }}
-    steps:
-      - name: checkout repository
-        uses: actions/[email protected]
-      - uses: actions/[email protected]
-        with:
-          name: Artifacts
-          path: build/libs
-
-      - name: publish release
-        uses: Kir-Antipov/[email protected]
-        with:
-          version-type: ${{ inputs.version_type }}
-          changelog-file: CHANGELOG.md
-          name: ${{ needs.build.outputs.version_info }}
-          version: ${{ needs.build.outputs.version_plain }}
-
-          game-versions: |
-            ${{ needs.build.outputs.game_versions }}
-
-          loaders: |
-            fabric
-
-          java: |
-            17
-
-          github-tag: v${{ needs.build.outputs.version_plain }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          github-commitish: ${{ github.sha }}
-          github-prerelease: false
-
-          modrinth-id: sc4Mu9Zu
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          modrinth-featured: true
-          modrinth-unfeature-mode: subset
-          modrinth-dependencies: |
-            fabric-api(required)
-            dark-matter(embedded)
+    uses: constellation-mc/actions/.github/workflows/gradle-build.yml@main
+    with:
+      java: 17
+      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: 17

.github/workflows/build_pr.yml

@@ -0,0 +1,23 @@
+
+name: publish
+on:
+  workflow_dispatch:
+    inputs:
+      version_type:
+        description: "The type of this version. e.g alpha"
+        type: choice
+        default: BETA
+        options:
+          - STABLE
+          - BETA
+          - ALPHA
+          - NONE
+        required: false
+
+jobs:
+  publish:
+    uses: constellation-mc/actions/.github/workflows/mc-publish.yml@main
+    with:
+      java: 17
+      version_type: ${{ inputs.version_type }}
+    secrets: inherit

.github/workflows/publish.yml

@@ -1,6 +1,13 @@
+import com.github.spotbugs.snom.SpotBugsTask
+import me.modmuss50.mpp.ReleaseType
+
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    alias libs.plugins.fabric.loom
     id 'maven-publish'
+    alias libs.plugins.lombok
+    alias libs.plugins.spotbugs.base
+    alias libs.plugins.spotless
+    alias libs.plugins.modmuss50.publish
 }
 
 def local = !System.getenv().containsKey("GITHUB_RUN_NUMBER")
@@ -19,20 +26,57 @@ dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    modImplementation libs.fabric.loader
 
     // Fabric API. This is technically optional, but you probably want it anyway.
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-    modApi include("me.melontini:dark-matter-base:${project.dark_matter_version}")
+    modImplementation libs.fabric.api
+    modApi libs.dark.matter.base
+    include libs.dark.matter.base
+}
+
+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 = file("spotbugs.xml")
+    ignoreFailures = true
+    reports {
+        if (local) {
+            html {
+                required = true
+                outputLocation = file("$buildDir/reports/spotbugs/main/spotbugs.html")
+                stylesheet = 'fancy-hist.xsl'
+            }
+        } else {
+            sarif {
+                required = true
+                outputLocation = file("$buildDir/reports/spotbugs/main/spotbugs.sarif")
+            }
+        }
+    }
+}
+
+spotless {
+    java {
+        removeUnusedImports()
+        trimTrailingWhitespace()
+        formatAnnotations()
+        importOrder('', 'java|javax', '\\#')
+    }
 }
 
 processResources {
-    inputs.property "version", project.version
-    inputs.property "loader_version", project.loader_version
+    def map = [
+            "version": project.version,
+            "loader_version": libs.fabric.loader.get().version
+    ]
+    inputs.properties(map)
+    filteringCharset "UTF-8"
 
     filesMatching("fabric.mod.json") {
-        expand "version": project.version,
-                "loader_version": project.loader_version
+        expand map
     }
 }
 
@@ -62,22 +106,11 @@ jar {
     }
 }
 
-tasks.register('printGameVersions') {
-    doLast {
-        println project.game_versions
-    }
-}
-
-tasks.register('printVersionName') {
-    doLast {
-        println version.split("-")[0] + " (" + project.game_versions.replace(" ", "-").replaceAll("[>=<]", "") + ")"
-    }
-}
-
-tasks.register('printVersion') {
-    doLast {
-        println version
+sourcesJar {
+    exclude {
+        sourceSets.main.allSource.contains it.file
     }
+    from delombok
 }
 
 // configure the maven publication
@@ -100,3 +133,40 @@ publishing {
         }
     }
 }
+
+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}")
+
+        requires("fabric-api")
+        embeds("dark-matter")
+    }
+    curseforge {
+        projectId = "622736"
+        accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
+        minecraftVersions.add("${project.minecraft_version}")
+
+        requires("fabric-api")
+        embeds("dark-matter")
+    }
+    github {
+        repository = "constellation-mc/Linkart"
+        accessToken = providers.environmentVariable("GITHUB_TOKEN")
+        commitish = providers.environmentVariable("GITHUB_SHA").getOrElse("${project.minecraft_version}-fabric")
+
+        type = STABLE
+    }
+
+    dryRun = local
+}

build.gradle

@@ -4,15 +4,7 @@ org.gradle.jvmargs=-Xmx1G
 # check these on https://fabricmc.net/versions.html
 minecraft_version=1.20.2
 yarn_mappings=1.20.2+build.4
-loader_version=0.15.7
 # Mod Properties
 mod_version=5.4.4
 maven_group=com.github.vini2003.linkart
 archives_base_name=linkart
-# Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api (or https://fabricmc.net/versions.html)
-fabric_version=0.90.0+1.20.2
-dark_matter_version=4.0.0-1.20.1-build.481
-
-# Publishing
-game_versions=>=1.19.2 <=1.20.4

gradle.properties

@@ -0,0 +1,15 @@
+[versions]
+dark-matter = "4.0.0-1.20.1-build.481"
+
+[libraries]
+fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version = "0.15.11" }
+fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.90.0+1.20.2" }
+
+dark-matter-base = { group = "me.melontini", name = "dark-matter-base", version.ref = "dark-matter" }
+
+[plugins]
+fabric-loom = { id = "fabric-loom", version = "1.6.11" }
+lombok = { id = "io.freefair.lombok", version = "8.6"}
+spotbugs-base = { id = "com.github.spotbugs-base", version = "6.0.14" }
+spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
+modmuss50-publish = { id = "me.modmuss50.mod-publish-plugin", version = "0.5.1" }