From 905e2441a8566308a6920380648f0e1a57facb35 Mon Sep 17 00:00:00 2001 From: jjudd Date: Fri, 28 Feb 2025 03:35:27 -0700 Subject: [PATCH] Fix registering toolchains for scalafmt in 3rd party repos Also uses the scalafmt_toolchain_setting to make the code more robust. --- rules/scalafmt/register_toolchain.bzl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/scalafmt/register_toolchain.bzl b/rules/scalafmt/register_toolchain.bzl index 816532bf..1bb398b8 100644 --- a/rules/scalafmt/register_toolchain.bzl +++ b/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,7 +42,7 @@ 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, }, ) @@ -48,6 +50,6 @@ def register_scalafmt_toolchain(name, config, visibility = ["//visibility:public 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, )