Update test_version/WORKSPACE.template for 7.3.2

Updated the repo information for `bazel_skylib` and `rules_proto`
directly, and copied the `rules_proto` initialization calls from
`WORKSPACE`. Implemented the `append_additional_dev_dependencies()`
scheme to avoid duplicating the setup for `protobuf` and its
dependencies (`rules_pkg`, `rules_java_external`, `com_google_absl`,
`zlib`).

Author: mbland

WORKSPACE

@@ -200,6 +200,8 @@ remote_jdk21_repositories()
 
 remote_jdk21_toolchains()
 
+# //test_version:WORKSPACE.template dependencies
+
 http_archive(
     name = "com_google_protobuf",
     sha256 = "b2340aa47faf7ef10a0328190319d3f3bee1b24f426d4ce8f4253b6f27ce16db",

test_version.sh

@@ -26,6 +26,21 @@ compilation_should_fail() {
   fi
 }
 
+append_additional_dev_dependencies() {
+  local source="$1"
+  local dest="$2"
+  local marker='# //test_version:WORKSPACE.template dependencies'
+  local emit_deps=""
+
+  while IFS="" read line; do
+    if [[ -n "$emit_deps" ]]; then
+      echo "$line" >>"$dest"
+    elif [[ "$line" == "$marker" ]]; then
+      emit_deps='true'
+    fi
+  done <"$source"
+}
+
 run_in_test_repo() {
   local SCALA_VERSION=${SCALA_VERSION:-$SCALA_VERSION_DEFAULT}
 
@@ -44,6 +59,7 @@ run_in_test_repo() {
   sed \
       -e "s%\${twitter_scrooge_repositories}%$TWITTER_SCROOGE_REPOSITORIES%" \
       WORKSPACE.template >> $NEW_TEST_DIR/WORKSPACE
+  append_additional_dev_dependencies '../WORKSPACE' "$NEW_TEST_DIR/WORKSPACE"
   cp ../.bazelrc $NEW_TEST_DIR/.bazelrc
 
   cd $NEW_TEST_DIR

test_version/WORKSPACE.template

@@ -4,27 +4,32 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "bazel_skylib",
-    sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
+    sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.4.1.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
     ],
 )
 
 http_archive(
     name = "rules_proto",
-    sha256 = "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",
-    strip_prefix = "rules_proto-7e4afce6fe62dbff0a4a03450143146f9f2d7488",
+    sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
+    strip_prefix = "rules_proto-6.0.2",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-        "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
+        "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz",
     ],
 )
 
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
+load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
 
 rules_proto_dependencies()
 
+load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
+
+rules_proto_setup()
+
+load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
+
 rules_proto_toolchains()
 
 local_repository(