lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try to diagnose weird getProjectTokens() null null null bug

Browse source
This commit is contained in:
Adam 2022-06-27 23:00:11 +02:00
parent 23a2ecb0d4
commit 68adff29a8
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/events-mod/build.gradle.kts
View file

@ -39,7 +39,7 @@ val projectTokens: MapProperty<String, String> =
?: error("error getting projectTokens") ?: error("error getting projectTokens")
//val projectTokens: MapProperty<String, String> by rootProject.extra //val projectTokens: MapProperty<String, String> by rootProject.extra
val projectTokensX = projectTokens.apply { val projectTokensX1 = projectTokens.apply {
put("mod.name", modName) put("mod.name", modName)
put("mod.title", "Kafkatorio Events") put("mod.title", "Kafkatorio Events")
put("mod.description", modDescription) put("mod.description", modDescription)
@ -82,7 +82,7 @@ val installEventsTsSchema by tasks.registering(Sync::class) {
dependsOn(typescriptEventsSchema) dependsOn(typescriptEventsSchema)
// dependsOn(fixLink) // dependsOn(fixLink)
val outputDir = layout.projectDirectory.dir("src/main/typescript/generated/kafkatorio-schema") val outputDir = layout.projectDirectory.dir("src/main/typescript/generated/")
outputs.dir(outputDir) outputs.dir(outputDir)
from( from(
@ -107,10 +107,10 @@ val installEventsTsSchema by tasks.registering(Sync::class) {
val zipNameProvider = provider { distributionZipName } val zipNameProvider = provider { distributionZipName }
tasks.distZip { tasks.distZip {
val projectTokensXX = projectTokensX val projectTokensXX22 = projectTokensX1
inputs.property("zipNameProvider", zipNameProvider) inputs.property("zipNameProvider", zipNameProvider)
inputs.property("projectTokens", projectTokensXX) inputs.property("projectTokens", projectTokensXX22)
archiveFileName.set(zipNameProvider) archiveFileName.set(zipNameProvider)
} }
@ -131,6 +131,7 @@ distributions {
main { main {
distributionBaseName.set(modName) distributionBaseName.set(modName)
val tokens333: MutableMap<String, String> = projectTokensX1.get()
contents { contents {
from(layout.projectDirectory.dir("src/main/resources/mod-data")) { from(layout.projectDirectory.dir("src/main/resources/mod-data")) {
@ -139,8 +140,7 @@ distributions {
from(licenseFile) from(licenseFile)
from(typescriptToLua.map { it.outputDirectory }) from(typescriptToLua.map { it.outputDirectory })
filesNotMatching("**/*.png") { filesNotMatching("**/*.png") {
val tokens: MutableMap<String, String> = projectTokensX.get() filter<ReplaceTokens>("tokens" to tokens333)
filter<ReplaceTokens>("tokens" to tokens)
} }
includeEmptyDirs = false includeEmptyDirs = false
exclude { exclude {
@ -155,8 +155,8 @@ distributions {
tasks.withType<Zip>().configureEach { tasks.withType<Zip>().configureEach {
val projectTokensXX = projectTokensX val projectTokensXX444 = projectTokensX1
inputs.property("projectTokens", projectTokensXX) inputs.property("projectTokens", projectTokensXX444)
} }