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

migrate buildSrc plugins to includedBuild plugins

Browse source
This commit is contained in:
Adam 2022-09-18 20:49:32 +02:00
parent 805d4c8170
commit f12a505d22
40 changed files with 159 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/events-library/build.gradle.kts
View file

@ -1,13 +1,13 @@
import dev.adamko.kafkatorio.gradle.asProvider
import dev.adamko.kafkatorio.gradle.typescriptAttributes
import dev.adamko.kafkatorio.task.GenerateTypeScriptTask
import kafkatorio.distributions.asProvider
import kafkatorio.distributions.typescriptAttributes
import kafkatorio.tasks.GenerateTypeScriptTask
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
dev.adamko.kafkatorio.lang.`kotlin-multiplatform`
id("kafkatorio.conventions.lang.kotlin-multiplatform")
kotlin("plugin.serialization")
distribution
}

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

@ -1,9 +1,9 @@
import dev.adamko.kafkatorio.factoriomod.portal.FactorioModPublishTask
import dev.adamko.kafkatorio.gradle.asConsumer
import dev.adamko.kafkatorio.gradle.asProvider
import dev.adamko.kafkatorio.gradle.factorioModAttributes
import dev.adamko.kafkatorio.gradle.typescriptAttributes
import dev.adamko.kafkatorio.task.TypescriptToLuaTask
import kafkatorio.distributions.asConsumer
import kafkatorio.distributions.asProvider
import kafkatorio.distributions.factorioModAttributes
import kafkatorio.distributions.typescriptAttributes
import kafkatorio.tasks.TypescriptToLuaTask
import kotlinx.serialization.json.put
import kotlinx.serialization.json.putJsonObject
import net.swiftzer.semver.SemVer
@ -12,7 +12,7 @@ import org.gradle.plugins.ide.idea.model.Module as IdeaImlModule
import org.gradle.plugins.ide.idea.model.Path as IdeaImlPath
plugins {
dev.adamko.kafkatorio.lang.node
id("kafkatorio.conventions.lang.node")
distribution
}

2
modules/events-processor-core/build.gradle.kts
View file

@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
dev.adamko.kafkatorio.lang.`kotlin-jvm`
id("kafkatorio.conventions.lang.kotlin-jvm")
kotlin("plugin.serialization")
// application
}

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

@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
dev.adamko.kafkatorio.lang.`kotlin-jvm`
id("kafkatorio.conventions.lang.kotlin-jvm")
kotlin("plugin.serialization")
application
}

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

@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
dev.adamko.kafkatorio.lang.`kotlin-jvm`
id("kafkatorio.conventions.lang.kotlin-jvm")
kotlin("plugin.serialization")
application
}

2
modules/events-server-web/build.gradle.kts
View file

@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
dev.adamko.kafkatorio.lang.`kotlin-jvm`
id("kafkatorio.conventions.lang.kotlin-jvm")
kotlin("plugin.serialization")
application
}

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

@ -1,5 +1,5 @@
import dev.adamko.kafkatorio.task.DockerEnvUpdateTask
import dev.adamko.kafkatorio.task.KafkaConsumerGroupsTask
import kafkatorio.tasks.DockerEnvUpdateTask
import kafkatorio.tasks.KafkaConsumerGroupsTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

10
modules/infra-factorio-client/build.gradle.kts
View file

@ -1,13 +1,13 @@
import dev.adamko.kafkatorio.factoriomod.FactorioMod
import dev.adamko.kafkatorio.gradle.asConsumer
import dev.adamko.kafkatorio.gradle.factorioModAttributes
import dev.adamko.kafkatorio.gradle.not
import dev.adamko.kafkatorio.task.ProcessRunningSpec
import kafkatorio.distributions.asConsumer
import kafkatorio.distributions.factorioModAttributes
import kafkatorio.extensions.not
import kafkatorio.tasks.ProcessRunningSpec
import org.gradle.kotlin.dsl.support.serviceOf
import org.jetbrains.kotlin.util.parseSpaceSeparatedArgs
plugins {
dev.adamko.kafkatorio.infra.`process-runner`
id("kafkatorio.conventions.infra.process-runner")
}
description = "Start the Factorio game client"

6
modules/infra-factorio-server/build.gradle.kts
View file

@ -1,10 +1,10 @@
import dev.adamko.kafkatorio.factoriomod.FactorioMod
import dev.adamko.kafkatorio.gradle.asConsumer
import dev.adamko.kafkatorio.gradle.factorioModAttributes
import kafkatorio.distributions.asConsumer
import kafkatorio.distributions.factorioModAttributes
import org.jetbrains.kotlin.util.parseSpaceSeparatedArgs
plugins {
dev.adamko.kafkatorio.infra.`docker-compose`
id("kafkatorio.conventions.infra.docker-compose")
}

2
modules/infra-kafka-cluster/build.gradle.kts
View file

@ -1,5 +1,5 @@
plugins {
dev.adamko.kafkatorio.infra.`docker-compose`
id("kafkatorio.conventions.infra.docker-compose")
}
description = "Kafka cluster"

4
modules/infra-kafka-pipe/build.gradle.kts
View file

@ -1,7 +1,7 @@
import dev.adamko.kafkatorio.task.DockerComposeExec
import kafkatorio.tasks.DockerComposeExec
plugins {
dev.adamko.kafkatorio.infra.`docker-compose`
id("kafkatorio.conventions.infra.docker-compose")
}
description = "Send events from a Factorio server to a Kafka topic "

2
modules/kt-rcon/build.gradle.kts
View file

@ -1,5 +1,5 @@
plugins {
dev.adamko.kafkatorio.lang.`kotlin-jvm`
id("kafkatorio.conventions.lang.kotlin-jvm")
}
dependencies {

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

@ -1,11 +1,10 @@
import dev.adamko.kafkatorio.task.DockerEnvUpdateTask
import kafkatorio.tasks.DockerEnvUpdateTask
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
plugins {
dev.adamko.kafkatorio.lang.`kotlin-js`
// dev.adamko.kafkatorio.lang.`kotlin-multiplatform`
id("kafkatorio.conventions.lang.kotlin-js")
id("io.kvision")
kotlin("plugin.serialization")
}
@ -35,9 +34,7 @@ kotlin {
),
"/kafkatorio/ws" to mapOf(
"target" to "ws://localhost:12080",
// "secure" to false,
"ws" to true,
// "changeOrigin" to true,
),
),
// static = mutableListOf("$buildDir/processedResources/frontend/main")
@ -53,15 +50,12 @@ kotlin {
}
}
}
// compilations["main"].packageJson {
// this.devDependencies["webpack-dev-server"] = "4.9.1"
// }
}
sourceSets {
all {
languageSettings.apply {
configureEach {
languageSettings {
optIn("kotlin.RequiresOptIn")
optIn("kotlinx.serialization.ExperimentalSerializationApi")
}
@ -93,18 +87,6 @@ kotlin {
kvision("kvision-redux")
kvision("kvision-state-flow")
kvision("kvision-routing-navigo-ng")
// implementation(devNpm("http-proxy-middleware", "^2.0.6"))
// implementation(dependencies.platform(devNpm("http-proxy-middleware", "^2.0.6")))
// implementation(dependencies.platform(npm("follow-redirects", "^1.14.8")))
// implementation(dependencies.platform(npm("nanoid", "^3.1.31")))
// implementation(dependencies.platform(npm("minimist", "^1.2.6")))
// implementation(dependencies.platform(npm("async", "^2.6.4")))
// implementation(dependencies.platform(npm("node-forge", "^1.3.0")))
// implementation(dependencies.platform(npm("socket.io", "^4.5.1")))
// implementation(dependencies.platform(devNpm("http-proxy-middleware", "^3.0.0-beta.0")))
// implementation(dependencies.platform(devNpm("webpack-dev-server", "4.9.1")))
}
resources.srcDir("src/main/web")
@ -133,21 +115,6 @@ fun KotlinDependencyHandler.kvision(
implementation("io.kvision:$module:${version.get()}", configure)
}
////// https://youtrack.jetbrains.com/issue/KT-42420
//afterEvaluate {
// yarn {
//// resolution("mocha", "9.2.2")
//// resolution("follow-redirects", "1.14.8")
//// resolution("nanoid", "3.1.31")
//// resolution("minimist", "1.2.6")
//// resolution("async", "2.6.4")
//// resolution("node-forge", "1.3.0")
//// resolution("socket.io", "^4.5.1")
//// resolution("http-proxy-middleware", "^3.0.0-beta.0")
// resolution("webpack-dev-server", "4.9.1")
// }
//}
val dockerEnvUpdate by tasks.registering(DockerEnvUpdateTask::class) {
dotEnvFile.set(layout.projectDirectory.file("docker/.env"))
@ -155,6 +122,7 @@ val dockerEnvUpdate by tasks.registering(DockerEnvUpdateTask::class) {
properties(
"COMPOSE_PROJECT_NAME" to rootProject.name,
"KAFKATORIO_VERSION" to project.version,
"REGISTRY_HOST" to "dcr.adamko.dev:5000",
)
}
tasks.assemble { dependsOn(dockerEnvUpdate) }
@ -178,11 +146,6 @@ tasks.matching { it.name == "processResources" }.configureEach {
}
tasks.withType<io.kvision.gradle.tasks.KVConvertPoTask>().configureEach {
enabled = false
}
val runWebMap by tasks.registering {
group = rootProject.name