Rename Scala toolchains to avoid conflicts with other repos

Because we're using strings, names like zinc_3 would likely conflict in
other repos.

Author: jjudd

README.md

@@ -74,7 +74,7 @@ load("@rules_scala_annex//rules/scala:workspace.bzl", "scala_register_toolchains
 scala_repositories()
 load("@annex//:defs.bzl", annex_pinned_maven_install = "pinned_maven_install")
 annex_pinned_maven_install()
-scala_register_toolchains(default_scala_toolchain_name = "zinc_3")
+scala_register_toolchains(default_scala_toolchain_name = "annex_zinc_3")
 
 load("@rules_scala_annex//rules/scalafmt:workspace.bzl", "scalafmt_default_config", "scalafmt_repositories")
 scalafmt_repositories()
@@ -116,7 +116,7 @@ protobuf_deps()
 # Specify the scala compiler we wish to use; in this case, we'll use the default one specified in rules_scala_annex
 bind(
     name = "default_scala",
-    actual = "@rules_scala_annex//src/main/scala:zinc_2_13",
+    actual = "@rules_scala_annex//src/main/scala:annex_zinc_2_13",
 )
 ```
 

WORKSPACE

@@ -101,7 +101,7 @@ load("@annex//:defs.bzl", annex_pinned_maven_install = "pinned_maven_install")
 
 annex_pinned_maven_install()
 
-scala_register_toolchains(default_scala_toolchain_name = "zinc_2_13")
+scala_register_toolchains(default_scala_toolchain_name = "annex_zinc_2_13")
 
 #  Scala 2.12
 

docs/newdocs/scala_versions.md

@@ -35,7 +35,7 @@ compiler_classpath_2_13 = [
 runtime_classpath_2_13 = ["@scala_library_2_13//jar"]
 
 register_bootstrap_toolchain(
-    name = "bootstrap_2_13",
+    name = "annex_bootstrap_2_13",
     compiler_classpath = compiler_classpath_2_13,
     runtime_classpath = runtime_classpath_2_13,
     version = "2.13.14",
@@ -46,7 +46,7 @@ register_bootstrap_toolchain(
 scala_library(
     name = "compiler_bridge_2_13",
     srcs = ["@compiler_bridge_2_13//:src"],
-    scala_toolchain_name = "bootstrap_2_13",
+    scala_toolchain_name = "annex_bootstrap_2_13",
     visibility = ["//visibility:public"],
     deps = compiler_classpath_2_13 + [
         "@scala_annex_org_scala_sbt_compiler_interface//jar",
@@ -56,7 +56,7 @@ scala_library(
 
 # This augments the configuration to configure the zinc compiler
 register_zinc_toolchain(
-    name = "zinc_2_13",
+    name = "annex_zinc_2_13",
     compiler_bridge = ":compiler_bridge_2_13",
     compiler_classpath = compiler_classpath_2_13,
     runtime_classpath = runtime_classpath_2_13,
@@ -72,8 +72,8 @@ load("@rules_scala_annex//rules/scala:workspace.bzl", "scala_register_toolchains
 ...
 
 scala_register_toolchains(
-    toolchains = ["//:bootstrap_2_13", "//:zinc_2_13"],
-    default_scala_toolchain_name = "zinc_2_13",
+    toolchains = ["//:annex_bootstrap_2_13", "//:annex_zinc_2_13"],
+    default_scala_toolchain_name = "annex_zinc_2_13",
 )
 
 ...
@@ -90,13 +90,13 @@ For example:
 scala_library(
   name = "example_compiled_with_scalac",
   srcs = glob(["**/*.scala"])
-  scala_toolchain_name = "bootstrap_2_13",
+  scala_toolchain_name = "annex_bootstrap_2_13",
 )
 
 scala_library(
   name = "example_compiled_with_zinc",
   srcs = glob(["**/*.scala"])
-  scala_toolchain_name = "zinc_2_13",
+  scala_toolchain_name = "annex_zinc_2_13",
 )
 
 # This would use the default toolchain, which we configured via `scala_register_toolchains` above

rules/scala/workspace.bzl

@@ -135,9 +135,9 @@ def scala_register_toolchains(default_scala_toolchain_name, toolchains = []):
     )
 
     native.register_toolchains(
-        "//src/main/scala:bootstrap_2_13",
-        "//src/main/scala:bootstrap_3",
-        "//src/main/scala:zinc_2_13",
-        "//src/main/scala:zinc_3",
+        "//src/main/scala:annex_bootstrap_2_13",
+        "//src/main/scala:annex_bootstrap_3",
+        "//src/main/scala:annex_zinc_2_13",
+        "//src/main/scala:annex_zinc_3",
         *toolchains
     )

rules/scala_proto/BUILD

@@ -16,7 +16,7 @@ scala_binary(
     name = "worker",
     srcs = ["private/ScalaProtoWorker.scala"],
     main_class = "annex.scala.proto.ScalaProtoWorker",
-    scala_toolchain_name = "zinc_3",
+    scala_toolchain_name = "annex_zinc_3",
     visibility = ["//visibility:public"],
     deps = [
         "//src/main/scala/higherkindness/rules_scala/common/args",

rules/scalafmt/BUILD

@@ -21,7 +21,7 @@ scala_binary(
     name = "scalafmt",
     srcs = glob(["scalafmt/**/*.scala"]),
     main_class = "annex.scalafmt.ScalafmtRunner",
-    scala_toolchain_name = "bootstrap_2_13",
+    scala_toolchain_name = "annex_bootstrap_2_13",
     visibility = ["//visibility:public"],
     deps = [
         "//src/main/scala/higherkindness/rules_scala/common/interrupt",

src/main/scala/BUILD

@@ -27,7 +27,7 @@ shared_scala2_global_scalacopts = [
 scala2_global_scalacopts = shared_global_scalacopts + shared_scala2_global_scalacopts
 
 register_bootstrap_toolchain(
-    name = "bootstrap_2_13",
+    name = "annex_bootstrap_2_13",
     compiler_classpath = compiler_classpath_2_13,
     global_scalacopts = scala2_global_scalacopts,
     runtime_classpath = runtime_classpath_2_13,
@@ -36,7 +36,7 @@ register_bootstrap_toolchain(
 )
 
 register_zinc_toolchain(
-    name = "zinc_2_13",
+    name = "annex_zinc_2_13",
     compiler_bridge = "@annex//:org_scala_sbt_compiler_bridge_2_13",
     compiler_classpath = compiler_classpath_2_13,
     global_scalacopts = scala2_global_scalacopts,
@@ -52,7 +52,7 @@ register_zinc_toolchain(
 scala_library(
     name = "scala-sdk",
     deps_used_whitelist = compiler_classpath_2_13,
-    scala_toolchain_name = "zinc_3",
+    scala_toolchain_name = "annex_zinc_3",
     deps = compiler_classpath_2_13,
 )
 
@@ -70,12 +70,12 @@ runtime_classpath_3 = [
 scala_library(
     name = "scala-sdk-3",
     deps_used_whitelist = compiler_classpath_3,
-    scala_toolchain_name = "zinc_3",
+    scala_toolchain_name = "annex_zinc_3",
     deps = compiler_classpath_3,
 )
 
 register_bootstrap_toolchain(
-    name = "bootstrap_3",
+    name = "annex_bootstrap_3",
     compiler_classpath = compiler_classpath_3,
     global_scalacopts = shared_global_scalacopts,
     runtime_classpath = runtime_classpath_3,
@@ -85,7 +85,7 @@ register_bootstrap_toolchain(
 )
 
 register_zinc_toolchain(
-    name = "zinc_3",
+    name = "annex_zinc_3",
     compiler_bridge = "@annex//:org_scala_lang_scala3_sbt_bridge",
     compiler_classpath = compiler_classpath_3,
     global_scalacopts = shared_global_scalacopts,

src/main/scala/higherkindness/rules_scala/common/args/BUILD

@@ -4,7 +4,7 @@ load("//rules:scalafmt.bzl", "scala_format_test")
 scala_library(
     name = "args",
     srcs = glob(["**/*.scala"]),
-    scala_toolchain_name = "bootstrap_2_13",
+    scala_toolchain_name = "annex_bootstrap_2_13",
     visibility = ["//visibility:public"],
     deps = [
         "//src/main/scala/higherkindness/rules_scala/common/error",

src/main/scala/higherkindness/rules_scala/common/classloaders/BUILD

@@ -4,7 +4,7 @@ load("//rules:scalafmt.bzl", "scala_format_test")
 scala_library(
     name = "classloaders",
     srcs = glob(["**/*.scala"]),
-    scala_toolchain_name = "bootstrap_2_13",
+    scala_toolchain_name = "annex_bootstrap_2_13",
     visibility = ["//visibility:public"],
 )
 

src/main/scala/higherkindness/rules_scala/common/error/BUILD

@@ -4,7 +4,7 @@ load("//rules:scalafmt.bzl", "scala_format_test")
 scala_library(
     name = "error",
     srcs = glob(["**/*.scala"]),
-    scala_toolchain_name = "bootstrap_2_13",
+    scala_toolchain_name = "annex_bootstrap_2_13",
     visibility = ["//visibility:public"],
 )