Merge remote-tracking branch 'origin/main' into feature/hidden-prefixes

.github/workflows/deploy-snapshot.yml

@@ -0,0 +1,29 @@
+name: Deploy Snapshot
+on:
+  push:
+    branches: [ 'main' ]
+
+jobs:
+  deploy:
+    name: Deploy Snapshot
+    runs-on: 'ubuntu-latest'
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'temurin'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+      - name: Get project version
+        id: get_version
+        shell: bash
+        run: |
+          project_version=$(./gradlew -q --console=plain printVersion --no-daemon)
+          echo version=$project_version >> $GITHUB_OUTPUT
+      - name: Deploy snapshot version
+        if: endsWith(steps.get_version.outputs.version, '-SNAPSHOT')
+        run: ./gradlew publish --no-daemon --stacktrace
+        env:
+          ORG_GRADLE_PROJECT_paperUsername: ${{ secrets.DEPLOY_USER }}
+          ORG_GRADLE_PROJECT_paperPassword: ${{ secrets.DEPLOY_PASS }}

.github/workflows/deploy.yml

@@ -0,0 +1,33 @@
+name: Deploy
+on:
+  push:
+    tags: [ 'v*' ]
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: 'ubuntu-latest'
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'temurin'
+      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/gradle-build-action@v2
+        name: Deploy release
+        with:
+          arguments: build publish --no-daemon --stacktrace
+        env:
+          ORG_GRADLE_PROJECT_paperUsername: ${{ secrets.DEPLOY_USER }}
+          ORG_GRADLE_PROJECT_paperPassword: ${{ secrets.DEPLOY_PASS }}
+      - name: Parse tag
+        id: vars
+        run: echo tag=${GITHUB_REF#refs/*/} >> $GITHUB_OUTPUT
+      - name: Create release and changelog
+        uses: MC-Machinations/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          title: restamp ${{ steps.vars.outputs.tag }}
+          files: |
+            build/libs/*.jar

.github/workflows/test.yml

@@ -0,0 +1,22 @@
+name: Test
+on:
+  push:
+    branches: [ "**" ]
+  pull_request:
+
+jobs:
+  test:
+    # Only run on PRs if the source branch is on someone else's repo
+    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
+    name: Test
+    runs-on: 'ubuntu-latest'
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'temurin'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+      - name: Execute Gradle build
+        run: ./gradlew build --no-daemon --stacktrace

README.md

@@ -102,6 +102,9 @@ Plugin - parchment
 Plugin - accesstransformers
       --access-transformer=<atFiles>
 
+      --access-transformer-inherit-method
+                           Whether or not access transformers on methods should be inherited from
+                             parent types
       --access-transformer-validation=<validation>
                            The level of validation to use for ats
       --enable-accesstransformers

api/build.gradle

@@ -1,16 +1,8 @@
-import net.neoforged.gradleutils.PomUtilsExtension
 
 plugins {
     id 'java-library'
-    id 'maven-publish'
-    id 'net.neoforged.gradleutils'
 }
 
-group = 'net.neoforged.jst'
-
-gradleutils {
-    setupSigning(project: project, signAllPublications: true)
-}
 java {
     withSourcesJar()
     withJavadocJar()
@@ -31,13 +23,7 @@ publishing {
             pom {
                 name = 'JST API'
                 description = 'The JavaSourceTransformer API'
-                rootProject.pomUtils.githubRepo(it, 'JavaSourceTransformer')
-                rootProject.pomUtils.neoForgedDeveloper(it)
-                rootProject.pomUtils.license(it, PomUtilsExtension.License.LGPL_v2)
             }
         }
     }
-    repositories {
-        maven gradleutils.publishingMaven
-    }
 }

build.gradle.kts

@@ -0,0 +1,37 @@
+plugins {
+    `java-library`
+    `maven-publish`
+}
+
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+
+tasks.jar {
+    manifest {
+        attributes("Implementation-Version" to project.version)
+    }
+}
+
+publishing {
+    repositories {
+        val url = if (project.version.toString().endsWith("-SNAPSHOT")) {
+            "https://repo.papermc.io/repository/maven-snapshots/"
+        } else {
+            "https://repo.papermc.io/repository/maven-releases/"
+        }
+        maven(url) {
+            credentials(PasswordCredentials::class)
+            name = "paper"
+        }
+    }
+
+    publications.create<MavenPublication>("maven") {
+        artifactId = "jst"
+        from(components["java"])
+    }
+}
+
+tasks.register("printVersion") {
+    doFirst {
+        println(version)
+    }
+}

cli/build.gradle

@@ -1,10 +1,7 @@
-import net.neoforged.gradleutils.PomUtilsExtension
 
 plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow'
-    id 'maven-publish'
-    id 'net.neoforged.gradleutils'
 }
 
 group = 'net.neoforged.jst'
@@ -15,7 +12,6 @@ jar {
     }
 }
 
-gradleutils.setupSigning(project: project, signAllPublications: true)
 java {
     withSourcesJar()
     withJavadocJar()
@@ -95,9 +91,6 @@ publishing {
             pom {
                 name = 'JST CLI'
                 description = 'The JavaSourceTransformer CLI'
-                rootProject.pomUtils.githubRepo(it, 'JavaSourceTransformer')
-                rootProject.pomUtils.neoForgedDeveloper(it)
-                rootProject.pomUtils.license(it, PomUtilsExtension.License.LGPL_v2)
             }
         }
         // This publication only contains the shaded standalone jar
@@ -111,13 +104,7 @@ publishing {
             pom {
                 name = 'JST CLI bundle'
                 description = 'The JavaSourceTransformer CLI bundle, containing all builtin plugins shadowed'
-                rootProject.pomUtils.githubRepo(it, 'JavaSourceTransformer')
-                rootProject.pomUtils.neoForgedDeveloper(it)
-                rootProject.pomUtils.license(it, PomUtilsExtension.License.LGPL_v2)
             }
         }
     }
-    repositories {
-        maven gradleutils.publishingMaven
-    }
 }

gradle.properties

@@ -1,3 +1,5 @@
+group=io.papermc.jst
+version=1.0.68-SNAPSHOT
 
 intellij_version=233.11799.300
 jetbrains_annotations_version=24.1.0