Merge remote-tracking branch 'upstream/master' into next

# Conflicts: # build.gradle
architectury · Dec 7, 2023 · 3beefd4 · 3beefd4
2 parents d16a1ac + e8c6caf
commit 3beefd4
Show file tree

Hide file tree

Showing 19 changed files with 483 additions and 479 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,20 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+tab_width = 4
+
+[*.gradle]
+indent_style = tab
+
+[*.java]
+indent_style = tab
+ij_continuation_indent_size = 8
+ij_java_imports_layout = $*,|,java.**,|,javax.**,|,*,|,net.minecraft.**,|,net.fabricmc.**
+ij_java_class_count_to_use_import_on_demand = 999
+
+[.editorconfig]
+indent_style = space
+indent_size = 4
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,13 +4,15 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [8-jdk, 11-jdk, 16-jdk]
-    runs-on: ubuntu-20.04
+        java: [11-jdk, 17-jdk, 21-jdk]
+    runs-on: ubuntu-22.04
     container:
-      image: openjdk:${{ matrix.java }}
+      image: eclipse-temurin:${{ matrix.java }}
       options: --user root
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - uses: gradle/wrapper-validation-action@v1
       - run: chmod +x ./gradlew
       - run: ./gradlew build test --stacktrace
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,12 +5,14 @@ on:
       - next
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container:
-      image: openjdk:16-jdk
+      image: eclipse-temurin:21-jdk
       options: --user root
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - uses: gradle/wrapper-validation-action@v1
       - run: chmod +x ./gradlew
       - run: ./gradlew build publish --stacktrace

diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@
 .idea/
 !src/test/resources/**
 /tiny-remapper/
+/out/
diff --git a/build.gradle b/build.gradle
@@ -2,19 +2,19 @@ plugins {
 	id 'java-library'
 	id 'maven-publish'
 	id 'checkstyle'
-	id 'com.diffplug.spotless' version '5.14.2'
-	id 'com.github.johnrengelman.shadow' version '6.1.0'
+	id 'com.diffplug.spotless' version '6.22.0'
+	id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
 version = '1.10.' + (System.getenv("GITHUB_RUN_NUMBER") ?: "9999")
 
 def ENV = System.getenv()
 
 group = 'dev.architectury'
-archivesBaseName = 'tiny-remapper'
+
+base {
+	archivesName = 'tiny-remapper'
+}
 
 repositories {
 	mavenCentral()
@@ -25,12 +25,15 @@ dependencies {
 	api 'org.ow2.asm:asm-commons:9.6'
 	implementation 'org.ow2.asm:asm-tree:9.6'
 	implementation 'org.ow2.asm:asm-util:9.6'
+	implementation "net.fabricmc:mapping-io:0.5.0"
 
 	testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
 }
 
 java {
 	withSourcesJar()
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -43,7 +46,7 @@ tasks.withType(JavaCompile).configureEach {
 
 shadowJar {
 	relocate 'net.fabricmc.tinyremapper', 'dev.architectury.tinyremapper'
-	classifier null
+	archiveClassifier = null
 	configurations = []
 }
 
@@ -62,7 +65,7 @@ jar {
 					'Implementation-Version': archiveVersion,
 					'Main-Class': "dev.architectury.tinyremapper.Main"
 	}
-	classifier 'raw'
+	archiveClassifier = 'raw'
 }
 
 checkstyle {
@@ -71,11 +74,14 @@ checkstyle {
 }
 
 spotless {
-	ratchetFrom 'origin/master'
-	enforceCheck false
+    enforceCheck false
 
 	java {
 		licenseHeaderFile(rootProject.file('HEADER')).yearSeparator(', ')
+		removeUnusedImports()
+		importOrder('java', 'javax', '', 'net.minecraft', 'net.fabricmc')
+		indentWithTabs()
+		trimTrailingWhitespace()
 	}
 }
 

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -70,7 +70,7 @@
 
 		<module name="ImportOrder">
 			<property name="groups" value="java,javax,*,net.minecraft,net.fabricmc"/>
-			<property name="ordered" value="false"/><!-- the plugin orders alphabetically without considering separators.. -->
+			<property name="ordered" value="true"/>
 			<property name="separated" value="true"/>
 			<property name="option" value="top"/>
 			<property name="sortStaticImportsAlphabetically" value="true"/>

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,4 @@ @@
     .idea/
     !src/test/resources/**
     /tiny-remapper/
+    /out/