Skip to content

Commit 5798880

Browse files
Merge branch 'main' into kotlin
2 parents 84b5cb6 + caf9219 commit 5798880

3 files changed

Lines changed: 14 additions & 10 deletions

File tree

build.gradle.kts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ plugins {
77
java
88
`java-library`
99
`maven-publish`
10-
kotlin("jvm") version "2.3.10"
11-
id("com.gradleup.shadow") version "9.3.2"
10+
kotlin("jvm") version "2.3.20"
11+
id("com.gradleup.shadow") version "9.4.0"
1212
id("org.jetbrains.gradle.plugin.idea-ext") version "1.4.1"
13-
id("xyz.wagyourtail.unimined") version "1.4.14-kappa"
13+
id("xyz.wagyourtail.unimined") version "1.4.16-kappa"
1414
id("net.kyori.blossom") version "2.2.0"
1515
}
1616

@@ -38,7 +38,7 @@ base {
3838

3939
java {
4040
toolchain {
41-
languageVersion = JavaLanguageVersion.of(21)
41+
languageVersion = JavaLanguageVersion.of(25)
4242
}
4343
if (propertyBool("generate_sources_jar")) {
4444
withSourcesJar()
@@ -49,7 +49,7 @@ java {
4949
}
5050

5151
kotlin {
52-
jvmToolchain(21)
52+
jvmToolchain(25)
5353
}
5454

5555
configurations {
@@ -74,7 +74,7 @@ unimined.minecraft {
7474
if (propertyBool("use_access_transformer")) {
7575
accessTransformer("${rootProject.projectDir}/src/main/resources/${propertyString("access_transformer_locations")}")
7676
}
77-
loader("0.4.4-alpha")
77+
loader("0.5.6-alpha")
7878
runs.auth.username = property("minecraft_username").toString()
7979
runs.all {
8080
val extraArgs = propertyString("extra_jvm_args")
@@ -231,15 +231,15 @@ tasks.named(remapTaskName) {
231231
}
232232

233233
java {
234-
sourceCompatibility = JavaVersion.VERSION_21
235-
targetCompatibility = JavaVersion.VERSION_21
234+
sourceCompatibility = JavaVersion.VERSION_25
235+
targetCompatibility = JavaVersion.VERSION_25
236236
}
237237

238238
tasks.test {
239239
useJUnitPlatform()
240240
javaLauncher =
241241
javaToolchains.launcherFor {
242-
languageVersion = JavaLanguageVersion.of(21)
242+
languageVersion = JavaLanguageVersion.of(25)
243243
}
244244

245245
if (propertyBool("show_testing_output")) {

buildSrc/src/main/kotlin/dependencies.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ repositories {
88
mavenCentral()
99
maven {
1010
name = "CurseMaven"
11+
setUrl("https://cursemaven.com")
12+
}
13+
maven {
14+
name = "CleanroomCurseMaven"
1115
setUrl("https://curse.cleanroommc.com")
1216
}
1317
maven {

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.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)