Fix serialization lib

Author: restingbull

examples/android/libKtAndroid/BUILD.bazel

@@ -47,7 +47,7 @@ kt_android_library(
         "@maven//:androidx_appcompat_appcompat",
         "@maven//:com_google_auto_value_auto_value_annotations",
         "@maven//:com_squareup_moshi_moshi",
-        "@maven//:org_jetbrains_kotlinx_kotlinx_serialization_runtime",
+        "@maven//:org_jetbrains_kotlinx_kotlinx_serialization_core",
     ],
 )
 

examples/deps/.bazelrc

@@ -1,2 +1,4 @@
 common --incompatible_enable_android_toolchain_resolution
+common --enable_workspace=true
+common --enable_bzlmod=false
 common --android_platforms=//:arm64-v8a

src/main/kotlin/io/bazel/kotlin/test/BazelIntegrationTestRunner.kt

@@ -64,22 +64,22 @@ object BazelIntegrationTestRunner {
         workspace,
         "--bazelrc=$bazelrc",
         "info",
-        version.workspaceFlag(bzlmod),
+        *version.workspaceFlag(bzlmod),
         "--override_repository=rules_kotlin=$unpack",
       ).onFailThrow()
       bazel.run(
         workspace,
         "--bazelrc=$bazelrc",
         "build",
-        version.workspaceFlag(bzlmod),
         "--override_repository=rules_kotlin=$unpack",
         "//...",
+        *version.workspaceFlag(bzlmod)
       ).onFailThrow()
       bazel.run(
         workspace,
         "--bazelrc=$bazelrc",
         "query",
-        version.workspaceFlag(bzlmod),
+        *version.workspaceFlag(bzlmod),
         "--override_repository=rules_kotlin=$unpack",
         "kind(\".*_test\", \"//...\")",
       ).ok { process ->
@@ -88,7 +88,7 @@ object BazelIntegrationTestRunner {
             workspace,
             "--bazelrc=$bazelrc",
             "test",
-            version.workspaceFlag(bzlmod),
+            *version.workspaceFlag(bzlmod),
             "--override_repository=rules_kotlin=$unpack",
             "--test_output=all",
             "//...",
@@ -105,7 +105,7 @@ object BazelIntegrationTestRunner {
   sealed class Version {
     abstract fun resolveBazelRc(workspace: Path): Path;
 
-    abstract fun workspaceFlag(isBzlMod: Boolean): String
+    abstract fun workspaceFlag(isBzlMod: Boolean): Array<String>
 
     class Head : Version() {
       override fun resolveBazelRc(workspace: Path): Path {
@@ -118,11 +118,7 @@ object BazelIntegrationTestRunner {
         return workspace.resolve("/dev/null")
       }
 
-      override fun workspaceFlag(isBzlMod: Boolean): String = if (isBzlMod) {
-        "--enable_bzlmod=true"
-      } else {
-        "--enable_workspace=true"
-      }
+      override fun workspaceFlag(isBzlMod: Boolean): Array<String> = arrayOf("--enable_bzlmod=$isBzlMod", "--enable_workspace=${!isBzlMod}")
     }
 
     class Known(private val major: Int, private val minor: Int, private val patch: Int) :
@@ -142,12 +138,12 @@ object BazelIntegrationTestRunner {
         return workspace.resolve("/dev/null")
       }
 
-      override fun workspaceFlag(isBzlMod: Boolean): String = if (isBzlMod) {
-        "--enable_bzlmod=true"
+      override fun workspaceFlag(isBzlMod: Boolean): Array<String> = if (isBzlMod) {
+        arrayOf("--enable_bzlmod=true")
       } else if (major >= 7) {
-        "--enable_workspace=true"
+        arrayOf("--enable_workspace=true", "--enable_bzlmod=false")
       } else {
-        "--enable_bzlmod=false"
+        arrayOf("--enable_bzlmod=false")
       }
     }
   }