Update runner to use override_module when correct

Author: restingbull

examples/associates/WORKSPACE

@@ -16,13 +16,6 @@ kt_register_toolchains()
 
 load("@rules_kotlin//src/main/starlark/core/repositories:versions.bzl", "versions")
 
-http_archive(
-    name = "rules_android",
-    sha256 = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
-    strip_prefix = "rules_android-0.1.1",
-    urls = ["https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip"],
-)
-
 http_archive(
     name = "bazel_skylib",
     sha256 = versions.SKYLIB_SHA,
@@ -52,9 +45,3 @@ maven_install(
         "https://repo1.maven.org/maven2",
     ],
 )
-
-http_archive(
-    name = "rules_pkg",
-    sha256 = "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2",
-    url = "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz",
-)

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

@@ -60,6 +60,7 @@ object BazelIntegrationTestRunner {
       bzlmod && workspace.hasModule() || !bzlmod && workspace.hasWorkspace()
     }.forEach { bzlmod ->
       println("Starting bzlmod $bzlmod test")
+      val overrideFlag = if (bzlmod) "--override_module=rules_kotlin=$unpack" else "--override_repository=rules_kotlin=$unpack"
       bazel.run(
         workspace,
         "--bazelrc=$bazelrc",
@@ -77,13 +78,13 @@ object BazelIntegrationTestRunner {
         "--bazelrc=$bazelrc",
         "info",
         *version.workspaceFlag(bzlmod),
-        "--override_repository=rules_kotlin=$unpack",
+        overrideFlag
       ).onFailThrow()
       bazel.run(
         workspace,
         "--bazelrc=$bazelrc",
         "build",
-        "--override_repository=rules_kotlin=$unpack",
+        overrideFlag,
         "//...",
         *version.workspaceFlag(bzlmod)
       ).onFailThrow()
@@ -92,7 +93,7 @@ object BazelIntegrationTestRunner {
         "--bazelrc=$bazelrc",
         "query",
         *version.workspaceFlag(bzlmod),
-        "--override_repository=rules_kotlin=$unpack",
+        overrideFlag,
         "kind(\".*_test\", \"//...\")",
       ).ok { process ->
         if (process.stdOut.isNotEmpty()) {
@@ -101,7 +102,7 @@ object BazelIntegrationTestRunner {
             "--bazelrc=$bazelrc",
             "test",
             *version.workspaceFlag(bzlmod),
-            "--override_repository=rules_kotlin=$unpack",
+            overrideFlag,
             "--test_output=all",
             "//...",
           ).onFailThrow()