Skip to content

Commit 26ecbf6

Browse files
committed
Update to stonecutter 0.7
1 parent f4a7ebf commit 26ecbf6

File tree

5 files changed

+18
-8
lines changed

5 files changed

+18
-8
lines changed

buildSrc/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
fun plugin(id: String, version: String) = "$id:$id.gradle.plugin:$version"
2323

2424
implementation(plugin("dev.isxander.modstitch.base", "0.5.16-unstable"))
25-
implementation(plugin("dev.kikugie.stonecutter", "0.6-beta.2"))
25+
implementation(plugin("dev.kikugie.stonecutter", "0.7-alpha.8"))
2626
implementation(plugin("fabric-loom", "1.10.5"))
2727
implementation(plugin("net.neoforged.moddev", "2.0.80"))
2828
}

buildSrc/src/main/kotlin/dev/isxander/controlify/Project.kt

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package dev.isxander.controlify
22

3-
import dev.isxander.controlify.stonecutter
43
import dev.isxander.modstitch.base.extensions.ModstitchExtension
5-
import dev.kikugie.stonecutter.build.StonecutterBuild
4+
import dev.kikugie.stonecutter.build.StonecutterBuildExtension
65
import org.gradle.api.Project
7-
import org.gradle.api.artifacts.dsl.DependencyHandler
86
import org.gradle.api.tasks.TaskProvider
97
import org.gradle.kotlin.dsl.*
10-
import kotlin.text.toBoolean
118

129
internal val Project.modstitch: ModstitchExtension
1310
get() = extensions.getByType<ModstitchExtension>()
1411

15-
internal val Project.stonecutter: StonecutterBuild
16-
get() = extensions.getByType<StonecutterBuild>()
12+
internal val Project.stonecutter: StonecutterBuildExtension
13+
get() = extensions.getByType<StonecutterBuildExtension>()
1714

1815
val Project.branchProj: Project
1916
get() = stonecutter.node.sibling("")!!.project

buildSrc/src/main/kotlin/dev/isxander/controlify/project.gradle.kts

+11
Original file line numberDiff line numberDiff line change
@@ -140,3 +140,14 @@ publishing {
140140
}
141141
}
142142
}
143+
144+
// fix stonecutterGenerate task dependencies
145+
tasks.named<ProcessResources>("generateModMetadata") {
146+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
147+
dependsOn("stonecutterGenerate")
148+
}
149+
modstitch.moddevgradle {
150+
tasks.named("createMinecraftArtifacts") {
151+
dependsOn("stonecutterGenerate")
152+
}
153+
}

settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pluginManagement {
1414
}
1515

1616
plugins {
17-
id("dev.kikugie.stonecutter") version "0.6-beta.2"
17+
id("dev.kikugie.stonecutter") version "0.7-alpha.8"
1818
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
1919
}
2020

stonecutter.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ if (ciSingleBuild != null) {
1818
stonecutter active file("versions/current")
1919
}
2020

21+
stonecutter.tree.nodes.forEach { it.project.plugins.apply("dev.kikugie.stonecutter") }
22+
2123
val releaseMod by tasks.registering {
2224
group = "controlify"
2325
dependsOn("buildAndCollect")

0 commit comments

Comments
 (0)