added kvision web-map, cleaning up a few gradle things (tokens)

This commit is contained in:
Adam 2021-12-06 22:15:26 +01:00
parent 29d190b8f4
commit 6d60428ab9
31 changed files with 323 additions and 87 deletions

View file

@ -60,4 +60,4 @@ idea {
}
}
tasks.assemble { dependsOn(tasks.htmlDependencyReport) }
//tasks.assemble { dependsOn(tasks.htmlDependencyReport) }

View file

@ -8,14 +8,6 @@ plugins {
group = "${rootProject.group}.${project.name}"
version = rootProject.version
val licenseFile: RegularFile by extra(rootProject.layout.projectDirectory.file("LICENSE"))
val tokens: MutableMap<String, String> by extra(
mutableMapOf(
"project.version" to "$version",
)
)
idea {
module {
isDownloadSources = true

View file

@ -32,7 +32,7 @@ fun Configuration.factorioModAttributes(objects: ObjectFactory): Configuration =
attribute(BUNDLING_ATTRIBUTE, objects.named(Bundling.EMBEDDED))
}
fun Configuration.typescriptAttributes(objects: ObjectFactory) =
fun Configuration.typescriptAttributes(objects: ObjectFactory): Configuration =
attributes {
attribute(USAGE_ATTRIBUTE, objects.named("typescript"))
attribute(CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))

View file

@ -1,16 +1,8 @@
package dev.adamko.kafkatorio.lang
import org.gradle.kotlin.dsl.kotlin
import com.github.gradle.node.npm.task.NpmTask
import com.github.gradle.node.task.NodeTask
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.extra
import org.gradle.kotlin.dsl.getting
import org.jetbrains.kotlin.gradle.targets.js.dukat.DtsResolver
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.RootPackageJsonTask
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinPackageJsonTask
import org.jetbrains.kotlin.util.parseSpaceSeparatedArgs
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.RootPackageJsonTask
plugins {
@ -19,6 +11,8 @@ plugins {
id("dev.adamko.kafkatorio.lang.node")
}
// not in use at the moment
kotlin {
js(IR) {
binaries.executable()
@ -31,9 +25,9 @@ kotlin {
dependencies {
val kotlinWrappersVersion = "0.0.1-pre.270-kotlin-1.6.0"
implementation(
project.dependencies.enforcedPlatform(
"org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${kotlinWrappersVersion}"
)
project.dependencies.enforcedPlatform(
"org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${kotlinWrappersVersion}"
)
)
}

View file

@ -28,16 +28,16 @@ val updatePackageJson by tasks.registering(UpdatePackageJson::class) {
group = NodePlugin.NODE_GROUP
description = "Read the package.json file and update the version and name, based on the project."
propertiesToCheck["version"] = "${project.version}"
propertiesToCheck.put("version", "${project.version}")
// check to see if the properties are already up-to-date
onlyIf(!areJsonPropertiesUpToDate(packageJsonFile) { propertiesToCheck })
onlyIf(!areJsonPropertiesUpToDate(packageJsonFile) { propertiesToCheck.get() })
doLast {
val packageJsonContent = packageJsonFile.get().asFile.readText()
val packageJson = jsonMapper.parseToJsonElement(packageJsonContent).jsonObject
val newJsonProps = propertiesToCheck.mapValues { (_, newVal) -> JsonPrimitive(newVal) }
val newJsonProps = propertiesToCheck.get().mapValues { (_, newVal) -> JsonPrimitive(newVal) }
val packageJsonUpdate = JsonObject(packageJson + newJsonProps)
val packageJsonContentUpdated =

View file

@ -2,12 +2,20 @@ package dev.adamko.kafkatorio.task
import org.gradle.api.DefaultTask
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.MapProperty
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.OutputFile
abstract class UpdatePackageJson : DefaultTask() {
@get:Input
val propertiesToCheck: MutableMap<String, String> = mutableMapOf()
abstract val propertiesToCheck: MapProperty<String, String>
@get:OutputFile
abstract val packageJsonFile: RegularFileProperty
init {
super.doFirst {
propertiesToCheck.disallowChanges()
packageJsonFile.disallowChanges()
}
}
}