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

apply geedeecee plugin, or update config. Update kvision dependency helper.

Browse source
This commit is contained in:
Adam 2022-10-04 22:38:00 +02:00
parent 002aa9b5fb
commit b61ee6bf5c
3 changed files with 28 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/events-processors/build.gradle.kts
View file

@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
id("kafkatorio.conventions.lang.kotlin-jvm") id("kafkatorio.conventions.lang.kotlin-jvm")
id("dev.adamko.geedeecee")
kotlin("plugin.serialization") kotlin("plugin.serialization")
application application
} }
@ -75,7 +76,6 @@ tasks.withType<KotlinCompile>().configureEach {
//} //}
tasks.named("run") { tasks.named("run") {
val kafkaStateDir: Directory = layout.projectDirectory.dir(".state/kafka/") val kafkaStateDir: Directory = layout.projectDirectory.dir(".state/kafka/")
doFirst { doFirst {
@ -89,3 +89,7 @@ val runEventsProcessors by tasks.registering {
dependsOn(tasks.run) dependsOn(tasks.run)
} }
tasks.dockerComposeBuild {
dependsOn(tasks.distTar)
}

4
modules/events-server-syslog/build.gradle.kts
View file

@ -87,3 +87,7 @@ val runSyslogServer by tasks.registering {
group = rootProject.name group = rootProject.name
dependsOn(tasks.run) dependsOn(tasks.run)
} }
tasks.dockerComposeBuild {
dependsOn(tasks.distTar)
}

52
modules/web-map/build.gradle.kts
View file

@ -1,6 +1,6 @@
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
import dev.adamko.geedeecee.DockerEnvUpdateTask.Companion.put
plugins { plugins {
id("kafkatorio.conventions.lang.kotlin-js") id("kafkatorio.conventions.lang.kotlin-js")
@ -75,18 +75,18 @@ kotlin {
implementation(libs.kotlinx.nodejs) implementation(libs.kotlinx.nodejs)
implementation(libs.kotlinx.html) implementation(libs.kotlinx.html)
kvision("kvision") implementation(kvision())
kvision("kvision-bootstrap") implementation(kvision("bootstrap"))
kvision("kvision-bootstrap-css") implementation(kvision("bootstrap-css"))
kvision("kvision-bootstrap-icons") implementation(kvision("bootstrap-icons"))
kvision("kvision-fontawesome") implementation(kvision("fontawesome"))
kvision("kvision-state") implementation(kvision("state"))
kvision("kvision-chart") implementation(kvision("chart"))
kvision("kvision-maps") implementation(kvision("maps"))
kvision("kvision-rest") implementation(kvision("rest"))
kvision("kvision-redux") implementation(kvision("redux"))
kvision("kvision-state-flow") implementation(kvision("state-flow"))
kvision("kvision-routing-navigo-ng") implementation(kvision("routing-navigo-ng"))
} }
resources.srcDir("src/main/web") resources.srcDir("src/main/web")
@ -97,7 +97,7 @@ kotlin {
dependencies { dependencies {
implementation(kotlin("test")) implementation(kotlin("test"))
kvision("kvision-testutils") implementation(kvision("testutils"))
// implementation(npm("karma", "^6.3.16")) // implementation(npm("karma", "^6.3.16"))
} }
} }
@ -105,29 +105,15 @@ kotlin {
} }
@Suppress("UnusedReceiverParameter") // just for scoping - this function doesn't need to be used everywhere
fun KotlinDependencyHandler.kvision( fun KotlinDependencyHandler.kvision(
module: String, module: String? = null,
version: Provider<String> = libs.versions.kvision, version: Provider<String> = libs.versions.kvision,
configure: ExternalModuleDependency.() -> Unit = { ): String {
// isChanging = true val prefixedModule = if (module == null) "kvision" else "kvision-$module"
} return "io.kvision:$prefixedModule:${version.get()}"
) {
implementation("io.kvision:$module:${version.get()}", configure)
} }
geedeecee {
srcDir.set(layout.projectDirectory.dir("docker"))
}
tasks.dockerComposeEnvUpdate {
envProperties {
put("KAFKATORIO_VERSION" to project.version.toString())
put("REGISTRY_HOST" to "dcr.adamko.dev:5000")
}
}
tasks.assemble { dependsOn(tasks.dockerComposeEnvUpdate) }
val installThemeCss by tasks.registering(Copy::class) { val installThemeCss by tasks.registering(Copy::class) {
val bootswatchThemeMinCss = resources.text.fromUri( val bootswatchThemeMinCss = resources.text.fromUri(