@@ -117,9 +117,7 @@ def dt_patched_compiler_setup(scala_version, scala_compiler_srcjar = None):
117
117
integrity = srcjar .get ("integrity" ),
118
118
)
119
119
120
- def rules_scala_setup (
121
- scala_compiler_srcjar = None ,
122
- setup_compiler_sources = True ):
120
+ def load_rules_dependencies ():
123
121
if not native .existing_rule ("bazel_skylib" ):
124
122
http_archive (
125
123
name = "bazel_skylib" ,
@@ -172,11 +170,7 @@ def rules_scala_setup(
172
170
url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz" ,
173
171
)
174
172
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 = {}):
180
174
"""Generates Scala compiler source repos used internally by rules_scala.
181
175
182
176
Args:
@@ -193,6 +187,13 @@ def _setup_scala_compiler_sources(srcjars = {}):
193
187
scala_versions = SCALA_VERSIONS ,
194
188
)
195
189
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
+
196
197
def _artifact_ids (scala_version ):
197
198
return [
198
199
"io_bazel_rules_scala_scala_library" ,
@@ -240,9 +241,9 @@ def scala_repositories(
240
241
scala_compiler_srcjars = {}):
241
242
if load_dep_rules :
242
243
# When `WORKSPACE` goes away, so can this case.
243
- rules_scala_setup ( setup_compiler_sources = False )
244
+ load_rules_dependencies ( )
244
245
245
- _setup_scala_compiler_sources (scala_compiler_srcjars )
246
+ setup_scala_compiler_sources (scala_compiler_srcjars )
246
247
247
248
if load_jar_deps :
248
249
rules_scala_toolchain_deps_repositories (
0 commit comments