Skip to content

Commit 5f6a815

Browse files
authored
Merge pull request #235 from M0diis/feature-1.21.4
Update ChatChat to 1.21.4
2 parents 583073d + 52b5ad2 commit 5f6a815

10 files changed

Lines changed: 161 additions & 119 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v3
16-
- name: Set up JDK 11
16+
- name: Set up JDK 21
1717
uses: actions/setup-java@v3
1818
with:
19-
java-version: '17'
19+
java-version: '21'
2020
distribution: 'temurin'
2121
- name: Build with Gradle
2222
uses: gradle/[email protected]
2323
with:
2424
arguments: shadowJar
2525
- name: Upload jarfiles
2626
if: github.event_name != 'pull_request'
27-
uses: actions/upload-artifact@v3
27+
uses: actions/upload-artifact@v4
2828
with:
2929
path: plugin/build/libs/*.jar

api/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
33
plugins {
44
id("chatchat.base-conventions")
55
id("chatchat.publish-conventions")
6-
id("com.github.johnrengelman.shadow") version "7.1.2"
6+
id("com.gradleup.shadow") version "8.3.5"
77
}
88

99
repositories {

build-logic/src/main/kotlin/chatchat.base-conventions.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ plugins {
44

55
repositories {
66
mavenCentral()
7-
maven("https://papermc.io/repo/repository/maven-public/")
7+
maven("https://repo.papermc.io/repository/maven-public/")
88
}
99

1010
java {
11-
sourceCompatibility = JavaVersion.VERSION_11
12-
targetCompatibility = JavaVersion.VERSION_11
11+
sourceCompatibility = JavaVersion.VERSION_21
12+
targetCompatibility = JavaVersion.VERSION_21
1313
withSourcesJar()
1414
withJavadocJar()
1515
}

build-logic/src/main/kotlin/chatchat.parent-conventions.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ repositories {
77
}
88

99
java {
10-
sourceCompatibility = JavaVersion.VERSION_11
11-
targetCompatibility = JavaVersion.VERSION_11
12-
}
10+
sourceCompatibility = JavaVersion.VERSION_21
11+
targetCompatibility = JavaVersion.VERSION_21
12+
}

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[versions]
22
# Minecraft
3-
spigot = "1.20.1-R0.1-SNAPSHOT"
3+
spigot = "1.21.4-R0.1-SNAPSHOT"
44

55
# Adventure
66
minimessage = "4.16.0"
7-
adventure-platform = "4.3.3-SNAPSHOT"
7+
adventure-platform = "4.3.4"
88

99
# Other
1010
configurate = "4.1.2"
1111
cmds = "2.0.0-SNAPSHOT"
12-
papi = "2.11.1"
12+
papi = "2.11.6"
1313
towny = "0.98.1.3"
1414
discordsrv = "1.25.1"
1515
supervanish = "6.2.17"

gradle/wrapper/gradle-wrapper.jar

-15.9 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 31 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 21 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)