Skip to content

Commit d2a3eb3

Browse files
committed
Update to gradle 9 and loom 1.14
# Conflicts: # CHANGELOG.md
1 parent 5ae8371 commit d2a3eb3

File tree

9 files changed

+28
-15
lines changed

9 files changed

+28
-15
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 3.0.11
2+
3+
Forge is currently not supported as the forge gradle plugin does not support gradle 9 yet.
4+
5+
---
6+
17
# 3.0.10
28
- Fix sharing client logs on Fabric clients
39
- List 1.21.10 support

adventure/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ plugins {
22
id 'multiloader-common'
33
}
44

5-
sourceCompatibility = JavaVersion.VERSION_11
6-
targetCompatibility = JavaVersion.VERSION_11
5+
java {
6+
sourceCompatibility = JavaVersion.VERSION_11
7+
targetCompatibility = JavaVersion.VERSION_11
8+
}
79

810
dependencies {
911
implementation(libs.mclogs.api)

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ def copyShadowJar = it -> {
4444

4545
tasks.register('buildAll', Copy) {
4646
dependsOn(':bukkit:shadowJar', ':velocity:shadowJar', ':bungeecord:shadowJar',
47-
':forge:jarJar', ':fabric:build', ':neoforge:build')
47+
/*':forge:jarJar',*/ ':fabric:build', ':neoforge:build')
4848

4949
from('fabric/build/libs', 'neoforge/build/libs')
5050
from('bukkit/build/libs', copyShadowJar)
5151
from('bungeecord/build/libs', copyShadowJar)
5252
from('velocity/build/libs', copyShadowJar)
53-
from('forge/build/libs', copyShadowJar)
53+
// from('forge/build/libs', copyShadowJar)
5454

5555
it.rename { String fileName ->
5656
fileName.replace(mod_name, mod_id)

bungeecord/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ plugins {
44
alias(libs.plugins.minotaur)
55
}
66

7-
sourceCompatibility = JavaVersion.VERSION_11
8-
targetCompatibility = JavaVersion.VERSION_11
7+
java {
8+
sourceCompatibility = JavaVersion.VERSION_11
9+
targetCompatibility = JavaVersion.VERSION_11
10+
}
911

1012
dependencies {
1113
compileOnly "net.md-5:bungeecord-api:${minor_minecraft_version}-R0.4"

common/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ plugins {
22
id 'multiloader-base'
33
}
44

5-
sourceCompatibility = JavaVersion.VERSION_11
6-
targetCompatibility = JavaVersion.VERSION_11
5+
java {
6+
sourceCompatibility = JavaVersion.VERSION_11
7+
targetCompatibility = JavaVersion.VERSION_11
8+
}
79

810
dependencies {
911
implementation(libs.mclogs.api)

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ adventure-platforms = "4.3.4"
44
brigadier = "1.0.18"
55
curseforge-gradle = "1.1.15"
66
# see https://fabricmc.net/develop/ for new versions
7-
fabric-loom = "1.11-SNAPSHOT"
8-
forge-gradle = "[6.0.24,6.2)"
7+
fabric-loom = "1.14-SNAPSHOT"
8+
forge-gradle = "[6.0.46,7)"
99
gson = "2.12.1"
1010
hangar = "0.1.3"
1111
jetbrains-annotations = "26.0.2"

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-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ include('common')
4949
include('common-mc')
5050
include('fabric')
5151
include('neoforge')
52-
include('forge')
52+
// include('forge')
5353
include('adventure')
5454
include('bukkit')
5555
include('velocity')

velocity/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ plugins {
55
alias(libs.plugins.minotaur)
66
}
77

8-
9-
sourceCompatibility = JavaVersion.VERSION_17
10-
targetCompatibility = JavaVersion.VERSION_17
8+
java {
9+
sourceCompatibility = JavaVersion.VERSION_17
10+
targetCompatibility = JavaVersion.VERSION_17
11+
}
1112

1213
dependencies {
1314
compileOnly(libs.velocity.api)

0 commit comments

Comments
 (0)