Skip to content

Commit

Permalink
Update to Minecraft 1.21.1 (#95)
Browse files Browse the repository at this point in the history
* Fixing up workflow branch names

* Improve bot initialization and error handling (#91)

* Project file updates

* Updated dependencies, formatters, and plugins

* Made final changes from ktlint

* Bumped kotlin to 1.9.21

* Trying to get this file to finally commit with the correct formatting

* Bumped Gradle version

* Removed lixy because it is deprecated. I am now using its successor library

* Replaced the tegral catalog with the lexer library directly to ease version management

* Bump patch version to prep a patch release

* Minor fix to documentation

* Fixing broken pull request check

* Bumped kordex to 1.7.0-snapshot

* Bumped dependencies

* Fixed some code style weirdness

* Update dependencies

* Updating dependencies and gradle

* Simplify the project files a bit

* Simplify the project files a bit

* Project cleanup
  • Loading branch information
nicholasgrose authored Oct 19, 2024
1 parent 351829c commit b1f80ad
Show file tree
Hide file tree
Showing 143 changed files with 923 additions and 4,270 deletions.
14 changes: 12 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1,12 @@
[*.{kt,kts}]
max_line_length = 120
root = true

[*]
insert_final_newline = true

[{*.kt,*.kts}]
ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL

# Disable wildcard imports entirely
ij_kotlin_name_count_to_use_star_import = 2147483647
ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
ij_kotlin_packages_to_use_import_on_demand = unset
108 changes: 54 additions & 54 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
name: Publish Release

on:
push:
branches:
- stable
push:
branches:
- stable

paths:
- '**/gradle.properties'
paths:
- '**/gradle.properties'

workflow_dispatch:
workflow_dispatch:

jobs:
publish:
runs-on: ubuntu-latest

steps:
# https://github.com/marketplace/actions/checkout
- uses: actions/checkout@v4

# https://github.com/marketplace/actions/setup-java-jdk
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: temurin

- name: Set gradlew execution permission
run: chmod u+x gradlew

# https://github.com/marketplace/actions/generate-version
- name: Get release version
uses: HardNorth/github-version-generate@v1.3.0
with:
version-source: file
version-file: gradle.properties
version-file-extraction-pattern: '(?<=version=).+'

# https://github.com/marketplace/actions/semver-parser
- name: Parse release version
uses: apexskier/github-semver-parse@v1
id: semver
with:
version: ${{ env.RELEASE_VERSION }}

# https://github.com/marketplace/actions/gradle-build-action
- name: Build artifacts
uses: gradle/gradle-build-action@v2
with:
arguments: build

# https://github.com/marketplace/actions/create-release
- name: Create release
uses: ncipollo/release-action@v1
with:
name: Gateway ${{ env.RELEASE_VERSION }}
tag: v${{ env.RELEASE_VERSION }}
generateReleaseNotes: true
artifacts: 'build/libs/*.jar'
prerelease: ${{ !!steps.semver.outputs.prerelease }}
token: ${{ secrets.GITHUB_TOKEN }}
publish:
runs-on: ubuntu-latest

steps:
# https://github.com/marketplace/actions/checkout
- uses: actions/checkout@v4

# https://github.com/marketplace/actions/setup-java-jdk
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 21
distribution: temurin

- name: Set gradlew execution permission
run: chmod u+x gradlew

# https://github.com/marketplace/actions/generate-version
- name: Get release version
uses: HardNorth/github-version-generate@v1.4.0
with:
version-source: file
version-file: gradle.properties
version-file-extraction-pattern: '(?<=version=).+'

# https://github.com/marketplace/actions/semver-parser
- name: Parse release version
uses: apexskier/github-semver-parse@v1
id: semver
with:
version: ${{ env.RELEASE_VERSION }}

# https://github.com/marketplace/actions/gradle-build-action
- name: Build artifacts
uses: gradle/actions/setup-gradle@v3
with:
arguments: build

# https://github.com/marketplace/actions/create-release
- name: Create release
uses: ncipollo/release-action@v1
with:
name: Gateway ${{ env.RELEASE_VERSION }}
tag: v${{ env.RELEASE_VERSION }}
generateReleaseNotes: true
artifacts: 'build/libs/*.jar'
prerelease: ${{ !!steps.semver.outputs.prerelease }}
token: ${{ secrets.GITHUB_TOKEN }}
100 changes: 50 additions & 50 deletions .github/workflows/pull_request_check.yml
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
name: Check Pull Request

on:
pull_request:
branches:
- stable
- develop
pull_request:
branches:
- stable
- develop

paths:
- '**/*.kt'
- '**/*.kts'
paths:
- '**/*.kt'
- '**/*.kts'

jobs:
build:
runs-on: ubuntu-latest
build:
runs-on: ubuntu-latest

steps:
# https://github.com/marketplace/actions/checkout
- uses: actions/checkout@v4
steps:
# https://github.com/marketplace/actions/checkout
- uses: actions/checkout@v4

# https://github.com/marketplace/actions/setup-java-jdk
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: temurin
# https://github.com/marketplace/actions/setup-java-jdk
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 21
distribution: temurin

- name: Set gradlew execution permission
run: chmod u+x gradlew
- name: Set gradlew execution permission
run: chmod u+x gradlew

# https://github.com/marketplace/actions/gradle-build-action
- name: Build artifacts
uses: gradle/gradle-build-action@v2
with:
arguments: build --stacktrace
# https://github.com/marketplace/actions/gradle-build-action
- name: Build artifacts
uses: gradle/actions/setup-gradle@v3
with:
arguments: build --stacktrace

ktlint:
runs-on: ubuntu-latest
ktlint:
runs-on: ubuntu-latest

steps:
# https://github.com/marketplace/actions/checkout
- uses: actions/checkout@v4
steps:
# https://github.com/marketplace/actions/checkout
- uses: actions/checkout@v4

# https://github.com/marketplace/actions/run-ktlint-with-reviewdog
- uses: ScaCap/action-ktlint@v1.8.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
ktlint_version: '1.0.1'
reporter: github-pr-review
fail_on_error: true
# https://github.com/marketplace/actions/run-ktlint-with-reviewdog
- uses: ScaCap/action-ktlint@v1.9.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
ktlint_version: '1.3.1'
reporter: github-pr-review
fail_on_error: true

detekt:
runs-on: ubuntu-latest
detekt:
runs-on: ubuntu-latest

steps:
# https://github.com/marketplace/actions/checkout
- uses: actions/checkout@v4
steps:
# https://github.com/marketplace/actions/checkout
- uses: actions/checkout@v4

# https://github.com/marketplace/actions/run-detekt-with-reviewdog
- name: Run detekt with reviewdog
uses: alaegin/[email protected].3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
detekt_config: config/detekt/detekt.yml
detekt_build_upon_default_config: true
reporter: github-pr-review
# https://github.com/marketplace/actions/run-detekt-with-reviewdog
- name: Run detekt with reviewdog
uses: alaegin/[email protected].6
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
detekt_config: config/detekt/detekt.yml
detekt_build_upon_default_config: true
reporter: github-pr-review
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,6 @@ gradle-app.setting

# Paper run
run/

# Gradle docker cache
.gradleDocker
8 changes: 0 additions & 8 deletions .idea/.gitignore

This file was deleted.

16 changes: 0 additions & 16 deletions .idea/aws.xml

This file was deleted.

16 changes: 0 additions & 16 deletions .idea/checkstyle-idea.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/checkstyleidea-libs/readme.txt

This file was deleted.

24 changes: 0 additions & 24 deletions .idea/codeStyles/Project.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions .idea/detekt.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/discord.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/encodings.xml

This file was deleted.

4 changes: 2 additions & 2 deletions .idea/ktor.xml → .idea/git_toolbox_blame.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b1f80ad

Please sign in to comment.