bump some versions (use Kotest in Maven Local b/c plugin isn't available on Sonatype snapshot)

add tile width/height (added in new version of Factorio)

buildSrc/repositories.settings.gradle.kts

@@ -60,14 +60,25 @@ fun RepositoryHandler.jitpack() {
 }
 
 
-fun RepositoryHandler.myMavenLocal(enabled: Boolean = false) {
+fun RepositoryHandler.myMavenLocal(enabled: Boolean = true) {
   if (enabled) {
     logger.lifecycle("Maven local is enabled")
     mavenLocal {
       content {
-        includeGroup("dev.adamko")
+//        includeGroup("dev.adamko")
-        includeGroup("dev.adamko.kxtsgen")
+//        includeGroup("dev.adamko.kxtsgen")
+        includeGroup("io.kotest")
       }
     }
   }
 }
+
+
+fun RepositoryHandler.sonatypeSnapshot() {
+  maven("https://oss.sonatype.org/content/repositories/snapshots") {
+    mavenContent {
+      snapshotsOnly()
+      includeGroup("io.kotest")
+    }
+  }
+}

buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-multiplatform.gradle.kts

@@ -10,6 +10,7 @@ plugins {
   id("dev.adamko.kafkatorio.base")
 //  id("dev.adamko.kafkatorio.lang.node")
   kotlin("multiplatform")
+  id("io.kotest.multiplatform")
 }
 
 

gradle/libs.versions.toml

@@ -12,12 +12,12 @@ kotlin     = "1.7.10"
 camel-kafkaConnectors = "0.11.0"
 http4k                = "4.25.16.2"
 kafka                 = "3.2.1"         # https://kafka.apache.org/downloads
-kvision               = "5.13.1"
+kvision               = "5.13.1"        # https://github.com/rjaros/kvision/releases
 log4j2                = "2.17.2"
 okio                  = "3.2.0"         # https://search.maven.org/artifact/com.squareup.okio/okio
 qosLogback            = "1.2.11"
 scrimage              = "4.0.31"        # https://github.com/sksamuel/scrimage/releases
-semver                = "1.2.0"
+semver                = "1.2.0"         # https://github.com/swiftzer/semver/releases
 slf4j                 = "1.7.36"
 
 kotlinx-serialization = "1.3.3"         # https://github.com/Kotlin/kotlinx.serialization/releases
@@ -25,7 +25,7 @@ kxs-charleskornKaml   = "0.44.0"
 kxs-mamoeYamlkt       = "0.12.0"
 kxs-kxsTsGen          = "0.2.1"
 
-kotlinJsWrappers      = "1.0.0-pre.359" # https://search.maven.org/artifact/org.jetbrains.kotlin-wrappers/kotlin-wrappers-bom
+kotlinJsWrappers      = "1.0.0-pre.367" # https://search.maven.org/artifact/org.jetbrains.kotlin-wrappers/kotlin-wrappers-bom
 
 kotlinx-cli           = "0.3.4"
 kotlinx-coroutines    = "1.6.4"         # https://github.com/Kotlin/kotlinx.coroutines/releases
@@ -44,21 +44,22 @@ simpleSyslogParser    = "cbf7d86559"    # https://jitpack.io/#palindromicity/sim
 
 kotkaStreams          = "22.08.06"
 
-marykRocksDb          = "7.3.1"         # https://search.maven.org/artifact/io.maryk.rocksdb/rocksdb-multiplatform
+marykRocksDb          = "7.3.1-1"       # https://search.maven.org/artifact/io.maryk.rocksdb/rocksdb-multiplatform
 
 
 ## npm ##
 
 npm-luaTypes        = "2.12.0"
-npm-typescriptToLua = "1.8.2"
+npm-typescriptToLua = "1.9.0"
-npm-typedFactorio   = "1.6.1"
+npm-typedFactorio   = "1.7.0"
 npm-typescript      = "4.7.4"
 
 
 ## test ##
-junit      = "5.8.2"
+junit      = "5.9.0"
-kotest     = "5.3.1"
+#kotest     = "5.4.2"
-mockk      = "1.12.4"
+kotest     = "5.5.0-LOCAL"
+mockk      = "1.12.5"
 
 
 ## infra ##
@@ -261,6 +262,9 @@ kotest-prop             = { group = "io.kotest",  name = "kotest-property"
 kotest-frameworkEngine  = { group = "io.kotest",  name = "kotest-framework-engine"   }
 kotest-runnerJunit5     = { group = "io.kotest",  name = "kotest-runner-junit5"      }
 
+kotestPlugin-embeddedCompiler = { group = "io.kotest",  name = "kotest-framework-multiplatform-plugin-embeddable-compiler" }
+kotestPlugin-multiplatform    = { group = "io.kotest",  name = "kotest-framework-multiplatform-plugin-gradle"              }
+
 ## http4k ##
 http4k-test-chaos    = { group = "org.http4k",  name = "http4k-testing-chaos",     version.ref = "http4k"  }
 http4k-test-approval = { group = "org.http4k",  name = "http4k-testing-approval",  version.ref = "http4k"  }

modules/events-library/build.gradle.kts

@@ -8,7 +8,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   dev.adamko.kafkatorio.lang.`kotlin-multiplatform`
-  id("io.kotest.multiplatform")
   kotlin("plugin.serialization")
   distribution
 }

modules/events-library/src/commonMain/kotlin/dev/adamko/kafkatorio/schema/common/factorioPrototypes.kt

@@ -34,6 +34,8 @@ sealed interface FactorioPrototype {
    * [friendly][mapColourFriend] or [enemy][mapColourEnemy] colour isn't defined or `null`.
    * @param[mapColourFriend] The friendly map colour used when charting this entity.
    * @param[mapColourEnemy] The enemy map colour used when charting this entity.
+   * @param[tileWidth] Tiling size. If odd, center is the center of the tiles. If even, it's on the tile border.
+   * @param[tileHeight] Tiling size. If odd, center is the center of the tiles. If even, it's on the tile border.
    */
   @SerialName("kafkatorio.prototype.Entity")
   @Serializable
@@ -55,10 +57,10 @@ sealed interface FactorioPrototype {
     val miningProperties: MiningProperties? = null,
 
     val collisionBox: MapBoundingBox? = null,
-  ) : FactorioPrototype {
 
-    val tileHeight: Int? get() = collisionBox?.tileHeight
+    val tileWidth: Int? = null,
-    val tileWidth: Int? get() = collisionBox?.tileWidth
+    val tileHeight: Int? = null,
+  ) : FactorioPrototype {
 
     @Serializable
     @SerialName("kafkatorio.prototype.EntityMiningProperties")

modules/events-mod/package-lock.json

@@ -75,9 +75,9 @@
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
     },
     "typed-factorio": {
-      "version": "1.6.1",
+      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.7.0.tgz",
-      "integrity": "sha512-ehxUmRUPO4IEhtXIOkwhosDGGEVgRBFVaoNkTOvko/3yLKwese/6IB1/9ItSRNspqOoNh4UBPscjvQWM3SIFBA=="
+      "integrity": "sha512-i7MLTRW7vQAWTwHZSbX8m+PQm0hnCW/3nCBQI1b0DAikK9a/nJIZWpy2U3C4cnwhNqyNz5p50mLFQiedb/s+ow=="
     },
     "typescript": {
       "version": "4.7.4",
@@ -85,9 +85,9 @@
       "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="
     },
     "typescript-to-lua": {
-      "version": "1.8.2",
+      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.8.2.tgz",
+      "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.9.0.tgz",
-      "integrity": "sha512-2ZFJlF9R9HgTryM+Vwk3X3Dexnvpm5vT75Eh66E0rDFZGK+vW70aqkw6s47/ytdJg/9IyN+Oz7ITUzZxXEOxlA==",
+      "integrity": "sha512-Oj8kutP1u/TSjN9oGUuESfOL+feHMSs7CCxl90C60jWTH+4ZXLtrXlRJTalA3Z2/aHjQXXgPaXQStSXBzAYLow==",
       "requires": {
         "enhanced-resolve": "^5.8.2",
         "resolve": "^1.15.1",

modules/events-mod/package.json

@@ -12,8 +12,8 @@
   "devDependencies": {},
   "dependencies": {
     "lua-types": "2.12.0",
-    "typescript-to-lua": "1.8.2",
+    "typescript-to-lua": "1.9.0",
-    "typed-factorio": "1.6.1",
+    "typed-factorio": "1.7.0",
     "typescript": "4.7.4"
   },
   "license": "UNLICENSED",

modules/events-mod/src/generated/lua/main/events/prototypeUpdates.lua

@@ -43,7 +43,9 @@ function getEntityPrototypes()
             isEntityWithOwner = entity.is_entity_with_owner,
             isMilitaryTarget = entity.is_military_target,
             maxHealth = entity.max_health,
-            collisionBox = Converters.collisionBox(entity.collision_box)
+            collisionBox = Converters.collisionBox(entity.collision_box),
+            tileWidth = entity.tile_width,
+            tileHeight = entity.tile_height
         }
         local ____ = entity.infinite_resource
         if entity.map_color ~= nil then

modules/events-mod/src/main/typescript/generated/kafkatorio-schema.ts

@@ -243,6 +243,8 @@ export namespace FactorioPrototype {
     isMilitaryTarget?: boolean;
     miningProperties?: EntityMiningProperties | null;
     collisionBox?: MapBoundingBox | null;
+    tileWidth?: Int | null;
+    tileHeight?: Int | null;
   }
   
   export interface MapTile {

modules/events-mod/src/main/typescript/main/events/prototypeUpdates.ts

@@ -72,6 +72,9 @@ function getEntityPrototypes(): PrototypesByType<FactorioPrototype.Entity> {
       isMilitaryTarget: entity.is_military_target,
       maxHealth: entity.max_health,
       collisionBox: Converters.collisionBox(entity.collision_box),
+
+      tileWidth: entity.tile_width,
+      tileHeight: entity.tile_height,
     }
     entity.infinite_resource