Skip to content

Commit

Permalink
Add back inputs on processResources
Browse files Browse the repository at this point in the history
I kinda thought that Gradle would be smart enough to know that these
were input (given they're passed to expand), but apparently not :/.
  • Loading branch information
SquidDev committed Jan 14, 2025
1 parent 62c9e5b commit 5ba7f99
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ import java.net.URI
import java.util.regex.Pattern

abstract class CCTweakedExtension(private val project: Project) {
/** Get the hash of the latest git commit. */
val gitHash: Provider<String> =
gitProvider("<no git commit>", listOf("rev-parse", "HEAD")) { it.trim() }

/** Get the current git branch. */
val gitBranch: Provider<String> =
gitProvider("<no git branch>", listOf("rev-parse", "--abbrev-ref", "HEAD")) { it.trim() }
Expand Down Expand Up @@ -164,6 +168,7 @@ abstract class CCTweakedExtension(private val project: Project) {
jacoco.applyTo(this)

extensions.configure(JacocoTaskExtension::class.java) {
includes = listOf("dan200.computercraft.*")
excludes = listOf(
"dan200.computercraft.mixin.*", // Exclude mixins, as they're not executed at runtime.
"dan200.computercraft.shared.Capabilities$*", // Exclude capability tokens, as Forge rewrites them.
Expand Down
2 changes: 2 additions & 0 deletions projects/core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ dependencies {
}

tasks.processResources {
inputs.property("gitHash", cct.gitHash)

var props = mapOf("gitContributors" to cct.gitContributors.get().joinToString("\n"))
filesMatching("data/computercraft/lua/rom/help/credits.md") { expand(props) }
}
Expand Down
2 changes: 2 additions & 0 deletions projects/fabric/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@ loom {
}

tasks.processResources {
inputs.property("modVersion", modVersion)

var props = mapOf("version" to modVersion)

filesMatching("fabric.mod.json") { expand(props) }
Expand Down
3 changes: 3 additions & 0 deletions projects/forge/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@ dependencies {
// Compile tasks

tasks.processResources {
inputs.property("modVersion", modVersion)
inputs.property("forgeVersion", libs.versions.forge)

var props = mapOf(
"forgeVersion" to libs.versions.forge.get(),
"file" to mapOf("jarVersion" to modVersion),
Expand Down

0 comments on commit 5ba7f99

Please sign in to comment.