Skip to content

Commit 4594acc

Browse files
committed
chore(build): Update Gradle scripts
Signed-off-by: MSDNicrosoft <i@msdnicrosoft.work>
1 parent 3bb81aa commit 4594acc

3 files changed

Lines changed: 11 additions & 13 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if (grgit != null) {
3737
realVersion += "+nogit"
3838
}
3939

40-
setVersion(realVersion)
40+
version = realVersion
4141

4242
tasks.register("cleanPreprocessSources") {
4343
doFirst {

fabricWrapper/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ base {
1111
archivesName = "${project.archives_base_name}-all"
1212
}
1313

14-
def fabric_subprojects = project.parent.subprojects.findAll({
14+
def fabric_subprojects = project.rootProject.subprojects.findAll({
1515
it.name != "fabricWrapper"
1616
})
1717

@@ -31,18 +31,18 @@ jar {
3131
it.tasks.remapJar
3232
})
3333

34-
from("../LICENSE")
35-
from("build/tmp/submods")
34+
from(project.rootProject.file("LICENSE"))
35+
from(layout.buildDirectory.dir("tmp/submods"))
3636

3737
doFirst {
38-
delete fileTree("build/tmp/submods/META-INF/jars")
38+
delete fileTree(layout.buildDirectory.dir("tmp/submods/META-INF/jars"))
3939
copy {
4040
from {
4141
fabric_subprojects.collect {
4242
it.remapJar.outputs.files
4343
}
4444
}
45-
into("build/tmp/submods/META-INF/jars")
45+
into(layout.buildDirectory.dir("tmp/submods/META-INF/jars"))
4646
}
4747
}
4848
}
@@ -69,7 +69,7 @@ processResources {
6969
jars.add(["file": "META-INF/jars/${project.archives_base_name}-mc${it.minecraft_out}-${it.version}.jar"])
7070
})
7171

72-
File file = file("build/resources/main/fabric.mod.json")
72+
File file = layout.buildDirectory.file("resources/main/fabric.mod.json").getOrNull().asFile
7373
JsonSlurper slurper = new JsonSlurper()
7474
JsonBuilder builder = new JsonBuilder(slurper.parse(file))
7575
builder.content.depends.minecraft = mc_condition

versions/1.16.5/build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,10 @@ loom {
123123
}
124124
}
125125

126-
setVersion(project.parent.version)
127-
setGroup(project.maven_group)
128-
129-
130126
base {
131-
archivesName.set("${project.archives_base_name}-mc${project.minecraft_out}")
127+
version = project.parent.version
128+
group = project.maven_group
129+
archivesName = "${project.archives_base_name}-mc${project.minecraft_out}"
132130
}
133131

134132
replaceToken {
@@ -175,7 +173,7 @@ java {
175173
}
176174

177175
jar {
178-
from("../../LICENSE")
176+
from(project.rootProject.file("LICENSE"))
179177
}
180178

181179
tasks.register("cleanRun") {

0 commit comments

Comments
 (0)