From 5fcb831df2ab81ef88916b044536759689d92691 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Wed, 6 Jul 2022 17:16:09 +0200 Subject: [PATCH] use version platform more, try fixing projects must be configuring bug --- modules/events-library/build.gradle.kts | 15 +++++++-------- .../kafkatorio/events/schema/UpdatePacketsTest.kt | 3 +-- .../kafkatorio/schema/packets/EntityUpdateTest.kt | 6 ++---- modules/events-mod/build.gradle.kts | 2 -- modules/versions-platform/build.gradle.kts | 3 +++ modules/web-map/build.gradle.kts | 5 +++-- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/modules/events-library/build.gradle.kts b/modules/events-library/build.gradle.kts index bd304c5..107c99e 100644 --- a/modules/events-library/build.gradle.kts +++ b/modules/events-library/build.gradle.kts @@ -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 { } } } } diff --git a/modules/events-library/src/commonTest/kotlin/dev/adamko/kafkatorio/events/schema/UpdatePacketsTest.kt b/modules/events-library/src/commonTest/kotlin/dev/adamko/kafkatorio/events/schema/UpdatePacketsTest.kt index e480379..605874e 100644 --- a/modules/events-library/src/commonTest/kotlin/dev/adamko/kafkatorio/events/schema/UpdatePacketsTest.kt +++ b/modules/events-library/src/commonTest/kotlin/dev/adamko/kafkatorio/events/schema/UpdatePacketsTest.kt @@ -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] diff --git a/modules/events-library/src/commonTest/kotlin/dev/adamko/kafkatorio/schema/packets/EntityUpdateTest.kt b/modules/events-library/src/commonTest/kotlin/dev/adamko/kafkatorio/schema/packets/EntityUpdateTest.kt index 47c3552..061ccbb 100644 --- a/modules/events-library/src/commonTest/kotlin/dev/adamko/kafkatorio/schema/packets/EntityUpdateTest.kt +++ b/modules/events-library/src/commonTest/kotlin/dev/adamko/kafkatorio/schema/packets/EntityUpdateTest.kt @@ -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 diff --git a/modules/events-mod/build.gradle.kts b/modules/events-mod/build.gradle.kts index e1d4cd7..6953c71 100644 --- a/modules/events-mod/build.gradle.kts +++ b/modules/events-mod/build.gradle.kts @@ -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) } diff --git a/modules/versions-platform/build.gradle.kts b/modules/versions-platform/build.gradle.kts index 54222d2..c1f3914 100644 --- a/modules/versions-platform/build.gradle.kts +++ b/modules/versions-platform/build.gradle.kts @@ -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) diff --git a/modules/web-map/build.gradle.kts b/modules/web-map/build.gradle.kts index 97082ac..091ccfb 100644 --- a/modules/web-map/build.gradle.kts +++ b/modules/web-map/build.gradle.kts @@ -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 = libs.versions.kvision,