Compare commits

...

2 Commits

Author SHA1 Message Date
Johannes Frohnmeyer fd6eebd2c6
feat: expose additional properties in processResources
ci/woodpecker/push/gradle Pipeline was successful Details
ci/woodpecker/push/pages Pipeline was successful Details
2024-03-25 14:16:52 +01:00
Johannes Frohnmeyer 6d84d11aab
fix: make isMerge accessible 2024-03-25 14:16:29 +01:00
2 changed files with 8 additions and 2 deletions

View File

@ -88,4 +88,4 @@ data class Tag(val id: ObjectId, val original: RevTag?, val fullName: String, va
data class Commit(val original: RevCommit, val id: ObjectId, val abbreviatedId: String?, val committer: Person, val author: Person, val dateTime: ZonedDateTime, val fullMessage: String, val shortMessage: String, val parentIds: List<String>)
data class Person(val original: PersonIdent, val name: String, val emailAddress: String)
private val Commit.isMerge get() = parentIds.size > 1
val Commit.isMerge get() = parentIds.size > 1

View File

@ -171,8 +171,14 @@ tasks.remapJar {
// fill in mod version
tasks.processResources {
val map = mapOf(
"version" to project.versionS,
"minecraft_version" to args.minecraftVersion.get(),
"loader_version" to args.loaderVersion.get(),
"${args.loaderKind.get().name.lowercase()}_version" to args.loaderVersion.get(),
)
filesMatching(listOf("fabric.mod.json", "META-INF/mods.toml")) {
expand(mapOf("version" to project.versionS))
expand(map)
}
inputs.property("version", project.versionS)
}