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

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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