Switch to non-deprecated proto rules and update necessary dependencies.

Author: restingbull

.bazelci/presubmit.yml

@@ -2,8 +2,10 @@
 matrix:
   unittest_platform:
     - ubuntu2004
+    - ubuntu1804
   integration_platform:
     - ubuntu2004
+    - ubuntu1804
     # - macos
     # - windows re-enable when rules_bazel_integration_test can support custom test runner on windows.
   test_flags:

MODULE.bazel

@@ -52,8 +52,6 @@ maven.install(
     artifacts = [
         "com.google.code.findbugs:jsr305:3.0.2",
         "junit:junit:4.13-beta-3",
-        "com.google.protobuf:protobuf-java:3.6.0",
-        "com.google.protobuf:protobuf-java-util:3.6.0",
         "com.google.guava:guava:27.1-jre",
         "com.google.truth:truth:0.45",
         "com.google.auto.service:auto-service:1.1.1",
@@ -99,7 +97,7 @@ maven.override(
 use_repo(maven, "kotlin_rules_maven", "unpinned_kotlin_rules_maven")
 
 bazel_dep(name = "rules_pkg", version = "1.0.1")
-bazel_dep(name = "rules_proto", version = "7.0.2")
+bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
 bazel_dep(name = "stardoc", version = "0.7.2", repo_name = "io_bazel_stardoc")
 
 bazel_dep(name = "rules_testing", version = "0.5.0", dev_dependency = True)

kotlin/compiler/BUILD.release.bazel

@@ -28,6 +28,5 @@ bzl_library(
     name = "compiler",
     srcs = glob(["*.bzl"]),
     deps = [
-        "@rules_proto//proto:repositories",
     ],
 )

src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel

@@ -31,8 +31,8 @@ kt_bootstrap_library(
         "//src/main/kotlin/io/bazel/kotlin/plugin:skip-code-gen-lib",
         "//src/main/kotlin/io/bazel/kotlin/plugin/jdeps:jdeps-gen-lib",
         "//src/main/protobuf:kotlin_model_java_proto",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java_util",
+        "@com_google_protobuf//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java_util",
         "@kotlin_rules_maven//:javax_inject_javax_inject",
     ],
 )

src/main/protobuf/BUILD

@@ -1,5 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 
 package(default_visibility = ["//visibility:public"])
 

src/main/starlark/core/repositories/BUILD.release.bazel

@@ -19,6 +19,6 @@ bzl_library(
     srcs = glob(["*.bzl"]),
     visibility = ["//visibility:public"],
     deps = [
-        "@rules_proto//proto:repositories",
+        "@com_google_protobuf//proto:repositories",
     ],
 )

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

@@ -23,7 +23,7 @@ def kt_download_local_dev_dependencies():
     Must be called before setup_dependencies in the WORKSPACE.
     """
     versions.use_repository(
-        name = "rules_proto",
+        name = "com_google_protobuf",
         version = versions.RULES_PROTO,
         rule = rules_stardoc_repository,
         starlark_packages = [

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

@@ -14,21 +14,32 @@
 
 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_MAVEN_ARTIFACTS", "protobuf_deps")
+
+#load("@com_google_protobuf//:protobuf_extra_deps.bzl", "protobuf_extra_deps")
 load("@io_bazel_stardoc//:setup.bzl", "stardoc_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", "rules_proto_toolchains")
 
 def kt_configure():
     """Setup dependencies. Must be called AFTER kt_download_local_dev_dependencies() """
     rules_cc_dependencies()
     rules_cc_toolchains()
 
-    rules_proto_dependencies()
-    rules_proto_toolchains()
+    protobuf_deps()
+    maven_install(
+        name = "protobuf_maven",
+        fetch_sources = True,
+        artifacts = PROTOBUF_MAVEN_ARTIFACTS,
+        repositories = [
+            "https://maven-central.storage.googleapis.com/repos/central/data/",
+            "https://maven.google.com",
+            "https://repo1.maven.org/maven2",
+        ],
+    )
 
     rules_java_dependencies()
     rules_java_toolchains()

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

@@ -29,16 +29,16 @@ versions = struct(
     # 1. Download archive
     # 2. Download dependencies and Configure rules
     # --> 3. Configure dependencies <--
-    SKYLIB_VERSION = "1.4.2",
-    SKYLIB_SHA = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa",
+    SKYLIB_VERSION = "1.7.0",
+    SKYLIB_SHA = "d00f1389ee20b60018e92644e0948e16e350a7707219e7a390fb0a99b6ec9262",
     RULES_JVM_EXTERNAL_TAG = "5.3",
     RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac",
     RULES_PROTO = version(
-        version = "5.3.0-21.7",
-        sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
-        strip_prefix_template = "rules_proto-{version}",
+        version = "29.3",
+        sha256 = "",
+        strip_prefix_template = "protobuf-{version}",
         url_templates = [
-            "https://github.com/bazelbuild/rules_proto/archive/refs/tags/{version}.tar.gz",
+            "https://github.com/protocolbuffers/protobuf/archive/v{version}.tar.gz",
         ],
     ),
     IO_BAZEL_STARDOC = version(
@@ -101,19 +101,19 @@ versions = struct(
     ),
     # needed for rules_pkg and java
     RULES_JAVA = version(
-        version = "7.2.0",
+        version = "8.3.2",
         url_templates = [
             "https://github.com/bazelbuild/rules_java/releases/download/{version}/rules_java-{version}.tar.gz",
         ],
-        sha256 = "eb7db63ed826567b2ceb1ec53d6b729e01636f72c9f5dfb6d2dfe55ad69d1d2a",
+        sha256 = "9b9614f8a7f7b7ed93cb7975d227ece30fe7daed2c0a76f03a5ee37f69e437de",
     ),
     RULES_LICENSE = version(
-        version = "0.0.3",
+        version = "1.0.0",
         url_templates = [
             "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/{version}/rules_license-{version}.tar.gz",
             "https://github.com/bazelbuild/rules_license/releases/download/{version}/rules_license-{version}.tar.gz",
         ],
-        sha256 = None,
+        sha256 = "26d4021f6898e23b82ef953078389dd49ac2b5618ac564ade4ef87cced147b38",
     ),
     RULES_TESTING = version(
         version = "0.6.0",
@@ -158,9 +158,9 @@ versions = struct(
         ],
     ),
     RULES_CC = version(
-        version = "0.0.9",
+        version = "0.0.15",
         url_templates = ["https://github.com/bazelbuild/rules_cc/releases/download/{version}/rules_cc-{version}.tar.gz"],
-        sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf",
+        sha256 = "f4aadd8387f381033a9ad0500443a52a0cea5f8ad1ede4369d3c614eb7b2682e",
         strip_prefix_template = "rules_cc-{version}",
     ),
     use_repository = _use_repository,