Skip to content

Commit c9945a0

Browse files
authored
Merge branch 'master' into copilot/add-mentions-sound-feature
2 parents 2d88b5f + 5a57a5d commit c9945a0

8 files changed

Lines changed: 12 additions & 25 deletions

File tree

File renamed without changes.

.github/workflows/gradle.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ jobs:
3636
with:
3737
arguments: shadowChatFormatter
3838
- name: Upload a ChatFormatter Artifact
39-
uses: actions/upload-artifact@v6.0.0
39+
uses: actions/upload-artifact@v7.0.0
4040
with:
4141
name: 'Successfully build ChatFormatter'
42-
path: build/libs/ChatFormatter v*.jar
42+
path: build/libs/ChatFormatter v*.jar
43+
archive: false

.whitesource

Lines changed: 0 additions & 14 deletions
This file was deleted.

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ repositories {
99

1010
dependencies {
1111
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.10")
12-
implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.3.1")
12+
implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.3.2")
1313
implementation("de.eldoria.plugin-yml.bukkit:de.eldoria.plugin-yml.bukkit.gradle.plugin:0.8.0")
1414
}

chatformatter-core/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ dependencies {
2424
testImplementation("net.dzikoysk:cdn:$cdnVersion")
2525

2626
// bStats
27-
implementation("org.bstats:bstats-bukkit:3.1.0")
27+
implementation("org.bstats:bstats-bukkit:3.2.1")
2828

2929
// PlaceholderAPI & Vault
30-
compileOnly("me.clip:placeholderapi:2.12.1")
30+
compileOnly("me.clip:placeholderapi:2.12.2")
3131
compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")
3232

3333
// LuckPerms API
@@ -37,15 +37,15 @@ dependencies {
3737
implementation("com.eternalcode:gitcheck:1.0.0")
3838

3939
// JUnit 5
40-
testImplementation(platform("org.junit:junit-bom:6.0.2"))
40+
testImplementation(platform("org.junit:junit-bom:6.0.3"))
4141
testImplementation("org.junit.jupiter:junit-jupiter-api")
4242
testImplementation("org.junit.jupiter:junit-jupiter-params")
4343
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
4444
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
4545

46-
testImplementation("org.mockito:mockito-core:5.21.0")
47-
testImplementation("org.mockito:mockito-junit-jupiter:5.21.0")
48-
testImplementation("me.clip:placeholderapi:2.12.1")
46+
testImplementation("org.mockito:mockito-core:5.22.0")
47+
testImplementation("org.mockito:mockito-junit-jupiter:5.22.0")
48+
testImplementation("me.clip:placeholderapi:2.12.2")
4949
testImplementation("org.assertj:assertj-core:3.27.7")
5050
}
5151

gradle/wrapper/gradle-wrapper.jar

2.73 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)