upstream

.github/workflows/build.yml

@@ -0,0 +1,15 @@
+name: Build
+on: [push, pull_request]
+jobs:
+  build:
+    strategy:
+      matrix:
+        java: [17-jdk]
+    runs-on: ubuntu-22.04
+    container:
+      image: eclipse-temurin:${{ matrix.java }}
+      options: --user root
+    steps:
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1
+      - run: ./gradlew build test --stacktrace

.github/workflows/release.yml

@@ -0,0 +1,16 @@
+name: Release
+on: [workflow_dispatch] # Manual trigger
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    container:
+      image: eclipse-temurin:17-jdk
+      options: --user root
+    steps:
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1
+      - run: ./gradlew checkVersion build publish --stacktrace
+        env:
+          MAVEN_URL: ${{ secrets.MAVEN_URL }}
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

.gitignore

@@ -8,10 +8,10 @@
 !/.gitignore
 !/.editorconfig
 !/build.gradle
-!/gradle.properties
 !/gradlew
 !/gradlew.bat
 !/settings.gradle
 !/LICENSE
 !/HEADER
-!/Jenkinsfile
+!/.github
+!/readme.md

HEADER

@@ -1,13 +1,15 @@
-Copyright (c) 2020 FabricMC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+/*
+ * Copyright (c) $YEAR FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

build.gradle

@@ -1,70 +1,107 @@
-plugins {
-    id 'java'
-    id 'maven-publish'
-}
-
-group 'net.fabricmc'
-version '0.1.0'
-
-sourceCompatibility = 1.8
-
-def ENV = System.getenv()
-version = version + "+" + (ENV.BUILD_NUMBER ? ("build." + ENV.BUILD_NUMBER) : "local")
-
-repositories {
-    mavenCentral()
-    maven {
-        name = 'Fabric'
-        url = 'http://maven.modmuss50.me/'
-    }
-}
-
-dependencies {
-    compile 'com.squareup:javapoet:1.12.1'
-    compile 'net.fabricmc:tiny-mappings-parser:0.2.2.14'
-    runtimeOnly 'com.google.guava:guava:28.2-jre'
-
-    compile 'org.ow2.asm:asm:8.0'
-    compile 'org.ow2.asm:asm-analysis:8.0'
-    compile 'org.ow2.asm:asm-commons:8.0'
-    compile 'org.ow2.asm:asm-tree:8.0'
-    compile 'org.ow2.asm:asm-util:8.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.1.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.1.0'
-}
-
-test {
-    useJUnitPlatform()
-}
-
-jar {
-    manifest {
-        attributes 'Implementation-Title': 'MappingPoet',
-                'Implementation-Version': version,
-                'Main-Class': "net.fabricmc.mappingpoet.Main"
-    }
-}
-
-apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/license.gradle'
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from components.java
-        }
-    }
-
-    // select the repositories you want to publish to
-    repositories {
-        if (project.hasProperty('mavenPass')) {
-            maven {
-                url = "http://mavenupload.modmuss50.me/"
-                credentials {
-                    username = "buildslave"
-                    password = project.getProperty('mavenPass')
-                }
-            }
-        }
-    }
-}
+plugins {
+    id 'java'
+    id 'eclipse'
+    id 'maven-publish'
+    id 'com.diffplug.spotless' version '5.8.2'
+}
+
+group 'net.fabricmc'
+version '0.4.2'
+
+def ENV = System.getenv()
+version = version + (ENV.GITHUB_ACTIONS ? "" : "+local")
+
+repositories {
+    mavenCentral()
+    maven {
+        name = 'Fabric'
+        url = 'https://maven.modmuss50.me/'
+    }
+}
+
+dependencies {
+    implementation 'net.fabricmc:javapoet:0.1.1'
+    implementation 'net.fabricmc:mapping-io:0.4.0'
+
+    implementation 'org.ow2.asm:asm:9.7'
+    implementation 'org.ow2.asm:asm-analysis:9.7'
+    implementation 'org.ow2.asm:asm-commons:9.7'
+    implementation 'org.ow2.asm:asm-tree:9.7'
+    implementation 'org.ow2.asm:asm-util:9.7'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
+}
+
+java {
+    withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.withType(JavaCompile) {
+    options.release = 17
+    options.encoding = "UTF-8"
+}
+
+test {
+    useJUnitPlatform()
+}
+
+tasks.withType(Jar) {
+    from("LICENSE") {
+        rename { "${it}_${project.archivesBaseName}" }
+    }
+}
+
+jar {
+    manifest {
+        attributes 'Implementation-Title': 'MappingPoet',
+                'Implementation-Version': archiveVersion,
+                'Main-Class': "net.fabricmc.mappingpoet.Main"
+    }
+}
+
+import com.diffplug.spotless.LineEnding
+spotless {
+    lineEndings = LineEnding.UNIX
+    java {
+        licenseHeaderFile(file("HEADER")).yearSeparator(", ")
+    }
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+        }
+    }
+
+    // select the repositories you want to publish to
+    repositories {
+        if (ENV.MAVEN_URL) {
+            maven {
+                url ENV.MAVEN_URL
+                credentials {
+                    username ENV.MAVEN_USERNAME
+                    password ENV.MAVEN_PASSWORD
+                }
+            }
+        }
+    }
+}
+
+// A task to ensure that the version being released has not already been released.
+task checkVersion {
+    doFirst {
+        def xml = new URL("https://maven.fabricmc.net/net/fabricmc/mappingpoet/maven-metadata.xml").text
+        def metadata = new XmlSlurper().parseText(xml)
+        def versions = metadata.versioning.versions.version*.text();
+        if (versions.contains(version)) {
+            throw new RuntimeException("${version} has already been released!")
+        }
+    }
+}
+
+publish.mustRunAfter checkVersion

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Apr 05 23:36:17 BST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists