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

some version bumps, and renaming

Browse source
This commit is contained in:
Adam 2021-12-10 20:38:52 +01:00
parent ca40d8bd3e
commit adf55cb263
11 changed files with 33 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -6,7 +6,7 @@ plugins {
} }
group = "dev.adamko.kafkatorio" group = "dev.adamko.kafkatorio"
version = "0.1.2" version = "0.1.3"
val licenseFile: RegularFile by extra(layout.projectDirectory.file("LICENSE")) val licenseFile: RegularFile by extra(layout.projectDirectory.file("LICENSE"))

6
buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts
View file

@ -25,11 +25,11 @@ val dockerDown by tasks.creating(Exec::class) {
} }
afterEvaluate { afterEvaluate {
tasks.named("processRun") { dependsOn(dockerUp, updateEnv) } tasks.named("processRun") { dependsOn(dockerUp, dockerEnv) }
tasks.named("processKill") { dependsOn(dockerDown) } tasks.named("processKill") { dependsOn(dockerDown) }
} }
val updateEnv by tasks.registering(WriteProperties::class) { val dockerEnv by tasks.registering(WriteProperties::class) {
group = dockerComposeTaskGroup group = dockerComposeTaskGroup
setOutputFile(srcDir.file(".env")) setOutputFile(srcDir.file(".env"))
@ -38,4 +38,4 @@ val updateEnv by tasks.registering(WriteProperties::class) {
) )
} }
tasks.assemble { dependsOn(updateEnv) } tasks.assemble { dependsOn(dockerEnv) }

12
buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts
View file

@ -21,23 +21,23 @@ dependencies {
//<editor-fold desc="Main"> //<editor-fold desc="Main">
implementation(platform("org.jetbrains.kotlin:kotlin-bom")) implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation(kotlin("stdlib")) // implementation(kotlin("stdlib"))
//</editor-fold> //</editor-fold>
//<editor-fold desc="Test"> //<editor-fold desc="Test">
val junitVersion = "5.8.1" val junitVersion = "5.8.2"
testImplementation(enforcedPlatform("org.junit:junit-bom:$junitVersion")) testImplementation(enforcedPlatform("org.junit:junit-bom:$junitVersion"))
testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-api")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testRuntimeOnly("org.junit.platform:junit-platform-launcher") testRuntimeOnly("org.junit.platform:junit-platform-launcher")
val kotestVersion = "4.6.3" val kotestVersion = "5.0.1"
testImplementation(enforcedPlatform("io.kotest:kotest-bom:$kotestVersion")) testImplementation(enforcedPlatform("io.kotest:kotest-bom:$kotestVersion"))
testImplementation("io.kotest:kotest-runner-junit5-jvm:$kotestVersion") testImplementation("io.kotest:kotest-runner-junit5:$kotestVersion")
testImplementation("io.kotest:kotest-assertions-core-jvm:$kotestVersion") testImplementation("io.kotest:kotest-assertions-core:$kotestVersion")
testImplementation("io.kotest:kotest-property-jvm:$kotestVersion") testImplementation("io.kotest:kotest-property:$kotestVersion")
testImplementation("io.kotest:kotest-assertions-json:$kotestVersion") testImplementation("io.kotest:kotest-assertions-json:$kotestVersion")
testImplementation("io.mockk:mockk:1.12.0") testImplementation("io.mockk:mockk:1.12.0")

2
gradle/libs.versions.toml
View file

@ -22,7 +22,7 @@ junit = "5.8.2"
kotest = "5.0.1" kotest = "5.0.1"
## infra ## ## infra ##
factorio = "1.1.48" factorio = "1.1.49"
######### #########
[plugins] [plugins]

24
modules/events-mod/src/main/typescript/package-lock.json generated
View file

@ -1,6 +1,6 @@
{ {
"name": "kafkatorio-events-mod", "name": "kafkatorio-events-mod",
"version": "0.1.2", "version": "0.1.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -74,23 +74,19 @@
"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
}, },
"typed-factorio": { "typed-factorio": {
"version": "0.12.0", "version": "0.13.0",
"resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-0.12.0.tgz", "resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-0.13.0.tgz",
"integrity": "sha512-7SeZX7TvWjtO+V5buWEgHUbhi7tSNZsHGveh5uPQ6Vvr7BDEhHre9DP3OrdD+L7cpAtvJ2w9OwaMnDm2P5dvng==", "integrity": "sha512-a6z8pciAtBQ+FXMJYUI1YqL/zhtFeEW2370rpuxZSaP6RdfWpZ98Vu8Hl19t98h+ULLXnmWsC/g6OW/TJcLbAQ=="
"requires": {
"lua-types": "^2.10.1",
"typescript-to-lua": "^1.0.0"
}
}, },
"typescript": { "typescript": {
"version": "4.4.4", "version": "4.5.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
"integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==" "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw=="
}, },
"typescript-to-lua": { "typescript-to-lua": {
"version": "1.1.1", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.1.1.tgz", "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.2.0.tgz",
"integrity": "sha512-13vk/FSQyqbBkXNvg73LpT0tsPKdepJHPYR6TNtbc9l1ClSxAEUvkB3k49MAwSQ6LoN8Ui4Bgyu9dKFoDB315Q==", "integrity": "sha512-hbAagI6DgP4MjaPKqGlxtiD/rsZE5hO9ypIz96xukKIjzxp5c/TSItik0BMriX5yIIhRiYLfyAQBp+X1cO8MkQ==",
"requires": { "requires": {
"enhanced-resolve": "^5.8.2", "enhanced-resolve": "^5.8.2",
"resolve": "^1.15.1", "resolve": "^1.15.1",

11
modules/events-mod/src/main/typescript/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "kafkatorio-events-mod", "name": "kafkatorio-events-mod",
"version": "0.1.2", "version": "0.1.3",
"private": true, "private": true,
"scripts": { "scripts": {
"build": "tstl", "build": "tstl",
@ -13,12 +13,9 @@
"dependencies": { "dependencies": {
"lua-types": "^2.11.0", "lua-types": "^2.11.0",
"@types/node": "^12.0.8", "@types/node": "^12.0.8",
"typescript-to-lua": "1.1.1", "typescript-to-lua": "1.2.0",
"typed-factorio": "0.12.0", "typed-factorio": "0.13.0",
"typescript": "4.4.4" "typescript": "4.5.2"
},
"//": {
"typed-factorio": "0.10.0"
}, },
"license": "UNLICENSED", "license": "UNLICENSED",
"peerDependencies": {}, "peerDependencies": {},

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

@ -43,7 +43,7 @@ tasks.dockerUp {
) )
} }
tasks.updateEnv { tasks.dockerEnv {
properties("FACTORIO_VERSION" to libs.versions.factorio.get()) properties("FACTORIO_VERSION" to libs.versions.factorio.get())
} }

4
modules/infra-factorio-server/src/.env
View file

@ -1,3 +1,3 @@
# Do not edit manually. This file was created with task 'updateEnv' # Do not edit manually. This file was created with task 'dockerEnv'
COMPOSE_PROJECT_NAME=kafkatorio COMPOSE_PROJECT_NAME=kafkatorio
FACTORIO_VERSION=1.1.48 FACTORIO_VERSION=1.1.49

2
modules/infra-kafka-cluster/src/.env
View file

@ -1,2 +1,2 @@
# Do not edit manually. This file was created with task 'updateEnv' # Do not edit manually. This file was created with task 'dockerEnv'
COMPOSE_PROJECT_NAME=kafkatorio COMPOSE_PROJECT_NAME=kafkatorio

2
modules/infra-kafka-pipe/src/.env
View file

@ -1,2 +1,2 @@
# Do not edit manually. This file was created with task 'updateEnv' # Do not edit manually. This file was created with task 'dockerEnv'
COMPOSE_PROJECT_NAME=kafkatorio COMPOSE_PROJECT_NAME=kafkatorio

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

@ -52,12 +52,14 @@ kotlin {
implementation("io.kvision:kvision-state:$kvisionVersion") implementation("io.kvision:kvision-state:$kvisionVersion")
implementation("io.kvision:kvision-chart:$kvisionVersion") implementation("io.kvision:kvision-chart:$kvisionVersion")
val kotlinWrappersVersion = "0.0.1-pre.270-kotlin-1.6.0" val kotlinWrappersVersion = "0.0.1-pre.276-kotlin-1.6.0"
implementation( implementation(
project.dependencies.enforcedPlatform( project.dependencies.enforcedPlatform(
"org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${kotlinWrappersVersion}" "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${kotlinWrappersVersion}"
) )
) )
implementation(npm("kafkajs", "1.15.0"))
} }
val webDir = file("src/main/web") val webDir = file("src/main/web")