Skip to content

Commit af75138

Browse files
Merge branch 'main' into scala
2 parents 2b26fef + caf9219 commit af75138

3 files changed

Lines changed: 15 additions & 11 deletions

File tree

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ plugins {
33
id 'scala'
44
id 'java-library'
55
id 'maven-publish'
6-
id 'com.gradleup.shadow' version '9.3.2'
6+
id 'com.gradleup.shadow' version '9.4.0'
77
id 'org.jetbrains.gradle.plugin.idea-ext' version '1.4.1'
8-
id 'xyz.wagyourtail.unimined' version '1.4.14-kappa'
8+
id 'xyz.wagyourtail.unimined' version '1.4.16-kappa'
99
id 'net.kyori.blossom' version '2.2.0'
1010
}
1111

@@ -41,7 +41,7 @@ scala {
4141

4242
java {
4343
toolchain {
44-
languageVersion = JavaLanguageVersion.of(21)
44+
languageVersion = JavaLanguageVersion.of(25)
4545
}
4646
if (propertyBool('generate_sources_jar')) {
4747
withSourcesJar()
@@ -73,7 +73,7 @@ unimined.minecraft {
7373
if (propertyBool('use_access_transformer')) {
7474
accessTransformer "${rootProject.projectDir}/src/main/resources/${propertyString('access_transformer_locations')}"
7575
}
76-
loader "0.4.4-alpha"
76+
loader "0.5.6-alpha"
7777
runs.auth.username = minecraft_username
7878
runs.all {
7979
def extraArgs = propertyString('extra_jvm_args')
@@ -114,7 +114,7 @@ dependencies {
114114
implementation "com.cleanroommc:assetmover:${propertyString('asset_mover_version')}"
115115
}
116116
if (propertyBool('enable_junit_testing')) {
117-
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
117+
testImplementation 'org.junit.jupiter:junit-jupiter:6.0.3'
118118
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
119119
}
120120
}
@@ -240,7 +240,7 @@ compileTestJava {
240240
test {
241241
useJUnitPlatform()
242242
javaLauncher.set(javaToolchains.launcherFor {
243-
languageVersion = JavaLanguageVersion.of(21)
243+
languageVersion = JavaLanguageVersion.of(25)
244244
})
245245
if (propertyBool('show_testing_output')) {
246246
testLogging {

gradle/scripts/dependencies.gradle

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ repositories {
44
// Other repositories described by default:
55
// CleanroomMC: https://maven.cleanroommc.com
66
maven {
7-
name 'CurseMaven'
8-
url 'https://curse.cleanroommc.com'
7+
name = 'CurseMaven'
8+
url = 'https://cursemaven.com'
99
}
1010
maven {
11-
name 'Modrinth'
12-
url 'https://api.modrinth.com/maven'
11+
name = 'CleanroomCurseMaven'
12+
url = 'https://curse.cleanroommc.com'
13+
}
14+
maven {
15+
name = 'Modrinth'
16+
url = 'https://api.modrinth.com/maven'
1317
}
1418
maven {
1519
name "outlandsReleases"

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)