Skip to content

Commit

Permalink
Release 1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
Matyrobbrt committed Jun 13, 2024
1 parent c9c4d98 commit dc52186
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ jobs:
run:
git switch -C pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.ref }}

- name: Setup JDK 17
- name: Setup JDK 21
uses: actions/setup-java@v2
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

- name: Setup with Gradle
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
release:
uses: neoforged/actions/.github/workflows/gradle-publish.yml@main
with:
java: 17
java: 21
pre_gradle_tasks: setup
gradle_tasks: publish '-Pneogradle.runtime.platform.installer.debug=false'
version_labels: -beta, -stable
Expand All @@ -30,4 +30,3 @@ jobs:
GPG_SUBKEY: ${{ secrets.GPG_SUBKEY }}
GPG_SUBKEY_ID: ${{ secrets.GPG_SUBKEY_ID }}
GPG_SUBKEY_PASSWORD: ${{ secrets.GPG_SUBKEY_PASSWORD }}

4 changes: 2 additions & 2 deletions .github/workflows/test-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
run:
git switch -C pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.ref }}

- name: Setup JDK 17
- name: Setup JDK 21
uses: actions/setup-java@v2
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

- name: Setup with Gradle
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ org.gradle.debug=false

java_version=21

minecraft_version=1.21-rc1
neoform_version=20240610.133618
minecraft_version=1.21
neoform_version=20240613.152323
# on snapshot versions, used to prefix the version
neoforge_snapshot_next_stable=21.0
neoforge_snapshot_next_stable=22.0

mergetool_version=2.0.0
accesstransformers_version=10.0.1
Expand Down
2 changes: 1 addition & 1 deletion testframework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ repositories {
}

dependencies {
implementation project(':neoforge')
implementation project(path: ':neoforge', configuration: 'runtimeElements')

compileOnly(platform("org.junit:junit-bom:${project.jupiter_api_version}"))
compileOnly "org.junit.jupiter:junit-jupiter-params"
Expand Down
2 changes: 1 addition & 1 deletion tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ configurations {
}

dependencies {
implementation(neoforgeProject)
implementation project(path: ':neoforge', configuration: 'runtimeElements')
implementation(testframeworkProject)

junitImplementation(platform("org.junit:junit-bom:${project.jupiter_api_version}"))
Expand Down

0 comments on commit dc52186

Please sign in to comment.