Delete @annex_scalafmt & @annex_proto (#43)

* delete annex_proto * delete annex_scalafmt --------- Co-authored-by: anna-skrodzka <annaskrod@h=gmail.com>
timothyklim · Oct 23, 2024 · fa3502f · fa3502f
1 parent 7cc5b41
commit fa3502f
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 2,085 deletions.
diff --git a/README.md b/README.md
@@ -78,18 +78,9 @@ load("@annex//:defs.bzl", annex_pinned_maven_install = "pinned_maven_install")
 annex_pinned_maven_install()
 scala_register_toolchains()
 
-load("@rules_scala3//rules/scalafmt:workspace.bzl", "scalafmt_default_config", "scalafmt_repositories")
-scalafmt_repositories()
-load("@annex_scalafmt//:defs.bzl", annex_scalafmt_pinned_maven_install = "pinned_maven_install")
-annex_scalafmt_pinned_maven_install()
+load("@rules_scala3//rules/scalafmt:config.bzl", "scalafmt_default_config")
 scalafmt_default_config()
 
-load("@rules_scala3//rules/scala_proto:workspace.bzl", "scala_proto_register_toolchains", "scala_proto_repositories",)
-scala_proto_repositories()
-load("@annex_proto//:defs.bzl", annex_proto_pinned_maven_install = "pinned_maven_install")
-annex_proto_pinned_maven_install()
-scala_proto_register_toolchains()
-
 # Load bazel skylib and google protobuf
 bazel_skylib_tag = "1.0.2"
 bazel_skylib_sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44"

diff --git a/WORKSPACE b/WORKSPACE
@@ -114,30 +114,10 @@ load("@mezel//rules:load_mezel.bzl", "load_mezel")
 
 load_mezel()
 
-load("//rules/scalafmt:workspace.bzl", "scalafmt_default_config", "scalafmt_repositories")
-
-scalafmt_repositories()
-
-load("@annex_scalafmt//:defs.bzl", annex_scalafmt_pinned_maven_install = "pinned_maven_install")
-
-annex_scalafmt_pinned_maven_install()
+load("//rules/scalafmt:config.bzl", "scalafmt_default_config")
 
 scalafmt_default_config(".scalafmt.conf")
 
-load(
-    "//rules/scala_proto:workspace.bzl",
-    "scala_proto_register_toolchains",
-    "scala_proto_repositories",
-)
-
-scala_proto_repositories()
-
-scala_proto_register_toolchains()
-
-load("@annex_proto//:defs.bzl", annex_proto_pinned_maven_install = "pinned_maven_install")
-
-annex_proto_pinned_maven_install()
-
 load("@bazel_features//:deps.bzl", "bazel_features_deps")
 
 bazel_features_deps()
diff --git a/annex_proto_install.json b/annex_proto_install.json
diff --git a/annex_scalafmt_install.json b/annex_scalafmt_install.json
diff --git a/docs/scalafmt.md b/docs/scalafmt.md
@@ -3,8 +3,7 @@
 Create .scalafmt.conf at the repo root (may be empty). And add to the WORKSPACE
 
 ```python
-load("@rules_scala3//rules/scalafmt:workspace.bzl", "scalafmt_repositories", "scalafmt_default_config")
-scalafmt_repositories()
+load("@rules_scala3//rules/scalafmt:config.bzl", "scalafmt_repositories")
 scalafmt_default_config()
 ```
 

diff --git a/justfile b/justfile
@@ -3,23 +3,17 @@ deps-update:
 
 	bazel run @annex_deps//:pin
 	bazel run @annex//:pin
-	bazel run @annex_scalafmt//:pin
-	bazel run @annex_proto//: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
 	REPIN=1 bazel run @unpinned_annex//:pin
-	REPIN=1 bazel run @unpinned_annex_scalafmt//:pin
-	REPIN=1 bazel run @unpinned_annex_proto//:pin
 	cd tests && REPIN=1 bazel run @unpinned_annex_test//:pin
 
 deps-outdated:
 	bazel run @annex//:outdated
 	bazel run @annex_deps//:outdated
-	bazel run @annex_scalafmt//:outdated
-	bazel run @annex_proto//:outdated
 	cd tests && bazel run @annex_test//:outdated
 
 bzl-lint:

diff --git a/rules/scala_proto/workspace.bzl b/rules/scala_proto/workspace.bzl
diff --git a/rules/scalafmt/config.bzl b/rules/scalafmt/config.bzl
@@ -0,0 +1,8 @@
+def scalafmt_default_config(path = ".scalafmt.conf"):
+    build = []
+    build.append("filegroup(")
+    build.append("    name = \"config\",")
+    build.append("    srcs = [\"{}\"],".format(path))
+    build.append("    visibility = [\"//visibility:public\"],")
+    build.append(")")
+    native.new_local_repository(name = "scalafmt_default", build_file_content = "\n".join(build), path = "")
diff --git a/rules/scalafmt/workspace.bzl b/rules/scalafmt/workspace.bzl
diff --git a/scripts/gen-deps.sh b/scripts/gen-deps.sh
@@ -9,8 +9,6 @@ echo "$(dirname "$0")/.."
 
 echo "generating dependencies for main workspace"
 bazel run @unpinned_annex//:pin
-bazel run @unpinned_annex_scalafmt//:pin
-bazel run @unpinned_annex_proto//:pin
 
 echo "generating dependencies for tests workspace"
 cd "tests"

diff --git a/tests/WORKSPACE b/tests/WORKSPACE
@@ -69,20 +69,6 @@ annex_pinned_maven_install()
 
 scala_register_toolchains()
 
-load(
-    "@rules_scala3//rules/scala_proto:workspace.bzl",
-    "scala_proto_register_toolchains",
-    "scala_proto_repositories",
-)
-
-scala_proto_repositories()
-
-scala_proto_register_toolchains()
-
-load("@annex_proto//:defs.bzl", annex_proto_pinned_maven_install = "pinned_maven_install")
-
-annex_proto_pinned_maven_install()
-
 # load("@rules_scala3//3rdparty:workspace.bzl", "maven_dependencies")
 load(":workspace.bzl", "test_dependencies")
 
@@ -94,13 +80,7 @@ annex_test_pinned_maven_install()
 
 # maven_dependencies()
 
-load("@rules_scala3//rules/scalafmt:workspace.bzl", "scalafmt_default_config", "scalafmt_repositories")
-
-scalafmt_repositories()
-
-load("@annex_scalafmt//:defs.bzl", annex_scalafmt_pinned_maven_install = "pinned_maven_install")
-
-annex_scalafmt_pinned_maven_install()
+load("@rules_scala3//rules/scalafmt:config.bzl", "scalafmt_default_config")
 
 scalafmt_default_config()