Skip to content

Commit 4d93f20

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents e53a918 + 313f26d commit 4d93f20

File tree

6 files changed

+112
-98
lines changed

6 files changed

+112
-98
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.ajoberstar.grgit.Grgit
22
import java.util.*
33

44
plugins {
5-
kotlin("jvm") version "1.8.20"
5+
kotlin("jvm") version "1.8.21"
66
id("org.ajoberstar.grgit") version "5.2.0"
77
`java-library`
88
`maven-publish`

bukkit-extension/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.ajoberstar.grgit.Grgit
22
import java.util.*
33

44
plugins {
5-
kotlin("jvm") version "1.8.20"
5+
kotlin("jvm") version "1.8.21"
66
`java-library`
77
`maven-publish`
88
signing
@@ -34,7 +34,7 @@ dependencies {
3434
compileOnly(rootProject)
3535
compileOnly("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT")
3636
implementation("io.papermc:paperlib:1.0.8")
37-
testImplementation(platform("org.junit:junit-bom:5.9.1"))
37+
testImplementation(platform("org.junit:junit-bom:5.9.3"))
3838
testImplementation("org.junit.jupiter:junit-jupiter")
3939
}
4040

gradle/wrapper/gradle-wrapper.jar

818 Bytes
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
5-
zipStorePath=wrapper/dists
6+
zipStorePath=wrapper/dists

gradlew

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

gradlew.bat

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

0 commit comments

Comments
 (0)