@@ -117,9 +117,7 @@ def dt_patched_compiler_setup(scala_version, scala_compiler_srcjar = None):
117117 integrity = srcjar .get ("integrity" ),
118118 )
119119
120- def rules_scala_setup (
121- scala_compiler_srcjar = None ,
122- setup_compiler_sources = True ):
120+ def load_rules_dependencies ():
123121 if not native .existing_rule ("bazel_skylib" ):
124122 http_archive (
125123 name = "bazel_skylib" ,
@@ -172,11 +170,7 @@ def rules_scala_setup(
172170 url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz" ,
173171 )
174172
175- if setup_compiler_sources :
176- srcs = {version : scala_compiler_srcjar for version in SCALA_VERSIONS }
177- _setup_scala_compiler_sources (srcs )
178-
179- def _setup_scala_compiler_sources (srcjars = {}):
173+ def setup_scala_compiler_sources (srcjars = {}):
180174 """Generates Scala compiler source repos used internally by rules_scala.
181175
182176 Args:
@@ -193,6 +187,13 @@ def _setup_scala_compiler_sources(srcjars = {}):
193187 scala_versions = SCALA_VERSIONS ,
194188 )
195189
190+ def rules_scala_setup (scala_compiler_srcjar = None ):
191+ load_rules_dependencies ()
192+ setup_scala_compiler_sources ({
193+ version : scala_compiler_srcjar
194+ for version in SCALA_VERSIONS
195+ })
196+
196197def _artifact_ids (scala_version ):
197198 result = [
198199 "io_bazel_rules_scala_scala_compiler" ,
@@ -258,9 +259,9 @@ def scala_repositories(
258259 scala_compiler_srcjars = {}):
259260 if load_dep_rules :
260261 # When `WORKSPACE` goes away, so can this case.
261- rules_scala_setup ( setup_compiler_sources = False )
262+ load_rules_dependencies ( )
262263
263- _setup_scala_compiler_sources (scala_compiler_srcjars )
264+ setup_scala_compiler_sources (scala_compiler_srcjars )
264265
265266 if load_jar_deps :
266267 rules_scala_toolchain_deps_repositories (
0 commit comments