Skip to content

Commit bf38de7

Browse files
committed
fix: Migrate from deprecated Gradle features
Signed-off-by: MSDNicrosoft <wang3311835119@hotmail.com>
1 parent bcf34ca commit bf38de7

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

common.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,14 @@ loom {
123123
}
124124
}
125125

126-
setArchivesBaseName("${project.archives_base_name}-mc${project.minecraft_out}")
127126
setVersion(project.parent.version)
128127
setGroup(project.maven_group)
129128

129+
130+
base {
131+
archivesName = "${project.archives_base_name}-mc${project.minecraft_out}"
132+
}
133+
130134
blossom {
131135
replaceToken("\${mod_id}", project.mod_id)
132136
replaceToken("\${minecraft_version_id}", project.minecraft_version.replace(".", "_"))

fabricWrapper/build.gradle

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1+
import groovy.json.JsonBuilder
2+
13
plugins {
2-
id('java-library')
4+
id("java-library")
35
}
46

5-
setArchivesBaseName(project.archives_base_name)
67
setVersion(project.parent.version)
78
setGroup(project.maven_group)
89

10+
base {
11+
archivesName = "${project.archives_base_name}-all"
12+
}
13+
914
def fabric_subprojects = project.parent.subprojects.findAll({
1015
it.name != "fabricWrapper"
1116
})
@@ -37,14 +42,12 @@ jar {
3742
}
3843
}
3944

40-
import groovy.json.JsonBuilder
41-
4245
processResources {
4346
// disable cache
4447
outputs.upToDateWhen { false }
4548
var jars = []
4649
fabric_subprojects.each({
47-
jars.add(["file": "META-INF/jars/${it.archivesBaseName}-${it.version}.jar"])
50+
jars.add(["file": "META-INF/jars/${project.archives_base_name}-${it.version}.jar"])
4851
})
4952
filesMatching("fabric.mod.json") {
5053
expand(["mod_version" : project.version,

0 commit comments

Comments
 (0)