@@ -26,15 +26,16 @@ load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_depen
2626
2727buildifier_dependencies ()
2828
29- load ("@io_bazel_rules_scala//:version .bzl" , "bazel_version " )
29+ load ("@io_bazel_rules_scala//:scala_config .bzl" , "scala_config " )
3030
31- bazel_version ( name = "bazel_version" )
31+ scala_config ( )
3232
33+ load ("@io_bazel_rules_scala_config//:config.bzl" , "SCALA_MAJOR_VERSION" )
3334load ("//scala:scala.bzl" , "scala_repositories" )
3435
3536scala_repositories (fetch_sources = True )
3637
37- load ("//scala:scala_cross_version.bzl" , "default_maven_server_urls" )
38+ load ("//scala:scala_cross_version.bzl" , "default_maven_server_urls" , "scala_mvn_artifact" )
3839load ("//scala:scala_maven_import_external.bzl" , "scala_maven_import_external" )
3940load ("//twitter_scrooge:twitter_scrooge.bzl" , "twitter_scrooge" )
4041
@@ -64,13 +65,6 @@ scalafmt_default_config()
6465
6566scalafmt_repositories ()
6667
67- load (
68- "//scala:scala_cross_version.bzl" ,
69- "default_scala_major_version" ,
70- "default_scala_version" ,
71- "scala_mvn_artifact" ,
72- )
73-
7468MAVEN_SERVER_URLS = default_maven_server_urls ()
7569
7670# needed for the cross repo proto test
@@ -177,7 +171,7 @@ jvm_maven_import_external(
177171 name = "org_typelevel__cats_core" ,
178172 artifact = scala_mvn_artifact (
179173 "org.typelevel:cats-core:0.9.0" ,
180- default_scala_major_version () ,
174+ SCALA_MAJOR_VERSION ,
181175 ),
182176 artifact_sha256 = "3ca705cba9dc0632e60477d80779006f8c636c0e2e229dda3410a0c314c1ea1d" ,
183177 server_urls = MAVEN_SERVER_URLS ,
@@ -207,5 +201,4 @@ repositories(
207201 "org_spire_math_kind_projector" ,
208202 ],
209203 maven_servers = MAVEN_SERVER_URLS ,
210- scala_version = default_scala_version (),
211204)
0 commit comments