Enable immaculate auto-formatting (neoforged#215)

shartte · web-flow · commit a22822094e90 · 2025-01-01T20:05:32.000Z
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,6 @@
+
+# Use via git config --local --add blame.ignoreRevsFile .git-blame-ignore-revs
+# Github should automatically adhere to this.
+
+# Applying Immaculate / NeoForge formatting
+ebf5b8cf432903f85c37a561ef0fe168fd81b392
diff --git a/.github/workflows/build-prs.yml b/.github/workflows/build-prs.yml
@@ -21,7 +21,7 @@ jobs:
     uses: neoforged/actions/.github/workflows/build-prs.yml@main
     with:
       java: 17
-      gradle_tasks: test
+      gradle_tasks: check
       jar_compatibility: false
 
   test-project:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
     uses: neoforged/actions/.github/workflows/gradle-publish.yml@main
     with:
       java: 17
-      pre_gradle_tasks: test
+      pre_gradle_tasks: check
       gradle_tasks: 'publish publishPlugins'
       version_labels: -beta, -stable
     secrets:
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ import groovy.transform.TupleConstructor
 plugins {
     id 'java-gradle-plugin'
     id 'maven-publish'
-    id 'net.neoforged.gradleutils' version '3.0.0'
+    id 'net.neoforged.gradleutils'
     id 'com.gradle.plugin-publish' version '1.2.1'
     id 'com.gradleup.shadow' version '8.3.0'
 }
diff --git a/settings.gradle b/settings.gradle
@@ -1,6 +1,15 @@
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
+    id 'net.neoforged.gradleutils' version '4.0.0' apply false
+    id 'dev.lukebemish.immaculate' version '0.1.6' apply false
 }
 
 rootProject.name = 'moddev-gradle'
+
+gradle.lifecycle.beforeProject { project ->
+    project.plugins.withId("java") {
+        apply plugin: 'dev.lukebemish.immaculate'
+        apply plugin: 'net.neoforged.gradleutils.immaculate'
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import groovy.transform.TupleConstructor`
`5`	`5`	`plugins {`
`6`	`6`	`id 'java-gradle-plugin'`
`7`	`7`	`id 'maven-publish'`
`8`		`- id 'net.neoforged.gradleutils' version '3.0.0'`
	`8`	`+ id 'net.neoforged.gradleutils'`
`9`	`9`	`id 'com.gradle.plugin-publish' version '1.2.1'`
`10`	`10`	`id 'com.gradleup.shadow' version '8.3.0'`
`11`	`11`	`}`