From 5c8a1f60d7e88c085cb26b578e636eb5297b6688 Mon Sep 17 00:00:00 2001 From: anna-skrodzka Date: Fri, 25 Oct 2024 02:02:32 +0200 Subject: [PATCH] annex_install.json deleted --- README.md | 2 -- justfile | 3 --- rules/scala/workspace.bzl | 21 --------------------- 3 files changed, 26 deletions(-) diff --git a/README.md b/README.md index 5b67d887..71dbf6d1 100644 --- a/README.md +++ b/README.md @@ -74,8 +74,6 @@ http_archive( load("@rules_scala3//rules/scala:workspace.bzl", "scala_register_toolchains", "scala_repositories") scala_repositories() -load("@annex//:defs.bzl", annex_pinned_maven_install = "pinned_maven_install") -annex_pinned_maven_install() scala_register_toolchains() load("@rules_scala3//rules/scalafmt:config.bzl", "scalafmt_default_config") diff --git a/justfile b/justfile index 7f4aedae..a780843b 100644 --- a/justfile +++ b/justfile @@ -2,17 +2,14 @@ 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 - bazel run @annex//: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 cd tests && REPIN=1 bazel run @unpinned_annex_test//:pin deps-outdated: - bazel run @annex//:outdated bazel run @annex_deps//:outdated cd tests && bazel run @annex_test//:outdated diff --git a/rules/scala/workspace.bzl b/rules/scala/workspace.bzl index 21142ccc..b7f6efa7 100644 --- a/rules/scala/workspace.bzl +++ b/rules/scala/workspace.bzl @@ -35,28 +35,7 @@ repositories = [ sbt_version = "2.0.0-M2" zinc_version = "2.0.0-alpha14" -def scala_artifacts(): - return [ - "com.github.scopt:scopt_3:4.1.0", - "org.jacoco:org.jacoco.core:0.8.10", - "org.jline:jline-reader:3.24.1", - "org.scala-lang.modules:scala-xml_3:2.3.0", - "org.scala-sbt:test-interface:1.0", - "org.scala-sbt:util-interface:" + sbt_version, - "org.scala-sbt:util-logging_3:" + sbt_version, - "org.scala-sbt:zinc_3:" + zinc_version, - "org.scalameta:munit_3:1.0.2", - ] - def scala_repositories(): - maven_install( - name = "annex", - artifacts = scala_artifacts(), - repositories = repositories, - fetch_sources = True, - maven_install_json = "@rules_scala3//:annex_install.json", - ) - http_archive( name = "compiler_bridge_2_13", build_file_content = _SRC_FILEGROUP_BUILD_FILE_CONTENT,