Skip to content

Commit

Permalink
Update to 1.20.4
Browse files Browse the repository at this point in the history
Signed-off-by: Joshua Castle <[email protected]>
  • Loading branch information
Kas-tle committed Apr 27, 2024
1 parent 2c4697f commit 9561afb
Show file tree
Hide file tree
Showing 12 changed files with 190 additions and 175 deletions.
48 changes: 48 additions & 0 deletions .github/workflows/build-remote.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build Remote

on:
workflow_call:
inputs:
repository:
required: true
description: 'The repo of the remote'
type: string
ref:
required: true
description: 'The ref of the remote'
type: string

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository and Submodules
# See https://github.com/actions/checkout/releases
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
repository: ${{ inputs.repository }}
ref: ${{ inputs.ref }}
submodules: recursive
- name: Validate Gradle Wrapper
# See https://github.com/gradle/actions/releases
uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
- name: Set up JDK 17
# See https://github.com/actions/setup-java/releases
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
java-version: 17
distribution: temurin
- name: Build with Gradle
# See https://github.com/gradle/actions/releases
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
with:
arguments: build
gradle-home-cache-cleanup: true
- name: Archive Artifacts
# See https://github.com/actions/upload-artifact/releases
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
if: success()
with:
name: ParadisuPlugin
path: build/libs/ParadisuPlugin.jar
if-no-files-found: error
73 changes: 73 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: Build

on:
push:
branches:
- "*"

jobs:
build:
runs-on: ubuntu-latest
outputs:
release_id: ${{ steps.release.outputs.releaseID }}
steps:
- name: Checkout Repository and Submodules
# See https://github.com/actions/checkout/releases
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
submodules: recursive
- name: Validate Gradle Wrapper
# See https://github.com/gradle/actions/releases
uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
- name: Set up JDK 17
# See https://github.com/actions/setup-java/releases
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
java-version: 17
distribution: temurin
- name: Build with Gradle
# See https://github.com/gradle/actions/releases
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
with:
arguments: build
gradle-home-cache-cleanup: true
- name: Archive Artifacts
# See https://github.com/actions/upload-artifact/releases
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
if: success()
with:
name: ParadisuPlugin
path: build/libs/ParadisuPlugin.jar
if-no-files-found: error
- name: Create Release
# See https://github.com/Kas-tle/base-release-action/releases
uses: Kas-tle/base-release-action@b863fa0f89bd15267a96a72efb84aec25f168d4c # main-11
if: ${{ success() && github.repository == 'Paradisu/ParadisuPlugin' }}
id: release
with:
files: |
build/libs/ParadisuPlugin.jar
appID: ${{ secrets.RELEASE_APP_ID }}
appPrivateKey: ${{ secrets.RELEASE_APP_PK }}
preRelease: ${{ github.ref_name != 'master' }}
- name: Setup NodeJS
# See https://github.com/actions/setup-node/releases
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
if: ${{ success() && github.repository == 'Paradisu/ParadisuPlugin' && github.ref_name == 'master' }}
- name: Publish Plugin to Servers
if: ${{ success() && github.repository == 'Paradisu/ParadisuPlugin' && github.ref_name == 'master' }}
env:
PTEROPUB_CONFIG: ${{ secrets.PTEROPUB_CONFIG }}
run: npx pteropub
upload-logs:
name: Upload Logs
runs-on: ubuntu-latest
needs: build
steps:
- name: Upload Logs
# See https://github.com/Kas-tle/release-build-log-action/releases
if: ${{ success() && github.repository == 'Paradisu/ParadisuPlugin' }}
uses: Kas-tle/release-build-log-action@1b57448eaf9476e6e05450e4ea240449eac2c0d2 # main-3
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
releaseID: ${{ needs.build.outputs.release_id }}
112 changes: 0 additions & 112 deletions .github/workflows/deploy.yml

This file was deleted.

14 changes: 14 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Process Pull Request

on:
pull_request_target:

jobs:
build:
# Forbid access to secrets nor GH Token perms while building the PR
permissions: {}
secrets: {}
uses: ./.github/workflows/build-remote.yml
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.sha }}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,6 @@ build.bat
# Gradle
.gradle
**/build
build/
build/

pteropub.json
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
group=net.paradisu
id=paradisu
pluginName=ParadisuPlugin
version=5.0.5
version=6.0.0-SNAPSHOT
description=The official plugin for the Paradisu server
authors=cytocracy,JJakee-git,IncompleteIntegers,Raymond-exe,LordOfLlamaz,polargh,Kas-tle
url=https://paradisu.net
65 changes: 25 additions & 40 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
[versions]
dotenv-kotlin = "6.2.2"
mariadb-java-client = "2.3.0"
mysql-connector-java = "8.0.28"
cloud = "1.8.3"
inventorygui = "1.5.1-SNAPSHOT"
paper-api = "1.20.1-R0.1-SNAPSHOT"
protocollib = "5.0.0-SNAPSHOT"
dotenv-kotlin = "6.4.1"
mariadb-java-client = "3.3.3"
mysql-connector-j = "8.3.0"
cloud = "1.8.4"
inventorygui = "1.6.2-SNAPSHOT"
paper-api = "1.20.4-R0.1-SNAPSHOT"
protocollib = "5.2.0-SNAPSHOT"
luckperms-api = "5.4"
configurate-yaml = "4.0.0"
adventure = "4.13.1-SNAPSHOT"
adventure-platform = "4.1.1-SNAPSHOT"
connectorplugin = "1.5-SNAPSHOT"
configurate-yaml = "4.1.2"
adventure = "4.17.0-SNAPSHOT"
adventure-platform = "4.3.3-SNAPSHOT"
connectorplugin = "1.5.1-SNAPSHOT"
guava = "31.1-jre"
log4j-slf4j-impl = "2.20.0"
velocity-api = "3.2.0-SNAPSHOT"
log4j-slf4j-impl = "2.23.1"
velocity-api = "3.3.0-SNAPSHOT"
shadow = "8.1.1"
blossom = "1.2.0"
indra = "3.1.1"
lombok = "8.0.1"
indra = "3.1.3"
lombok = "8.6"

[libraries]
dotenv-kotlin = { group = "io.github.cdimascio", name = "dotenv-kotlin", version.ref = "dotenv-kotlin" }
mariadb-java-client = { group = "org.mariadb.jdbc", name = "mariadb-java-client", version.ref = "mariadb-java-client" }
mysql-connector-java = { group = "mysql", name = "mysql-connector-java", version.ref = "mysql-connector-java" }
mysql-connector-j = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql-connector-j" }
cloud-core = { group = "cloud.commandframework", name = "cloud-core", version.ref = "cloud" }
cloud-paper = { group = "cloud.commandframework", name = "cloud-paper", version.ref = "cloud" }
cloud-velocity = { group = "cloud.commandframework", name = "cloud-velocity", version.ref = "cloud" }
Expand All @@ -44,34 +44,19 @@ log4j-slf4j-impl = { group = "org.apache.logging.log4j", name = "log4j-slf4j-imp
shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" }

[bundles]
cloud-velocity = [
"cloud-velocity",
"cloud-minecraft-extras"
]
cloud-paper = [
"cloud-paper",
"cloud-minecraft-extras"
]
cloud-core = [
"cloud-core",
"cloud-minecraft-extras"
]
adventure-core = [
"adventure-api",
"adventure-text-minimessage"
]
adventure-velocity = [
"adventure-api",
"adventure-text-minimessage"
]
cloud-velocity = ["cloud-velocity", "cloud-minecraft-extras"]
cloud-paper = ["cloud-paper", "cloud-minecraft-extras"]
cloud-core = ["cloud-core", "cloud-minecraft-extras"]
adventure-core = ["adventure-api", "adventure-text-minimessage"]
adventure-velocity = ["adventure-api", "adventure-text-minimessage"]
adventure-bukkit = [
"adventure-api",
"adventure-text-minimessage",
"adventure-platform-bukkit"
"adventure-api",
"adventure-text-minimessage",
"adventure-platform-bukkit",
]

[plugins]
shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
blossom = { id = "net.kyori.blossom", version.ref = "blossom" }
indra-git = { id = "net.kyori.indra.git", version.ref = "indra" }
lombok = { id = "io.freefair.lombok", version.ref = "lombok" }
lombok = { id = "io.freefair.lombok", version.ref = "lombok" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 9561afb

Please sign in to comment.