Merge upstream buildscript changes

Author: js6pak

.gitattributes

@@ -1 +1 @@
-*.mapping text eol=lf
+* text eol=lf

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
           distribution: adopt
           java-version: 17
       - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew build checkMappings --stacktrace
+      - run: ./gradlew build checkMappings --stacktrace --warning-mode fail
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:

HEADER

@@ -1 +1,4 @@
-This file is free for everyone to use under the Creative Commons Zero license.
+/*
+ * This file is free for everyone to use under the Creative Commons Zero license.
+ */
+

build.gradle

@@ -14,11 +14,9 @@ buildscript {
 	dependencies {
 		classpath "cuchaz:enigma-cli:${project.enigma_version}"
 		classpath "com.github.Chocohead:Stitch:8befa96d4b"
-		classpath "commons-io:commons-io:2.8.0"
+		classpath "commons-io:commons-io:2.11.0"
 		classpath "de.undercouch:gradle-download-task:4.1.1"
-		classpath("com.github.js6pak:tiny-remapper:c389241") {
-			transitive = false
-		}
+		classpath "net.fabricmc:tiny-remapper:${project.tiny_remapper_version}"
 		classpath "net.fabricmc.unpick:unpick:${project.unpick_version}"
 		classpath "net.fabricmc.unpick:unpick-format-utils:${project.unpick_version}"
 		classpath "net.fabricmc:name-proposal:${project.name_proposal_version}"
@@ -27,9 +25,9 @@ buildscript {
 
 plugins {
 	id "java" // for constants, packages, javadoc
-	id "de.undercouch.download" version "4.1.1"
+	id "de.undercouch.download" version "4.1.2"
 	id "maven-publish"
-	id "org.cadixdev.licenser" version "0.6.1"
+	id "com.diffplug.spotless" version "6.4.2"
 	id "net.fabricmc.filament" version "0.3.0"
 }
 
@@ -67,17 +65,23 @@ repositories {
 }
 
 configurations {
-	enigmaRuntime
+	asm
+	enigmaRuntime {
+		extendsFrom asm
+	}
 	javadocClasspath
 	decompileClasspath
 	mappingPoetJar {
 		transitive = false
 	}
 	mappingPoet {
 		extendsFrom mappingPoetJar
+		extendsFrom asm
 		transitive = true
 	}
-	unpick
+	unpick {
+		extendsFrom asm
+	}
 }
 
 def unpickMetaFile = file("unpick-definitions/unpick.json")
@@ -91,11 +95,10 @@ dependencies {
 	decompileClasspath "net.fabricmc:cfr:${project.cfr_version}"
 	mappingPoetJar "net.fabricmc:mappingpoet:${project.mappingpoet_version}"
 	unpick "net.fabricmc.unpick:unpick-cli:${project.unpick_version}"
-	// Update asm to allow running on JDK 18
-	unpick "org.ow2.asm:asm:9.2"
-	unpick "org.ow2.asm:asm-tree:9.2"
-	unpick "org.ow2.asm:asm-commons:9.2"
-	unpick "org.ow2.asm:asm-util:9.2"
+	asm "org.ow2.asm:asm:${project.asm_version}"
+	asm "org.ow2.asm:asm-tree:${project.asm_version}"
+	asm "org.ow2.asm:asm-commons:${project.asm_version}"
+	asm "org.ow2.asm:asm-util:${project.asm_version}"
 }
 
 def setupGroup = "jar setup"
@@ -581,9 +584,10 @@ sourceSets {
 	packageDocs // package info files
 }
 
-license {
-	header file("HEADER")
-	include "**/*.java"
+spotless {
+	java {
+		licenseHeaderFile(rootProject.file("HEADER"))
+	}
 }
 
 task constantsJar(type: Jar) {

gradle.properties

@@ -1,12 +1,14 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
 
-enigma_version=2.0.0
-unpick_version=2.2.0
-cfr_version=0.0.9
+enigma_version=2.1.0
+unpick_version=2.3.0
+cfr_version=0.1.1
 name_proposal_version=0.1.4
+tiny_remapper_version=0.8.2
+asm_version=9.3
 
 # Javadoc generation/linking
-fabric_loader_version=0.11.6
-jetbrains_annotations_version=22.0.0
+fabric_loader_version=0.13.3
+jetbrains_annotations_version=23.0.0
 mappingpoet_version=0.3.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists