align workspace and module versions

.bazelci/presubmit.yml

@@ -9,8 +9,8 @@ matrix:
     # - macos
     # - windows re-enable when rules_bazel_integration_test can support custom test runner on windows.
   test_flags:
-    - ["--enable_bzlmod=true", "--toolchain_resolution_debug=.*"]
-    - ["--config=workspace", ""]
+    - ["--enable_bzlmod=true"]
+    - ["--config=workspace"]
 validate_config: 1
 bazel: 7.3.0
 buildifier:

.bazelrc

@@ -4,8 +4,8 @@ common:rbe --java_runtime_version=11
 common:rbe --tool_java_runtime_version=11
 
 common:workspace --enable_bzlmod=false --enable_workspace=true
-common:workspace --enable_platform_specific_config
-common:workspace --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 --sandbox_add_mount_pair=/tmp
+#common:workspace --enable_platform_specific_config
+#common:workspace --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 --sandbox_add_mount_pair=/tmp
 
 build --strategy=KotlinCompile=worker
 build --test_output=all
@@ -19,7 +19,3 @@ try-import %workspace%/bit-ignore.bazelrc
 
 # User-specific .bazelrc
 try-import %workspace%/user.bazelrc
-
-build:linux --sandbox_add_mount_pair=/tmp
-build:macos --sandbox_add_mount_pair=/var/tmp
-build:windows --sandbox_add_mount_pair=C:\Temp

MODULE.bazel

@@ -117,6 +117,3 @@ use_repo(
     "build_bazel_bazel_6_4_0",
     "build_bazel_bazel_8_0_0-pre_20240206_3",
 )
-
-#bazel_dep(name = "buildkite_config")
-#local_path_override(module_name = "buildkite_config", path = "third_party/buildkite_config")

src/main/starlark/core/plugin/providers.bzl

@@ -15,7 +15,6 @@ KtCompilerPluginInfo = provider(
         "options": "List of plugin options, represented as KtCompilerPluginOption, to be passed to the compiler",
         "resolve_cfg": "A Callable[[KtCompilerPluginInfo, Dict[str,str], List[Target], KtPluginConfiguration]" +
                        " that resolves an associated plugin configuration.",
-        "required_plugins": "Depset of plugins that must be executed before this plugin.",
     },
 )
 

src/main/starlark/core/repositories/download.bzl

@@ -22,13 +22,6 @@ def kt_download_local_dev_dependencies():
 
     Must be called before setup_dependencies in the WORKSPACE.
     """
-
-    versions.use_repository(
-        name = "com_google_protobuf",
-        rule = http_archive,
-        version = versions.COM_GOOGLE_PROTOBUF,
-    )
-
     versions.use_repository(
         name = "rules_proto",
         version = versions.RULES_PROTO,
@@ -45,12 +38,6 @@ def kt_download_local_dev_dependencies():
         version = versions.RULES_CC,
     )
 
-    versions.use_repository(
-        rule = http_archive,
-        name = "hermetic_cc_toolchain",
-        version = versions.HERMETIC_CC_TOOLCHAIN,
-    )
-
     # bazel_skylib is initialized twice during development. This is intentional, as development
     # needs to be able to run the starlark unittests, while production does not.
     maybe(

src/main/starlark/core/repositories/setup.bzl

@@ -14,16 +14,14 @@
 
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 load("@cgrindel_bazel_starlib//:deps.bzl", "bazel_starlib_dependencies")
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
-load("@hermetic_cc_toolchain//toolchain:defs.bzl", zig_toolchains = "toolchains")
 load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories")
 load("@released_rules_kotlin//src/main/starlark/core/repositories:initialize.bzl", release_kotlin_repositories = "kotlin_repositories")
 load("@rules_bazel_integration_test//bazel_integration_test:deps.bzl", "bazel_integration_test_rules_dependencies")
 load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
 load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
+load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
 
 def kt_configure():
     """Setup dependencies. Must be called AFTER kt_download_local_dev_dependencies() """
@@ -39,7 +37,7 @@ def kt_configure():
     rules_cc_toolchains()
 
     rules_proto_dependencies()
-    protobuf_deps()
+    rules_proto_toolchains()
 
     rules_java_dependencies()
     rules_java_toolchains()
@@ -82,8 +80,6 @@ def kt_configure():
 
     rules_cc_dependencies()
     rules_cc_toolchains()
-    zig_toolchains()
-    native.register_toolchains("@zig_sdk//toolchain:all")
 
     rules_pkg_dependencies()
 

src/main/starlark/core/repositories/versions.bzl

@@ -20,8 +20,6 @@ def _use_repository(name, version, rule, **kwargs):
     maybe(rule, name = name, **http_archive_arguments)
 
 versions = struct(
-    RULES_NODEJS_VERSION = "5.5.3",
-    RULES_NODEJS_SHA = "f10a3a12894fc3c9bf578ee5a5691769f6805c4be84359681a785a0c12e8d2b6",
     BAZEL_TOOLCHAINS_VERSION = "4.1.0",
     BAZEL_TOOLCHAINS_SHA = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
     # IMPORTANT! rules_kotlin does not use the bazel_skylib unittest in production
@@ -33,13 +31,11 @@ versions = struct(
     # --> 3. Configure dependencies <--
     SKYLIB_VERSION = "1.4.2",
     SKYLIB_SHA = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa",
-    PROTOBUF_VERSION = "3.11.3",
-    PROTOBUF_SHA = "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
     RULES_JVM_EXTERNAL_TAG = "5.3",
     RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac",
     RULES_PROTO = version(
-        version = "7.0.2",
-        sha256 = "0e5c64a2599a6e26c6a03d6162242d231ecc0de219534c38cb4402171def21e8",
+        version = "5.3.0-21.7",
+        sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
         strip_prefix_template = "rules_proto-{version}",
         url_templates = [
             "https://github.com/bazelbuild/rules_proto/archive/refs/tags/{version}.tar.gz",
@@ -170,26 +166,10 @@ versions = struct(
         ],
     ),
     RULES_CC = version(
-        version = "0.0.15",
+        version = "0.0.9",
         url_templates = ["https://github.com/bazelbuild/rules_cc/releases/download/{version}/rules_cc-{version}.tar.gz"],
-        sha256 = "f4aadd8387f381033a9ad0500443a52a0cea5f8ad1ede4369d3c614eb7b2682e",
+        sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf",
         strip_prefix_template = "rules_cc-{version}",
     ),
-    COM_GOOGLE_PROTOBUF = version(
-        version = "27.1",
-        sha256 = "6fbe2e6f703bcd3a246529c2cab586ca12a98c4e641f5f71d51fde09eb48e9e7",
-        strip_prefix_template = "protobuf-{version}",
-        url_templates = [
-            "https://github.com/protocolbuffers/protobuf/archive/v{version}.tar.gz",
-        ],
-    ),
-    HERMETIC_CC_TOOLCHAIN = version(
-        version = "v3.1.1",
-        sha256 = "907745bf91555f77e8234c0b953371e6cac5ba715d1cf12ff641496dd1bce9d1",
-        url_templates = [
-            "https://mirror.bazel.build/github.com/uber/hermetic_cc_toolchain/releases/download/{version}/hermetic_cc_toolchain-{version}.tar.gz",
-            "https://github.com/uber/hermetic_cc_toolchain/releases/download/{version}/hermetic_cc_toolchain-{version}.tar.gz",
-        ],
-    ),
     use_repository = _use_repository,
 )