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

Gradle version bump, and fiddling with some gradle config. Add a 'hardReset' Gradle task. Add a 'docker remove' task.

Browse source
This commit is contained in:
Adam 2022-03-09 21:40:40 +01:00
parent a9782a4d90
commit e630ce3702
19 changed files with 77 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,7 @@ dependencies {
implementation("com.sksamuel.scrimage:scrimage-core:4.0.24")
val kotkaVersion = "v0.0.12"
val kotkaVersion = "v0.0.13"
implementation("com.github.adamko-dev.kotka-streams:kotka-streams:$kotkaVersion") {
isChanging = true
}

2
modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/serdes/kxsBinary.kt
View file

@ -98,7 +98,7 @@ class KxsDataOutputEncoder(
class KxsDataInputDecoder(
private val input: DataInput,
override val serializersModule: SerializersModule = EmptySerializersModule,
var elementsCount: Int = 0,
private var elementsCount: Int = 0,
) : AbstractDecoder() {
private var elementIndex = 0

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

@ -5,7 +5,7 @@ import dev.adamko.kafkatorio.gradle.not
import org.jetbrains.kotlin.util.parseSpaceSeparatedArgs
plugins {
id("dev.adamko.kafkatorio.infra.process-runner")
dev.adamko.kafkatorio.infra.`process-runner`
}
description = "Start the Factorio game client"

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

@ -3,7 +3,7 @@ import dev.adamko.kafkatorio.gradle.factorioModAttributes
import org.jetbrains.kotlin.util.parseSpaceSeparatedArgs
plugins {
id("dev.adamko.kafkatorio.infra.docker-compose")
dev.adamko.kafkatorio.infra.`docker-compose`
}
val dockerSrcDir: Directory by extra
@ -57,3 +57,17 @@ idea {
excludeDirs.add(file("src/factorio-server"))
}
}
tasks.hardReset {
dependsOn(tasks.dockerRemove)
delete(
factorioServerDataDir.dir("saves"),
factorioServerDataDir.dir("temp"),
factorioServerDataDir.file("factorio-current.log"),
factorioServerDataDir.file("factorio-previous.log"),
factorioServerDataDir.file(".lock"),
)
}

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

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

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

@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.util.parseSpaceSeparatedArgs
plugins {
id("dev.adamko.kafkatorio.infra.docker-compose")
id("dev.adamko.kafkatorio.lang.kotlin-jvm")
dev.adamko.kafkatorio.infra.`docker-compose`
dev.adamko.kafkatorio.lang.`kotlin-jvm`
}
val dockerSrcDir: Directory by extra(layout.projectDirectory.dir("src/main/docker"))

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

@ -2,7 +2,7 @@ import org.jetbrains.kotlin.incremental.md5
import org.jetbrains.kotlin.util.parseSpaceSeparatedArgs
plugins {
id("dev.adamko.kafkatorio.infra.docker-compose")
dev.adamko.kafkatorio.infra.`docker-compose`
}
description = "Send events from a Factorio server to a Kafka topic "

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

@ -1,5 +1,5 @@
plugins {
id("dev.adamko.kafkatorio.lang.kotlin-jvm")
dev.adamko.kafkatorio.lang.`kotlin-jvm`
}
//group = "${rootProject.group}.server"
@ -14,4 +14,4 @@ dependencies {
implementation("io.ktor:ktor-network:1.6.4")
}
}

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

@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
plugins {
id("dev.adamko.kafkatorio.lang.kotlin-js")
dev.adamko.kafkatorio.lang.`kotlin-js`
kotlin("plugin.serialization")
id("io.kvision")
}
@ -39,8 +39,10 @@ kotlin {
sourceSets {
all {
languageSettings.optIn("kotlin.RequiresOptIn")
languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
languageSettings.apply {
optIn("kotlin.RequiresOptIn")
optIn("kotlinx.serialization.ExperimentalSerializationApi")
}
}
main {