Skip to content

Commit 4c1d237

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature/hidden-prefixes
2 parents a7eaf8d + 7b55b32 commit 4c1d237

File tree

14 files changed

+126
-182
lines changed

14 files changed

+126
-182
lines changed

.github/renovate.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/build-prs.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Deploy Snapshot
2+
on:
3+
push:
4+
branches: [ 'main' ]
5+
6+
jobs:
7+
deploy:
8+
name: Deploy Snapshot
9+
runs-on: 'ubuntu-latest'
10+
steps:
11+
- uses: actions/checkout@v3
12+
- uses: actions/setup-java@v3
13+
with:
14+
java-version: 17
15+
distribution: 'temurin'
16+
- name: Setup Gradle
17+
uses: gradle/gradle-build-action@v2
18+
- name: Get project version
19+
id: get_version
20+
shell: bash
21+
run: |
22+
project_version=$(./gradlew -q --console=plain printVersion --no-daemon)
23+
echo version=$project_version >> $GITHUB_OUTPUT
24+
- name: Deploy snapshot version
25+
if: endsWith(steps.get_version.outputs.version, '-SNAPSHOT')
26+
run: ./gradlew publish --no-daemon --stacktrace
27+
env:
28+
ORG_GRADLE_PROJECT_paperUsername: ${{ secrets.DEPLOY_USER }}
29+
ORG_GRADLE_PROJECT_paperPassword: ${{ secrets.DEPLOY_PASS }}

.github/workflows/deploy.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Deploy
2+
on:
3+
push:
4+
tags: [ 'v*' ]
5+
6+
jobs:
7+
deploy:
8+
name: Deploy
9+
runs-on: 'ubuntu-latest'
10+
steps:
11+
- uses: actions/checkout@v3
12+
- uses: actions/setup-java@v3
13+
with:
14+
java-version: 17
15+
distribution: 'temurin'
16+
- uses: gradle/wrapper-validation-action@v2
17+
- uses: gradle/gradle-build-action@v2
18+
name: Deploy release
19+
with:
20+
arguments: build publish --no-daemon --stacktrace
21+
env:
22+
ORG_GRADLE_PROJECT_paperUsername: ${{ secrets.DEPLOY_USER }}
23+
ORG_GRADLE_PROJECT_paperPassword: ${{ secrets.DEPLOY_PASS }}
24+
- name: Parse tag
25+
id: vars
26+
run: echo tag=${GITHUB_REF#refs/*/} >> $GITHUB_OUTPUT
27+
- name: Create release and changelog
28+
uses: MC-Machinations/[email protected]
29+
with:
30+
token: ${{ secrets.GITHUB_TOKEN }}
31+
title: restamp ${{ steps.vars.outputs.tag }}
32+
files: |
33+
build/libs/*.jar

.github/workflows/publish-jcc.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/publish-prs.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Test
2+
on:
3+
push:
4+
branches: [ "**" ]
5+
pull_request:
6+
7+
jobs:
8+
test:
9+
# Only run on PRs if the source branch is on someone else's repo
10+
if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
11+
name: Test
12+
runs-on: 'ubuntu-latest'
13+
steps:
14+
- uses: actions/checkout@v3
15+
- uses: actions/setup-java@v3
16+
with:
17+
java-version: 17
18+
distribution: 'temurin'
19+
- name: Setup Gradle
20+
uses: gradle/gradle-build-action@v2
21+
- name: Execute Gradle build
22+
run: ./gradlew build --no-daemon --stacktrace

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ Plugin - parchment
102102
Plugin - accesstransformers
103103
--access-transformer=<atFiles>
104104
105+
--access-transformer-inherit-method
106+
Whether or not access transformers on methods should be inherited from
107+
parent types
105108
--access-transformer-validation=<validation>
106109
The level of validation to use for ats
107110
--enable-accesstransformers

api/build.gradle

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
import net.neoforged.gradleutils.PomUtilsExtension
21

32
plugins {
43
id 'java-library'
5-
id 'maven-publish'
6-
id 'net.neoforged.gradleutils'
74
}
85

9-
group = 'net.neoforged.jst'
10-
11-
gradleutils {
12-
setupSigning(project: project, signAllPublications: true)
13-
}
146
java {
157
withSourcesJar()
168
withJavadocJar()
@@ -31,13 +23,7 @@ publishing {
3123
pom {
3224
name = 'JST API'
3325
description = 'The JavaSourceTransformer API'
34-
rootProject.pomUtils.githubRepo(it, 'JavaSourceTransformer')
35-
rootProject.pomUtils.neoForgedDeveloper(it)
36-
rootProject.pomUtils.license(it, PomUtilsExtension.License.LGPL_v2)
3726
}
3827
}
3928
}
40-
repositories {
41-
maven gradleutils.publishingMaven
42-
}
4329
}

0 commit comments

Comments
 (0)