Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove scala repository binds #1210

Merged
merged 2 commits into from
Feb 9, 2021
Merged

Remove scala repository binds #1210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28845d
Remove scala repository binds
Feb 8, 2021
81193dc
Lint
Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions docs/scala_toolchain.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,27 +51,27 @@ scala_register_toolchains()
deps_id = "scala_compile_classpath",
visibility = ["//visibility:public"],
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
"@io_bazel_rules_scala_scala_compiler",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
],
)

declare_deps_provider(
name = "my_scala_library_classpath_provider",
deps_id = "scala_library_classpath",
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
],
)

declare_deps_provider(
name = "my_scala_macro_classpath_provider",
deps_id = "scala_macro_classpath",
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
],
)

Expand Down
18 changes: 9 additions & 9 deletions scala/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ declare_deps_provider(
deps_id = "scala_compile_classpath",
visibility = ["//visibility:public"],
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
"@io_bazel_rules_scala_scala_compiler",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
],
)

Expand All @@ -77,8 +77,8 @@ declare_deps_provider(
deps_id = "scala_library_classpath",
visibility = ["//visibility:public"],
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
],
)

Expand All @@ -87,21 +87,21 @@ declare_deps_provider(
deps_id = "scala_macro_classpath",
visibility = ["//visibility:public"],
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
],
)

declare_deps_provider(
name = "scala_xml_provider",
deps_id = "scala_xml",
visibility = ["//visibility:public"],
deps = ["//external:io_bazel_rules_scala/dependency/scala/scala_xml"],
deps = ["@io_bazel_rules_scala_scala_xml"],
)

declare_deps_provider(
name = "parser_combinators_provider",
deps_id = "parser_combinators",
visibility = ["//visibility:public"],
deps = ["//external:io_bazel_rules_scala/dependency/scala/parser_combinators"],
deps = ["@io_bazel_rules_scala_scala_parser_combinators"],
)
40 changes: 0 additions & 40 deletions scala/private/macros/scala_repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,43 +88,3 @@ def scala_repositories(
fetch_sources = fetch_sources,
overriden_artifacts = overriden_artifacts,
)

native.bind(
name = "io_bazel_rules_scala/dependency/scalatest/scalatest",
actual = "@io_bazel_rules_scala//scala/scalatest:scalatest",
)

native.bind(
name = "io_bazel_rules_scala/dependency/scala/scala_compiler",
actual = "@io_bazel_rules_scala_scala_compiler",
)

native.bind(
name = "io_bazel_rules_scala/dependency/scala/scala_library",
actual = "@io_bazel_rules_scala_scala_library",
)

native.bind(
name = "io_bazel_rules_scala/dependency/scala/scala_reflect",
actual = "@io_bazel_rules_scala_scala_reflect",
)

native.bind(
name = "io_bazel_rules_scala/dependency/scala/scala_xml",
actual = "@io_bazel_rules_scala_scala_xml",
)

native.bind(
name = "io_bazel_rules_scala/dependency/scala/parser_combinators",
actual = "@io_bazel_rules_scala_scala_parser_combinators",
)

native.bind(
name = "io_bazel_rules_scala/dependency/scala/scalatest/scalatest",
actual = "@io_bazel_rules_scala_scalatest",
)

native.bind(
name = "io_bazel_rules_scala/dependency/scala/scalactic/scalactic",
actual = "@io_bazel_rules_scala_scalactic",
)
4 changes: 2 additions & 2 deletions testing/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ declare_deps_provider(
deps_id = "scalatest_classpath",
visibility = ["//visibility:public"],
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scalactic/scalactic",
"//external:io_bazel_rules_scala/dependency/scala/scalatest/scalatest",
"@io_bazel_rules_scala_scalactic",
"@io_bazel_rules_scala_scalatest",
],
)

Expand Down
32 changes: 16 additions & 16 deletions third_party/dependency_analyzer/src/test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ licenses(["notice"]) # 3-clause BSD

common_jvm_flags = [
"-Dplugin.jar.location=$(execpath //third_party/dependency_analyzer/src/main:dependency_analyzer)",
"-Dscala.library.location=$(rootpath //external:io_bazel_rules_scala/dependency/scala/scala_library)",
"-Dscala.reflect.location=$(rootpath //external:io_bazel_rules_scala/dependency/scala/scala_reflect)",
"-Dscala.library.location=$(rootpath @io_bazel_rules_scala_scala_library)",
"-Dscala.reflect.location=$(rootpath @io_bazel_rules_scala_scala_reflect)",
]

scala_test(
Expand All @@ -16,13 +16,13 @@ scala_test(
],
jvm_flags = common_jvm_flags,
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
"//src/java/io/bazel/rulesscala/io_utils",
"//third_party/dependency_analyzer/src/main:dependency_analyzer",
"//third_party/dependency_analyzer/src/main:scala_version",
"//third_party/utils/src/test:test_util",
"@io_bazel_rules_scala_scala_compiler",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
],
)

Expand All @@ -33,9 +33,9 @@ scala_test(
"io/bazel/rulesscala/dependencyanalyzer/ScalaVersionTest.scala",
],
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
"//third_party/dependency_analyzer/src/main:scala_version",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
],
)

Expand All @@ -48,12 +48,12 @@ scala_test(
jvm_flags = common_jvm_flags,
unused_dependency_checker_mode = "off",
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
"//src/java/io/bazel/rulesscala/io_utils",
"//third_party/dependency_analyzer/src/main:dependency_analyzer",
"//third_party/utils/src/test:test_util",
"@io_bazel_rules_scala_scala_compiler",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
],
)

Expand All @@ -69,12 +69,12 @@ scala_test(
],
unused_dependency_checker_mode = "off",
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
"//third_party/dependency_analyzer/src/main:dependency_analyzer",
"//third_party/utils/src/test:test_util",
"@com_google_guava_guava_21_0_with_file//jar",
"@io_bazel_rules_scala_scala_compiler",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
"@org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file",
],
)
Expand All @@ -90,11 +90,11 @@ scala_test(
],
unused_dependency_checker_mode = "off",
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
"//third_party/dependency_analyzer/src/main:dependency_analyzer",
"//third_party/utils/src/test:test_util",
"@io_bazel_rules_scala_scala_compiler",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
"@org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file",
],
)
34 changes: 17 additions & 17 deletions third_party/repositories/scala_2_11.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ artifacts = {
"sha256": "6330798bcbd78d14d371202749f32efda0465c3be5fd057a6055a67e21335ba0",
"deps": [
"@com_lihaoyi_sourcecode",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
],
},
"org_scalameta_fastparse": {
"artifact": "org.scalameta:fastparse_2.11:1.0.1",
"sha256": "49ecc30a4b47efc0038099da0c97515cf8f754ea631ea9f9935b36ca7d41b733",
"deps": [
"@com_lihaoyi_sourcecode",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
"@org_scalameta_fastparse_utils",
],
},
Expand All @@ -49,21 +49,21 @@ artifacts = {
"sha256": "93f58db540e53178a686621f7a9c401307a529b68e051e38804394a2a86cea94",
"deps": [
"@com_lihaoyi_sourcecode",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
],
},
"org_scala_lang_modules_scala_collection_compat": {
"artifact": "org.scala-lang.modules:scala-collection-compat_2.11:2.1.2",
"sha256": "e9667b8b7276aeb42599f536fe4d7caab06eabc55e9995572267ad60c7a11c8b",
"deps": [
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
],
},
"org_scalameta_parsers": {
"artifact": "org.scalameta:parsers_2.11:4.3.0",
"sha256": "724382abfac27b32dec6c21210562bc7e1b09b5268ccb704abe66dcc8844beeb",
"deps": [
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
"@org_scalameta_trees",
],
},
Expand All @@ -73,8 +73,8 @@ artifacts = {
"deps": [
"@com_geirsson_metaconfig_core",
"@com_geirsson_metaconfig_typesafe_config",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
"@org_scalameta_scalameta",
"@org_scala_lang_modules_scala_collection_compat",
],
Expand All @@ -83,7 +83,7 @@ artifacts = {
"artifact": "org.scalameta:scalameta_2.11:4.3.0",
"sha256": "94fe739295447cd3ae877c279ccde1def06baea02d9c76a504dda23de1d90516",
"deps": [
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
"@org_scala_lang_scalap",
"@org_scalameta_parsers",
],
Expand All @@ -93,7 +93,7 @@ artifacts = {
"sha256": "d24d5d63d8deafe646d455c822593a66adc6fdf17c8373754a3834a6e92a8a72",
"deps": [
"@com_thesamet_scalapb_scalapb_runtime",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
"@org_scalameta_common",
"@org_scalameta_fastparse",
],
Expand All @@ -102,7 +102,7 @@ artifacts = {
"artifact": "org.typelevel:paiges-core_2.11:0.2.4",
"sha256": "aa66fbe0457ca5cb5b9e522d4cb873623bb376a2e1ff58c464b5194c1d87c241",
"deps": [
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
],
},
"com_typesafe_config": {
Expand All @@ -120,7 +120,7 @@ artifacts = {
"artifact": "com.thesamet.scalapb:lenses_2.11:0.9.0",
"sha256": "f4809760edee6abc97a7fe9b7fd6ae5fe1006795b1dc3963ab4e317a72f1a385",
"deps": [
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
],
},
"com_thesamet_scalapb_scalapb_runtime": {
Expand All @@ -130,15 +130,15 @@ artifacts = {
"@com_google_protobuf_protobuf_java",
"@com_lihaoyi_fastparse",
"@com_thesamet_scalapb_lenses",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
],
},
"com_lihaoyi_fansi": {
"artifact": "com.lihaoyi:fansi_2.11:0.2.5",
"sha256": "1ff0a8304f322c1442e6bcf28fab07abf3cf560dd24573dbe671249aee5fc488",
"deps": [
"@com_lihaoyi_sourcecode",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
],
},
"com_lihaoyi_fastparse": {
Expand All @@ -154,14 +154,14 @@ artifacts = {
"deps": [
"@com_lihaoyi_fansi",
"@com_lihaoyi_sourcecode",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
],
},
"com_lihaoyi_sourcecode": {
"artifact": "com.lihaoyi:sourcecode_2.11:0.1.7",
"sha256": "33516d7fd9411f74f05acfd5274e1b1889b7841d1993736118803fc727b2d5fc",
"deps": [
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
],
},
"com_google_protobuf_protobuf_java": {
Expand All @@ -173,7 +173,7 @@ artifacts = {
"sha256": "5d5704a1f1c4f74aed26248eeb9b577274d570b167cec0bf51d2908609c29118",
"deps": [
"@com_lihaoyi_pprint",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
"@org_typelevel_paiges_core",
"@org_scala_lang_modules_scala_collection_compat",
],
Expand All @@ -184,7 +184,7 @@ artifacts = {
"deps": [
"@com_geirsson_metaconfig_core",
"@com_typesafe_config",
"//external:io_bazel_rules_scala/dependency/scala/scala_library",
"@io_bazel_rules_scala_scala_library",
"@org_scala_lang_modules_scala_collection_compat",
],
},
Expand Down
Loading