Merge pull request #86 from lucidsoftware/scalafmt-toolchain-fix

Fix registering toolchains for scalafmt in 3rd party repos

Author: jjudd

rules/scalafmt/register_toolchain.bzl

@@ -1,3 +1,5 @@
+load("//rules:register_toolchain.bzl", "scalafmt_toolchain_setting")
+
 _ScalafmtConfig = provider(
     fields = {
         "config": "The Scalafmt configuration file.",
@@ -40,14 +42,14 @@ def register_scalafmt_toolchain(name, config, visibility = ["//visibility:public
     native.config_setting(
         name = "{}-setting".format(name),
         flag_values = {
-            "//rules/scalafmt:scalafmt-toolchain": name,
+            scalafmt_toolchain_setting: name,
         },
     )
 
     native.toolchain(
         name = name,
         target_settings = [":{}-setting".format(name)],
         toolchain = ":{}-configuration".format(name),
-        toolchain_type = "//rules/scalafmt:toolchain_type",
+        toolchain_type = "@rules_scala_annex//rules/scalafmt:toolchain_type",
         visibility = visibility,
     )