Skip to content

Commit

Permalink
Merge branch 'develop/1.10.0' into add-dyn-defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
jaskarth authored Jan 21, 2024
2 parents 0ca43d7 + 0462e9f commit 53a0eff
Show file tree
Hide file tree
Showing 759 changed files with 44,917 additions and 13,721 deletions.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Bug report
about: Create a report to help improve Vineflower
title: ''
labels: bug
assignees: ''

---

## Vineflower version
Replace this text with the version of Vineflower that you are using.

## Describe the bug
Replace this text with a clear and concise description of what the bug is.

## Additional information
Replace this text with any stacktraces, screenshots, example code, or class files (Only if you have the rights to distribute them!) here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea to improve Vineflower
title: ''
labels: enhancement
assignees: ''

---

## Is your feature request related to a problem? Please describe.
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

## Describe the solution you'd like
A clear and concise description of what you want to happen.

## Additional context
Add any other context or screenshots about the feature request here.
23 changes: 12 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,29 @@ jobs:
build:
strategy:
matrix:
java: [8, 11, 17]
runs-on: ubuntu-20.04
java: [11, 17, 19]
runs-on: ubuntu-22.04
container:
image: openjdk:${{ matrix.java }}-jdk
image: eclipse-temurin:${{ matrix.java }}
options: --user root
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1
- run: ./gradlew build --stacktrace
- name: Build with Gradle
run: |
chmod +x gradlew
./gradlew build --stacktrace
- name: Archive test results
if: "${{ always() }}"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: "test-results-java${{ matrix.java }}"
path: |
build/reports/
*/build/reports/
plugins/*/build/reports/
build/test-results/**/*.xml
- name: Codecov
uses: codecov/[email protected]
publish-test-results:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: [build]
permissions:
issues: write
Expand All @@ -34,7 +35,7 @@ jobs:
if: success() || failure()
steps:
- name: Download Artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
path: artifacts
- name: Publish Test Results
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ on:
- '*'
jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container:
image: openjdk:15-jdk
image: eclipse-temurin:17
options: --user root
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1
- run: ./gradlew build publish publishToSonatype closeAndReleaseSonatypeStagingRepository -x test --stacktrace
env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ on: [push, pull_request]
jobs:
publish:
if: ${{ github.repository_owner == 'Vineflower' && contains(github.ref_name, 'develop') }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container:
image: openjdk:15-jdk
image: eclipse-temurin:17
options: --user root
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1
- run: ./gradlew publish --stacktrace
env:
STATUS: snapshot
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
SIGNING_KEY_PASSPHRASE: ${{ secrets.SIGNING_KEY_PASSPHRASE }}
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
SONATYPE_PASS: ${{ secrets.SONATYPE_PASS }}
SONATYPE_PASS: ${{ secrets.SONATYPE_PASS }}
19 changes: 16 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
/.idea/
## Gradle
/.gradle/
/buildSrc/.gradle/
/build/
/buildSrc/build/

## IDEA
/.idea/
/out/

## Eclipse
.settings/
.classpath
.project
bin

## VSCode
.vscode

## Common
/testData/classes/java*/
/testData/classes/jasm/
/testData/classes/groovy/
/testData/classes/kt/
/testData/classes/scala/
bin
/testData/classes/scala/
Loading

0 comments on commit 53a0eff

Please sign in to comment.