Skip to content

Commit f780450

Browse files
authored
Merge pull request #543 from everbuild-org/feat/minestom-ver-1.21.11
Minestom 1.21.11 Support
2 parents e870a9e + e99ae48 commit f780450

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

.github/workflows/gradle-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up JDK 21
2222
uses: actions/setup-java@v4.7.1
2323
with:
24-
java-version: '21'
24+
java-version: '25'
2525
distribution: 'temurin'
2626
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
2727
settings-path: ${{ github.workspace }} # location for the settings.xml file

buildSrc/src/main/kotlin/Utils.kt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
import java.io.ByteArrayOutputStream
22
import org.gradle.api.Action
33
import org.gradle.api.Project
4+
import org.gradle.kotlin.dsl.support.serviceOf
45

56

67
var isPrerelease = false
78

89

910
fun Project.getGitHash(): String {
10-
val stdout = ByteArrayOutputStream()
11-
exec {
11+
return providers.exec {
1212
commandLine = mutableListOf("git", "rev-parse", "--short", "HEAD")
13-
standardOutput = stdout
14-
}
15-
return stdout.toString().trim()
13+
}.standardOutput.asText.get().trim()
1614
}
1715

1816
fun Project.gitClone(name: String) {
19-
val stdout = ByteArrayOutputStream()
20-
exec {
17+
providers.exec {
2118
commandLine = mutableListOf("git", "clone", name)
22-
standardOutput = stdout
2319
}
2420
}
2521

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,6 @@ object Versions {
9696
}
9797

9898
object Minestom {
99-
const val minestom = "2025.10.04-1.21.8"
99+
const val minestom = "2025.10.31-1.21.10"
100100
}
101101
}

gradle/wrapper/gradle-wrapper.jar

1.83 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
3+
distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

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

gradlew.bat

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

platforms/minestom/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ dependencies {
99
tasks.named("jar") {
1010
finalizedBy("installAddonsIntoDefaultJar")
1111
}
12+
13+
tasks.withType<JavaCompile>().configureEach {
14+
options.release = 25
15+
}

platforms/minestom/example/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ tasks.withType<Jar> {
2020
}
2121
}
2222

23+
tasks.withType<JavaCompile>().configureEach {
24+
options.release = 25
25+
}
26+
2327
application {
2428
mainClass.set(javaMainClass)
2529
}

0 commit comments

Comments
 (0)