annex_deps removed (#54)

Co-authored-by: anna-skrodzka <annaskrod@h=gmail.com>

WORKSPACE

@@ -13,6 +13,16 @@ http_archive(
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 
+maven_install(
+    artifacts = [
+        "org.scala-sbt:librarymanagement-core_3:2.0.0-M2",
+        "org.scala-sbt:librarymanagement-coursier_3:2.0.0-alpha8",
+    ],
+    repositories = [
+        "https://repo1.maven.org/maven2",
+    ],
+)
+
 rules_cc_version = "0.0.9"
 
 http_archive(

deps/BUILD

@@ -15,8 +15,8 @@ scala_binary(
     scala = "//scala:bootstrap_3",
     visibility = ["//visibility:public"],
     deps = [
-        "@annex_deps//:com_github_scopt_scopt_3",
-        "@annex_deps//:org_scala_sbt_librarymanagement_core_3",
-        "@annex_deps//:org_scala_sbt_librarymanagement_coursier_3",
+        "//3rdparty/jvm/com/github/scopt",
+        "@maven//:org_scala_sbt_librarymanagement_core_3",
+        "@maven//:org_scala_sbt_librarymanagement_coursier_3",
     ],
 )

deps/scala_deps.bzl

@@ -25,8 +25,8 @@ def scala_deps(
             "--targets-file-name=" + targets_file_name,
         ],
         deps = [
-            "@annex_deps//:com_github_scopt_scopt_3",
-            "@annex_deps//:org_scala_sbt_librarymanagement_core_3",
-            "@annex_deps//:org_scala_sbt_librarymanagement_coursier_3",
+            "//3rdparty/jvm/com/github/scopt",
+            "@maven//:org_scala_sbt_librarymanagement_core_3",
+            "@maven//:org_scala_sbt_librarymanagement_coursier_3",
         ],
     )

justfile

@@ -1,16 +1,13 @@
 deps-update:
 	rg -l 'maven_install_json' --glob '*.bzl' --glob 'WORKSPACE' | xargs sed -i -E 's/[^#]maven_install_json/#maven_install_json/g'
-
-	bazel run @annex_deps//:pin
+
 	cd tests && bazel run @annex_test//:pin
 
 	rg -l '#maven_install_json' --glob '*.bzl' --glob 'WORKSPACE' | xargs sed -i 's/#maven_install_json/maven_install_json/g'
 
-	REPIN=1 bazel run @unpinned_annex_deps//:pin
 	cd tests && REPIN=1 bazel run @unpinned_annex_test//:pin
 
 deps-outdated:
-	bazel run @annex_deps//:outdated
 	cd tests && bazel run @annex_test//:outdated
 
 bzl-lint:

rules/scala/init.bzl

@@ -1,4 +1,3 @@
-load("@annex_deps//:defs.bzl", "pinned_maven_install")
 load("@bazel_features//:deps.bzl", "bazel_features_deps")
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
@@ -21,6 +20,5 @@ def rules_scala3_init():
     rules_proto_toolchains()
     bazel_features_deps()
 
-    pinned_maven_install()
     load_maven_dependencies()
     scalafmt_default_config(".scalafmt.conf")

rules/scala/workspace.bzl

@@ -24,12 +24,6 @@ filegroup(
 )
 """
 
-_ANNEX_DEPS_ARTIFACTS = [
-    "com.github.scopt:scopt_3:4.1.0",
-    "org.scala-sbt:librarymanagement-core_3:2.0.0-M2",
-    "org.scala-sbt:librarymanagement-coursier_3:2.0.0-alpha8",
-]
-
 repositories = [
     "https://repo1.maven.org/maven2",
     "https://repo.maven.apache.org/maven2",
@@ -42,14 +36,6 @@ sbt_version = "2.0.0-M2"
 zinc_version = "2.0.0-alpha14"
 
 def scala_repositories():
-    maven_install(
-        name = "annex_deps",
-        artifacts = _ANNEX_DEPS_ARTIFACTS,
-        fetch_sources = True,
-        maven_install_json = "@rules_scala3//:annex_deps_install.json",
-        repositories = repositories,
-    )
-
     http_archive(
         name = "compiler_bridge_2_13",
         build_file_content = _SRC_FILEGROUP_BUILD_FILE_CONTENT,

scripts/gen-deps.sh

@@ -7,9 +7,6 @@
 cd "$(dirname "$0")/.."
 echo "$(dirname "$0")/.."
 
-echo "generating dependencies for main workspace"
-bazel run @unpinned_annex//:pin
-
 echo "generating dependencies for tests workspace"
 cd "tests"
 bazel run @unpinned_annex_test//:pin