Skip to content

Commit b1ce7b6

Browse files
committed
build: update to stonecutter 0.7
1 parent dd29205 commit b1ce7b6

File tree

4 files changed

+15
-26
lines changed

4 files changed

+15
-26
lines changed

build.gradle.kts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

44
plugins {
5+
id("dev.kikugie.stonecutter")
56
id("dev.isxander.modstitch.base")
67

78
kotlin("jvm")
@@ -349,6 +350,17 @@ tasks {
349350
compilerOptions {
350351
jvmTarget = modstitch.javaTarget.map { JvmTarget.fromTarget(it.toString()) }
351352
}
353+
354+
dependsOn("stonecutterGenerate")
355+
}
356+
}
357+
358+
tasks.named("generateModMetadata") {
359+
dependsOn("stonecutterGenerate")
360+
}
361+
modstitch.moddevgradle {
362+
tasks.named("createMinecraftArtifacts") {
363+
dependsOn("stonecutterGenerate")
352364
}
353365
}
354366

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pluginManagement {
1313
}
1414

1515
plugins {
16-
id("dev.kikugie.stonecutter") version "0.6-alpha.13"
16+
id("dev.kikugie.stonecutter") version "0.7-alpha.5"
1717
}
1818

1919
stonecutter {

stonecutter.gradle.kts

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
import dev.kikugie.stonecutter.controller.ChiseledTask
2-
import dev.kikugie.stonecutter.ide.RunConfigType
3-
41
plugins {
52
base
63
kotlin("jvm") version "2.0.21" apply false
74

85
id("dev.kikugie.stonecutter")
96

10-
val modstitchVersion = "0.5.14-unstable"
7+
val modstitchVersion = "0.5.15-unstable"
118
id("dev.isxander.modstitch.base") version modstitchVersion apply false
129
id("dev.isxander.modstitch.shadow") version modstitchVersion apply false
1310

@@ -16,13 +13,6 @@ plugins {
1613
}
1714
stonecutter active file("versions/current")
1815

19-
val chiseledBuildAndCollect = registerChiseled("buildAndCollect")
20-
val chiseledBuild = registerChiseled("build")
21-
val chiseledReleaseModVersion = registerChiseled("releaseModVersion")
22-
val chiseledPublishSnapshots = registerChiseled("publishAllPublicationsToXanderSnapshotsRepository", name = "chiseledPublishSnapshots")
23-
val chiseledPublishToMaven = registerChiseled("publish", name = "chiseledPublishToMaven")
24-
val chiseledRunTestmodClient = registerChiseled("runTestmodClient")
25-
2616
allprojects {
2717
repositories {
2818
maven("https://maven.terraformersmc.com")
@@ -38,8 +28,6 @@ allprojects {
3828
}
3929

4030
stonecutter {
41-
generateRunConfigs = listOf(RunConfigType.SWITCH)
42-
4331
parameters {
4432
fun String.propDefined() = project(node!!.metadata.project).findProperty(this)?.toString()?.isNotBlank() ?: false
4533
consts(listOf(
@@ -55,14 +43,3 @@ tasks.clean {
5543
delete(layout.buildDirectory.dir("finalJars"))
5644
}
5745

58-
fun registerChiseled(task: String, name: String? = null, action: ChiseledTask.() -> Unit = {}): TaskProvider<ChiseledTask> {
59-
return tasks.register(
60-
name ?: ("chiseled" + task.replaceFirstChar { it.uppercase() }),
61-
stonecutter.chiseled.kotlin
62-
) {
63-
group = "yacl"
64-
ofTask(task)
65-
action(this)
66-
67-
}.also { stonecutter registerChiseled it }
68-
}

versions/1.21.3-fabric/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ modstitch.platform=loom
33
mcVersion=1.21.3
44
parchment.version=2024.12.07
55

6-
deps.fabricApi=0.106.0+1.21.2
6+
deps.fabricApi=0.114.0+1.21.3
77

88
meta.mcDep=~1.21.2 <1.21.4
99

0 commit comments

Comments
 (0)