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

use version platform more, try fixing projects must be configuring bug

Browse source
This commit is contained in:
Adam 2022-07-06 17:16:09 +02:00
parent c29b66aada
commit 5fcb831df2
6 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,27 +50,24 @@ kotlin {
val commonMain by getting {
dependencies {
implementation(project.dependencies.platform(libs.kotlin.bom))
implementation(dependencies.platform(projects.modules.versionsPlatform))
implementation(project.dependencies.platform(libs.kotlinx.serialization.bom))
implementation(libs.kotlinx.serialization.core)
implementation(libs.kotlinx.serialization.json)
api(libs.kxs.kxsTsGen)
implementation(dependencies.platform(libs.okio.bom))
implementation(libs.okio.core)
implementation(dependencies.platform(libs.kotlinx.coroutines.bom))
implementation(libs.kotlinx.coroutines.core)
}
}
val commonTest by getting {
dependencies {
implementation(dependencies.platform(projects.modules.versionsPlatform))
implementation(kotlin("test"))
implementation(project.dependencies.platform(libs.kotest.bom))
implementation(libs.kotest.core)
implementation(libs.kotest.datatest)
implementation(libs.kotest.frameworkEngine)
@ -81,20 +78,22 @@ kotlin {
val jvmMain by getting {
dependencies {
implementation(dependencies.platform(projects.modules.versionsPlatform))
implementation(kotlin("reflect"))
}
}
val jvmTest by getting {
dependencies {
implementation(dependencies.platform(projects.modules.versionsPlatform))
implementation(libs.kotest.runnerJunit5)
}
}
val jsTest by getting {
dependencies {
// implementation(kotlin("test-js"))
}
dependencies { }
}
}
}

3
modules/events-library/src/commonTest/kotlin/dev/adamko/kafkatorio/events/schema/UpdatePacketsTest.kt
View file

@ -167,8 +167,7 @@ class UpdatePacketsTest : FunSpec({
"isConnected": true,
"diedCause": {
"unitNumber": 66,
"name": "small-biter",
"protoType": "unit"
"protoId": "unit/small-biter"
},
"events": {
"on_player_died": [2]

6
modules/events-library/src/commonTest/kotlin/dev/adamko/kafkatorio/schema/packets/EntityUpdateTest.kt
View file

@ -14,8 +14,7 @@ class EntityUpdateTest : FunSpec({
"data": {
"type": "kafkatorio.packet.keyed.EntityUpdate",
"key": {
"name": "assembling-machine-2",
"protoType": "assembling-machine-2",
"protoId": "entity/assembling-machine-2",
"unitNumber": 4622
},
"events": {
@ -30,8 +29,7 @@ class EntityUpdateTest : FunSpec({
"health": 350,
"isActive": true,
"isRotatable": true,
"lastUser": 1,
"prototype": "assembling-machine-2"
"lastUser": 1
},
"modVersion": "0.4.0",
"tick": 38388

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

@ -1,7 +1,6 @@
import dev.adamko.kafkatorio.factoriomod.portal.FactorioModPublishTask
import dev.adamko.kafkatorio.gradle.asConsumer
import dev.adamko.kafkatorio.gradle.asProvider
import dev.adamko.kafkatorio.gradle.dropDirectory
import dev.adamko.kafkatorio.gradle.factorioModAttributes
import dev.adamko.kafkatorio.gradle.typescriptAttributes
import dev.adamko.kafkatorio.task.TypescriptToLuaTask
@ -51,7 +50,6 @@ val projectTokensX1 = projectTokens.apply {
val tsSrcDir: Directory = layout.projectDirectory.dir("src/main/typescript")
node {
nodeProjectDir.set(layout.projectDirectory)
}

3
modules/versions-platform/build.gradle.kts
View file

@ -12,6 +12,8 @@ dependencies {
api(platform(libs.kotlin.bom))
api(platform(libs.kotlinx.coroutines.bom))
api(platform(libs.kotlinx.serialization.bom))
api(platform(libs.kotlin.jsWrappers.bom))
api(platform(libs.http4k.bom))
@ -28,6 +30,7 @@ dependencies {
api(libs.kxs.charleskornKaml)
api(libs.kxs.mamoeYamlkt)
api(libs.kxs.kxsTsGen)
api(libs.okio.core)

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

@ -66,10 +66,10 @@ kotlin {
}
}
main {
dependencies {
implementation(dependencies.platform(libs.kotlinx.coroutines.bom))
implementation(dependencies.platform(libs.kotlin.jsWrappers.bom))
implementation(dependencies.platform(projects.modules.versionsPlatform))
implementation(libs.kotlinx.coroutines.core)
@ -119,6 +119,7 @@ kotlin {
}
}
fun KotlinDependencyHandler.kvision(
module: String,
version: Provider<String> = libs.versions.kvision,