From 88003f5495561d8fc963f44e542f4111f11c0647 Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Thu, 14 Sep 2023 12:08:37 -0600 Subject: [PATCH 01/11] Upgrade rules_jvm_external This also increases the bazel version. This also bumps the version of rules_nodejs. It is still very out of date, but I wanted to keep the scope of the changes small, and the previous version didn't work on current versions of bazel. --- .bazelversion | 2 +- .github/workflows/ci.yml | 2 +- WORKSPACE | 14 +- twirl_install.json | 862 +++++++++++++++++++++------------------ twirl_test_install.json | 717 +++++++++++++++----------------- 5 files changed, 802 insertions(+), 795 deletions(-) diff --git a/.bazelversion b/.bazelversion index 219a68a..e3d191c 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -bazelbuild/3.3.0 +bazelbuild/6.3.2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 706a012..fc53093 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-18.04, macos-10.15] - bazel_version: [bazelbuild/3.2.0, bazelbuild/3.3.0] + bazel_version: [bazelbuild/5.3.0, bazelbuild/6.3.2] steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 diff --git a/WORKSPACE b/WORKSPACE index 17e2ce8..7cec9f3 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,10 +3,10 @@ workspace(name = "io_bazel_rules_twirl") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # rules_jvm_external -RULES_JVM_EXTERNAL_TAG = "4.2" +RULES_JVM_EXTERNAL_TAG = "5.3" http_archive( name = "rules_jvm_external", - sha256 = "cd1a77b7b02e8e008439ca76fd34f5b07aecb8c752961f9640dea15e9e5ba1ca", + sha256 = "6cc8444b20307113a62b676846c29ff018402fd4c7097fcd6d0a0fd5f2e86429", strip_prefix = "rules_jvm_external-{}".format(RULES_JVM_EXTERNAL_TAG), type = "zip", url = "https://github.com/bazelbuild/rules_jvm_external/archive/{}.zip".format(RULES_JVM_EXTERNAL_TAG), @@ -36,10 +36,10 @@ bazel_skylib_workspace() # rules_nodejs # To use the JavaScript version of Sass, we need to first install nodejs -rules_nodejs_version = "1.4.1" +rules_nodejs_version = "1.7.0" http_archive( name = "build_bazel_rules_nodejs", - sha256 = "6ea46cb994e349ceb255ec8340370883813cac825e6157770a15f11874d232d2", + sha256 = "82030031436c265e7fc427b08d581eeb658d1feca23c73df6e633b0951e9f14f", strip_prefix = "rules_nodejs-{}".format(rules_nodejs_version), type = "zip", url = "https://github.com/bazelbuild/rules_nodejs/archive/{}.zip".format(rules_nodejs_version), @@ -100,13 +100,13 @@ protobuf_deps() # higherkindness/rules_scala (used for tests only) # TODO: Move tests into their own worskpace s.t. we don't need their dependenices here -rules_scala_annex_version = "ff423d8bdd0e5383f8f2c048ffd7704bb51a91bf" # update this as needed +rules_scala_annex_version = "938ffdc24fb25a58220aa650948761073f1dd83b" http_archive( name = "rules_scala_annex", - sha256 = "ae53e9ed5fecadc7baf4637b88109471602be73dda4e5ff6b4bf1767932703c0", + sha256 = "ae0cfd560a5238248d5f4c9fcde352e5dfc87cba5efd0b97e4c88ea839fd51b5", strip_prefix = "rules_scala-{}".format(rules_scala_annex_version), type = "zip", - url = "https://github.com/higherkindness/rules_scala/archive/{}.zip".format(rules_scala_annex_version), + url = "https://github.com/lucidsoftware/rules_scala/archive/{}.zip".format(rules_scala_annex_version), ) bind( diff --git a/twirl_install.json b/twirl_install.json index 86f80d2..2943a4d 100644 --- a/twirl_install.json +++ b/twirl_install.json @@ -1,391 +1,477 @@ { - "dependency_tree": { - "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 798093658, - "__RESOLVED_ARTIFACTS_HASH": -125669043, - "conflict_resolution": {}, - "dependencies": [ - { - "coord": "com.github.scopt:scopt_2.12:jar:sources:3.7.0", - "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/com/github/scopt/scopt_2.12/3.7.0/scopt_2.12-3.7.0-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/com/github/scopt/scopt_2.12/3.7.0/scopt_2.12-3.7.0-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/com/github/scopt/scopt_2.12/3.7.0/scopt_2.12-3.7.0-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/com/github/scopt/scopt_2.12/3.7.0/scopt_2.12-3.7.0-sources.jar" - ], - "sha256": "5d642a8f96c9e0243d15badd519ffb2a7f2786ce70d5e5c21003bb9b70ff507d", - "url": "https://repo.maven.apache.org/maven2/com/github/scopt/scopt_2.12/3.7.0/scopt_2.12-3.7.0-sources.jar" - }, - { - "coord": "com.github.scopt:scopt_2.12:3.7.0", - "dependencies": [ - "org.scala-lang:scala-library:2.12.4" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/com/github/scopt/scopt_2.12/3.7.0/scopt_2.12-3.7.0.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/com/github/scopt/scopt_2.12/3.7.0/scopt_2.12-3.7.0.jar", - "https://maven-central.storage-download.googleapis.com/maven2/com/github/scopt/scopt_2.12/3.7.0/scopt_2.12-3.7.0.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/com/github/scopt/scopt_2.12/3.7.0/scopt_2.12-3.7.0.jar" - ], - "sha256": "1105ff2819f267e06b9a84843231a9fd7a69817c49e5d67167cb601e47ce2c56", - "url": "https://repo.maven.apache.org/maven2/com/github/scopt/scopt_2.12/3.7.0/scopt_2.12-3.7.0.jar" - }, - { - "coord": "com.lucidchart:twirl-compiler-cli:jar:sources:0.1", - "dependencies": [ - "com.github.scopt:scopt_2.12:jar:sources:3.7.0", - "com.typesafe.play:twirl-api_2.12:jar:sources:1.2.1", - "com.typesafe.play:twirl-compiler_2.12:jar:sources:1.2.1", - "com.typesafe.play:twirl-parser_2.12:jar:sources:1.2.1", - "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources:1.1.0", - "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.5", - "org.scala-lang:scala-compiler:jar:sources:2.12.0", - "org.scala-lang:scala-library:jar:sources:2.12.4", - "org.scala-lang:scala-reflect:jar:sources:2.12.0" - ], - "directDependencies": [ - "com.github.scopt:scopt_2.12:jar:sources:3.7.0", - "com.typesafe.play:twirl-compiler_2.12:jar:sources:1.2.1", - "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources:1.1.0" - ], - "file": "v1/https/repo.maven.apache.org/maven2/com/lucidchart/twirl-compiler-cli/0.1/twirl-compiler-cli-0.1-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/com/lucidchart/twirl-compiler-cli/0.1/twirl-compiler-cli-0.1-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/com/lucidchart/twirl-compiler-cli/0.1/twirl-compiler-cli-0.1-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/com/lucidchart/twirl-compiler-cli/0.1/twirl-compiler-cli-0.1-sources.jar" - ], - "sha256": "561888a95148cb52f1c474fdebb593035221924d8abac9cb7bf11a5ca32a4f3c", - "url": "https://repo.maven.apache.org/maven2/com/lucidchart/twirl-compiler-cli/0.1/twirl-compiler-cli-0.1-sources.jar" - }, - { - "coord": "com.lucidchart:twirl-compiler-cli:0.1", - "dependencies": [ - "com.github.scopt:scopt_2.12:3.7.0", - "com.typesafe.play:twirl-api_2.12:1.2.1", - "com.typesafe.play:twirl-compiler_2.12:1.2.1", - "com.typesafe.play:twirl-parser_2.12:1.2.1", - "org.scala-lang.modules:scala-parser-combinators_2.12:1.1.0", - "org.scala-lang.modules:scala-xml_2.12:1.0.5", - "org.scala-lang:scala-compiler:2.12.0", - "org.scala-lang:scala-library:2.12.4", - "org.scala-lang:scala-reflect:2.12.0" - ], - "directDependencies": [ - "com.github.scopt:scopt_2.12:3.7.0", - "com.typesafe.play:twirl-compiler_2.12:1.2.1", - "org.scala-lang.modules:scala-parser-combinators_2.12:1.1.0" - ], - "file": "v1/https/repo.maven.apache.org/maven2/com/lucidchart/twirl-compiler-cli/0.1/twirl-compiler-cli-0.1.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/com/lucidchart/twirl-compiler-cli/0.1/twirl-compiler-cli-0.1.jar", - "https://maven-central.storage-download.googleapis.com/maven2/com/lucidchart/twirl-compiler-cli/0.1/twirl-compiler-cli-0.1.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/com/lucidchart/twirl-compiler-cli/0.1/twirl-compiler-cli-0.1.jar" - ], - "sha256": "03cacc6b81ab9a788e8d2651e1900995edbd824414e6b259083cce2a08cf3489", - "url": "https://repo.maven.apache.org/maven2/com/lucidchart/twirl-compiler-cli/0.1/twirl-compiler-cli-0.1.jar" - }, - { - "coord": "com.typesafe.play:twirl-api_2.12:jar:sources:1.2.1", - "dependencies": [ - "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.5", - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "directDependencies": [ - "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.5", - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1-sources.jar" - ], - "sha256": "37115905a4a62ff85f1cb324407c672dbb5710a7b938c724fad418a31317d01a", - "url": "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1-sources.jar" - }, - { - "coord": "com.typesafe.play:twirl-api_2.12:1.2.1", - "dependencies": [ - "org.scala-lang.modules:scala-xml_2.12:1.0.5", - "org.scala-lang:scala-library:2.12.4" - ], - "directDependencies": [ - "org.scala-lang.modules:scala-xml_2.12:1.0.5", - "org.scala-lang:scala-library:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1.jar", - "https://maven-central.storage-download.googleapis.com/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1.jar" - ], - "sha256": "a49f55199ad9e3b19a5dc51c812edca5d270ee8ca7d763a793a0e462fc3dbf61", - "url": "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1.jar" - }, - { - "coord": "com.typesafe.play:twirl-compiler_2.12:jar:sources:1.2.1", - "dependencies": [ - "com.typesafe.play:twirl-api_2.12:jar:sources:1.2.1", - "com.typesafe.play:twirl-parser_2.12:jar:sources:1.2.1", - "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.5", - "org.scala-lang:scala-compiler:jar:sources:2.12.0", - "org.scala-lang:scala-library:jar:sources:2.12.4", - "org.scala-lang:scala-reflect:jar:sources:2.12.0" - ], - "directDependencies": [ - "com.typesafe.play:twirl-api_2.12:jar:sources:1.2.1", - "com.typesafe.play:twirl-parser_2.12:jar:sources:1.2.1", - "org.scala-lang:scala-compiler:jar:sources:2.12.0", - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/com/typesafe/play/twirl-compiler_2.12/1.2.1/twirl-compiler_2.12-1.2.1-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-compiler_2.12/1.2.1/twirl-compiler_2.12-1.2.1-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/com/typesafe/play/twirl-compiler_2.12/1.2.1/twirl-compiler_2.12-1.2.1-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/com/typesafe/play/twirl-compiler_2.12/1.2.1/twirl-compiler_2.12-1.2.1-sources.jar" - ], - "sha256": "b4ae29960bc2080f42ca5bc2b7dc52ad542c1de2901b8a0a476ec0109e5f6e92", - "url": "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-compiler_2.12/1.2.1/twirl-compiler_2.12-1.2.1-sources.jar" - }, - { - "coord": "com.typesafe.play:twirl-compiler_2.12:1.2.1", - "dependencies": [ - "com.typesafe.play:twirl-api_2.12:1.2.1", - "com.typesafe.play:twirl-parser_2.12:1.2.1", - "org.scala-lang.modules:scala-xml_2.12:1.0.5", - "org.scala-lang:scala-compiler:2.12.0", - "org.scala-lang:scala-library:2.12.4", - "org.scala-lang:scala-reflect:2.12.0" - ], - "directDependencies": [ - "com.typesafe.play:twirl-api_2.12:1.2.1", - "com.typesafe.play:twirl-parser_2.12:1.2.1", - "org.scala-lang:scala-compiler:2.12.0", - "org.scala-lang:scala-library:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/com/typesafe/play/twirl-compiler_2.12/1.2.1/twirl-compiler_2.12-1.2.1.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-compiler_2.12/1.2.1/twirl-compiler_2.12-1.2.1.jar", - "https://maven-central.storage-download.googleapis.com/maven2/com/typesafe/play/twirl-compiler_2.12/1.2.1/twirl-compiler_2.12-1.2.1.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/com/typesafe/play/twirl-compiler_2.12/1.2.1/twirl-compiler_2.12-1.2.1.jar" - ], - "sha256": "ca7ef64727d5f12bb111ae9a42f068745a3db736f8f252e8dc15308533d1445a", - "url": "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-compiler_2.12/1.2.1/twirl-compiler_2.12-1.2.1.jar" - }, - { - "coord": "com.typesafe.play:twirl-parser_2.12:jar:sources:1.2.1", - "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/com/typesafe/play/twirl-parser_2.12/1.2.1/twirl-parser_2.12-1.2.1-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-parser_2.12/1.2.1/twirl-parser_2.12-1.2.1-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/com/typesafe/play/twirl-parser_2.12/1.2.1/twirl-parser_2.12-1.2.1-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/com/typesafe/play/twirl-parser_2.12/1.2.1/twirl-parser_2.12-1.2.1-sources.jar" - ], - "sha256": "6ff4991cf5a5f775f9237eca5d8e905e51f1ba1abffd51ac1a7620e10ac67c04", - "url": "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-parser_2.12/1.2.1/twirl-parser_2.12-1.2.1-sources.jar" - }, - { - "coord": "com.typesafe.play:twirl-parser_2.12:1.2.1", - "dependencies": [ - "org.scala-lang:scala-library:2.12.4" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/com/typesafe/play/twirl-parser_2.12/1.2.1/twirl-parser_2.12-1.2.1.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-parser_2.12/1.2.1/twirl-parser_2.12-1.2.1.jar", - "https://maven-central.storage-download.googleapis.com/maven2/com/typesafe/play/twirl-parser_2.12/1.2.1/twirl-parser_2.12-1.2.1.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/com/typesafe/play/twirl-parser_2.12/1.2.1/twirl-parser_2.12-1.2.1.jar" - ], - "sha256": "38787b61b449c693251243f65a9c20c57b8ecff6be8336403084072cdf3cb504", - "url": "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-parser_2.12/1.2.1/twirl-parser_2.12-1.2.1.jar" - }, - { - "coord": "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources:1.1.0", - "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.1.0/scala-parser-combinators_2.12-1.1.0-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.1.0/scala-parser-combinators_2.12-1.1.0-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.1.0/scala-parser-combinators_2.12-1.1.0-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.1.0/scala-parser-combinators_2.12-1.1.0-sources.jar" - ], - "sha256": "08d173ec107691c45a2cddf698df21600dea1c720ef3b0dbeb84b42d133d7290", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.1.0/scala-parser-combinators_2.12-1.1.0-sources.jar" - }, - { - "coord": "org.scala-lang.modules:scala-parser-combinators_2.12:1.1.0", - "dependencies": [ - "org.scala-lang:scala-library:2.12.4" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.1.0/scala-parser-combinators_2.12-1.1.0.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.1.0/scala-parser-combinators_2.12-1.1.0.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.1.0/scala-parser-combinators_2.12-1.1.0.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.1.0/scala-parser-combinators_2.12-1.1.0.jar" - ], - "sha256": "102f2a13efae9486cb4fc01aa4eb92c0543dbd8403f825041746c689f80556e3", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.1.0/scala-parser-combinators_2.12-1.1.0.jar" - }, - { - "coord": "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.5", - "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.5/scala-xml_2.12-1.0.5-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.5/scala-xml_2.12-1.0.5-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.5/scala-xml_2.12-1.0.5-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.5/scala-xml_2.12-1.0.5-sources.jar" - ], - "sha256": "b852d7d7c4321fe745db9189a0c9e905099871129352cd0da7cc78ac02b06318", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.5/scala-xml_2.12-1.0.5-sources.jar" - }, - { - "coord": "org.scala-lang.modules:scala-xml_2.12:1.0.5", - "dependencies": [ - "org.scala-lang:scala-library:2.12.4" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.5/scala-xml_2.12-1.0.5.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.5/scala-xml_2.12-1.0.5.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.5/scala-xml_2.12-1.0.5.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.5/scala-xml_2.12-1.0.5.jar" - ], - "sha256": "035015366f54f403d076d95f4529ce9eeaf544064dbc17c2d10e4f5908ef4256", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.5/scala-xml_2.12-1.0.5.jar" - }, - { - "coord": "org.scala-lang:scala-compiler:jar:sources:2.12.0", - "dependencies": [ - "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.5", - "org.scala-lang:scala-library:jar:sources:2.12.4", - "org.scala-lang:scala-reflect:jar:sources:2.12.0" - ], - "directDependencies": [ - "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.5", - "org.scala-lang:scala-library:jar:sources:2.12.4", - "org.scala-lang:scala-reflect:jar:sources:2.12.0" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala-compiler/2.12.0/scala-compiler-2.12.0-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/scala-compiler/2.12.0/scala-compiler-2.12.0-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala-compiler/2.12.0/scala-compiler-2.12.0-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.0/scala-compiler-2.12.0-sources.jar" - ], - "sha256": "77f42695bc54feae490878bd1b0b9c53e6f6ba0adba8577ae6b7106b66f4ef78", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala-compiler/2.12.0/scala-compiler-2.12.0-sources.jar" - }, - { - "coord": "org.scala-lang:scala-compiler:2.12.0", - "dependencies": [ - "org.scala-lang.modules:scala-xml_2.12:1.0.5", - "org.scala-lang:scala-library:2.12.4", - "org.scala-lang:scala-reflect:2.12.0" - ], - "directDependencies": [ - "org.scala-lang.modules:scala-xml_2.12:1.0.5", - "org.scala-lang:scala-library:2.12.4", - "org.scala-lang:scala-reflect:2.12.0" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala-compiler/2.12.0/scala-compiler-2.12.0.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/scala-compiler/2.12.0/scala-compiler-2.12.0.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala-compiler/2.12.0/scala-compiler-2.12.0.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.0/scala-compiler-2.12.0.jar" - ], - "sha256": "c767f79f9c529cedba2805db910164d5846f1f6d02424c6d7aadfc42ae5dadf1", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala-compiler/2.12.0/scala-compiler-2.12.0.jar" - }, - { - "coord": "org.scala-lang:scala-library:jar:sources:2.12.4", - "dependencies": [], - "directDependencies": [], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4-sources.jar" - ], - "sha256": "b9c34cf968a0e348ecec32837797a794ffeade2fe016323474fe756cb7d74042", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4-sources.jar" - }, - { - "coord": "org.scala-lang:scala-library:2.12.4", - "dependencies": [], - "directDependencies": [], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar" - ], - "sha256": "17824fcee4d3f46cfaa4da84ebad4f58496426c2b9bc9e341f812ab23a667d5d", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar" - }, - { - "coord": "org.scala-lang:scala-reflect:jar:sources:2.12.0", - "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.12.0/scala-reflect-2.12.0-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.12.0/scala-reflect-2.12.0-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala-reflect/2.12.0/scala-reflect-2.12.0-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.0/scala-reflect-2.12.0-sources.jar" - ], - "sha256": "c21130c1ec42b207da452bae3e64b6d237837a2c5954ed29203053690da100a8", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.12.0/scala-reflect-2.12.0-sources.jar" - }, - { - "coord": "org.scala-lang:scala-reflect:2.12.0", - "dependencies": [ - "org.scala-lang:scala-library:2.12.4" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.4" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.12.0/scala-reflect-2.12.0.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.12.0/scala-reflect-2.12.0.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala-reflect/2.12.0/scala-reflect-2.12.0.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.0/scala-reflect-2.12.0.jar" - ], - "sha256": "f56553934378e6d3e8bf1d759a51f8b2fc4c99370774f0aaedaab8619517ccbe", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.12.0/scala-reflect-2.12.0.jar" - } - ], - "version": "0.1.0" + "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", + "__INPUT_ARTIFACTS_HASH": 809743710, + "__RESOLVED_ARTIFACTS_HASH": 193887225, + "artifacts": { + "com.github.scopt:scopt_2.12": { + "shasums": { + "jar": "1105ff2819f267e06b9a84843231a9fd7a69817c49e5d67167cb601e47ce2c56", + "sources": "5d642a8f96c9e0243d15badd519ffb2a7f2786ce70d5e5c21003bb9b70ff507d" + }, + "version": "3.7.0" + }, + "com.lucidchart:twirl-compiler-cli": { + "shasums": { + "jar": "03cacc6b81ab9a788e8d2651e1900995edbd824414e6b259083cce2a08cf3489", + "sources": "561888a95148cb52f1c474fdebb593035221924d8abac9cb7bf11a5ca32a4f3c" + }, + "version": "0.1" + }, + "com.typesafe.play:twirl-api_2.12": { + "shasums": { + "jar": "a49f55199ad9e3b19a5dc51c812edca5d270ee8ca7d763a793a0e462fc3dbf61", + "sources": "37115905a4a62ff85f1cb324407c672dbb5710a7b938c724fad418a31317d01a" + }, + "version": "1.2.1" + }, + "com.typesafe.play:twirl-compiler_2.12": { + "shasums": { + "jar": "ca7ef64727d5f12bb111ae9a42f068745a3db736f8f252e8dc15308533d1445a", + "sources": "b4ae29960bc2080f42ca5bc2b7dc52ad542c1de2901b8a0a476ec0109e5f6e92" + }, + "version": "1.2.1" + }, + "com.typesafe.play:twirl-parser_2.12": { + "shasums": { + "jar": "38787b61b449c693251243f65a9c20c57b8ecff6be8336403084072cdf3cb504", + "sources": "6ff4991cf5a5f775f9237eca5d8e905e51f1ba1abffd51ac1a7620e10ac67c04" + }, + "version": "1.2.1" + }, + "org.scala-lang.modules:scala-parser-combinators_2.12": { + "shasums": { + "jar": "102f2a13efae9486cb4fc01aa4eb92c0543dbd8403f825041746c689f80556e3", + "sources": "08d173ec107691c45a2cddf698df21600dea1c720ef3b0dbeb84b42d133d7290" + }, + "version": "1.1.0" + }, + "org.scala-lang.modules:scala-xml_2.12": { + "shasums": { + "jar": "035015366f54f403d076d95f4529ce9eeaf544064dbc17c2d10e4f5908ef4256", + "sources": "b852d7d7c4321fe745db9189a0c9e905099871129352cd0da7cc78ac02b06318" + }, + "version": "1.0.5" + }, + "org.scala-lang:scala-compiler": { + "shasums": { + "jar": "c767f79f9c529cedba2805db910164d5846f1f6d02424c6d7aadfc42ae5dadf1", + "sources": "77f42695bc54feae490878bd1b0b9c53e6f6ba0adba8577ae6b7106b66f4ef78" + }, + "version": "2.12.0" + }, + "org.scala-lang:scala-library": { + "shasums": { + "jar": "17824fcee4d3f46cfaa4da84ebad4f58496426c2b9bc9e341f812ab23a667d5d", + "sources": "b9c34cf968a0e348ecec32837797a794ffeade2fe016323474fe756cb7d74042" + }, + "version": "2.12.4" + }, + "org.scala-lang:scala-reflect": { + "shasums": { + "jar": "f56553934378e6d3e8bf1d759a51f8b2fc4c99370774f0aaedaab8619517ccbe", + "sources": "c21130c1ec42b207da452bae3e64b6d237837a2c5954ed29203053690da100a8" + }, + "version": "2.12.0" } + }, + "dependencies": { + "com.github.scopt:scopt_2.12": [ + "org.scala-lang:scala-library" + ], + "com.lucidchart:twirl-compiler-cli": [ + "com.github.scopt:scopt_2.12", + "com.typesafe.play:twirl-compiler_2.12", + "org.scala-lang.modules:scala-parser-combinators_2.12" + ], + "com.typesafe.play:twirl-api_2.12": [ + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang:scala-library" + ], + "com.typesafe.play:twirl-compiler_2.12": [ + "com.typesafe.play:twirl-api_2.12", + "com.typesafe.play:twirl-parser_2.12", + "org.scala-lang:scala-compiler", + "org.scala-lang:scala-library" + ], + "com.typesafe.play:twirl-parser_2.12": [ + "org.scala-lang:scala-library" + ], + "org.scala-lang.modules:scala-parser-combinators_2.12": [ + "org.scala-lang:scala-library" + ], + "org.scala-lang.modules:scala-xml_2.12": [ + "org.scala-lang:scala-library" + ], + "org.scala-lang:scala-compiler": [ + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang:scala-library", + "org.scala-lang:scala-reflect" + ], + "org.scala-lang:scala-reflect": [ + "org.scala-lang:scala-library" + ] + }, + "packages": { + "com.github.scopt:scopt_2.12": [ + "scopt" + ], + "com.lucidchart:twirl-compiler-cli": [ + "com.google.devtools.build.lib.worker", + "com.google.protobuf", + "com.google.protobuf.compiler", + "higherkindness.rules_scala.common.args", + "higherkindness.rules_scala.common.worker", + "play.twirl.api", + "play.twirl.api.utils", + "play.twirl.compiler", + "play.twirl.parser", + "rulestwirl.twirl", + "scala", + "scala.annotation", + "scala.annotation.meta", + "scala.annotation.unchecked", + "scala.beans", + "scala.collection", + "scala.collection.concurrent", + "scala.collection.convert", + "scala.collection.generic", + "scala.collection.immutable", + "scala.collection.mutable", + "scala.collection.parallel", + "scala.collection.parallel.immutable", + "scala.collection.parallel.mutable", + "scala.collection.script", + "scala.compat", + "scala.concurrent", + "scala.concurrent.duration", + "scala.concurrent.forkjoin", + "scala.concurrent.impl", + "scala.io", + "scala.math", + "scala.ref", + "scala.reflect", + "scala.reflect.api", + "scala.reflect.internal", + "scala.reflect.internal.annotations", + "scala.reflect.internal.pickling", + "scala.reflect.internal.settings", + "scala.reflect.internal.tpe", + "scala.reflect.internal.transform", + "scala.reflect.internal.util", + "scala.reflect.io", + "scala.reflect.macros", + "scala.reflect.macros.blackbox", + "scala.reflect.macros.compiler", + "scala.reflect.macros.contexts", + "scala.reflect.macros.internal", + "scala.reflect.macros.runtime", + "scala.reflect.macros.util", + "scala.reflect.macros.whitebox", + "scala.reflect.quasiquotes", + "scala.reflect.reify", + "scala.reflect.reify.codegen", + "scala.reflect.reify.phases", + "scala.reflect.reify.utils", + "scala.reflect.runtime", + "scala.runtime", + "scala.runtime.java8", + "scala.sys", + "scala.sys.process", + "scala.text", + "scala.tools.ant", + "scala.tools.ant.sabbus", + "scala.tools.asm", + "scala.tools.asm.commons", + "scala.tools.asm.signature", + "scala.tools.asm.tree", + "scala.tools.asm.tree.analysis", + "scala.tools.asm.util", + "scala.tools.cmd", + "scala.tools.fusesource_embedded.hawtjni.runtime", + "scala.tools.fusesource_embedded.jansi", + "scala.tools.fusesource_embedded.jansi.internal", + "scala.tools.jline_embedded", + "scala.tools.jline_embedded.console", + "scala.tools.jline_embedded.console.completer", + "scala.tools.jline_embedded.console.history", + "scala.tools.jline_embedded.internal", + "scala.tools.nsc", + "scala.tools.nsc.ast", + "scala.tools.nsc.ast.parser", + "scala.tools.nsc.ast.parser.xml", + "scala.tools.nsc.backend", + "scala.tools.nsc.backend.jvm", + "scala.tools.nsc.backend.jvm.analysis", + "scala.tools.nsc.backend.jvm.opt", + "scala.tools.nsc.classpath", + "scala.tools.nsc.doc", + "scala.tools.nsc.doc.base", + "scala.tools.nsc.doc.base.comment", + "scala.tools.nsc.doc.doclet", + "scala.tools.nsc.doc.html", + "scala.tools.nsc.doc.html.page", + "scala.tools.nsc.doc.html.page.diagram", + "scala.tools.nsc.doc.model", + "scala.tools.nsc.doc.model.diagram", + "scala.tools.nsc.interactive", + "scala.tools.nsc.interactive.tests", + "scala.tools.nsc.interactive.tests.core", + "scala.tools.nsc.interpreter", + "scala.tools.nsc.interpreter.jline", + "scala.tools.nsc.interpreter.jline_embedded", + "scala.tools.nsc.interpreter.session", + "scala.tools.nsc.io", + "scala.tools.nsc.javac", + "scala.tools.nsc.plugins", + "scala.tools.nsc.profile", + "scala.tools.nsc.reporters", + "scala.tools.nsc.settings", + "scala.tools.nsc.symtab", + "scala.tools.nsc.symtab.classfile", + "scala.tools.nsc.transform", + "scala.tools.nsc.transform.patmat", + "scala.tools.nsc.typechecker", + "scala.tools.nsc.util", + "scala.tools.reflect", + "scala.tools.util", + "scala.util", + "scala.util.control", + "scala.util.hashing", + "scala.util.matching", + "scala.util.parsing.combinator", + "scala.util.parsing.combinator.lexical", + "scala.util.parsing.combinator.syntactical", + "scala.util.parsing.combinator.token", + "scala.util.parsing.input", + "scala.util.parsing.json", + "scala.xml", + "scala.xml.dtd", + "scala.xml.dtd.impl", + "scala.xml.factory", + "scala.xml.include", + "scala.xml.include.sax", + "scala.xml.parsing", + "scala.xml.persistent", + "scala.xml.pull", + "scala.xml.transform", + "scopt" + ], + "com.typesafe.play:twirl-api_2.12": [ + "play.twirl.api", + "play.twirl.api.utils" + ], + "com.typesafe.play:twirl-compiler_2.12": [ + "play.twirl.compiler" + ], + "com.typesafe.play:twirl-parser_2.12": [ + "play.twirl.parser" + ], + "org.scala-lang.modules:scala-parser-combinators_2.12": [ + "scala.util.parsing.combinator", + "scala.util.parsing.combinator.lexical", + "scala.util.parsing.combinator.syntactical", + "scala.util.parsing.combinator.token", + "scala.util.parsing.input", + "scala.util.parsing.json" + ], + "org.scala-lang.modules:scala-xml_2.12": [ + "scala.xml", + "scala.xml.dtd", + "scala.xml.dtd.impl", + "scala.xml.factory", + "scala.xml.include", + "scala.xml.include.sax", + "scala.xml.parsing", + "scala.xml.persistent", + "scala.xml.pull", + "scala.xml.transform" + ], + "org.scala-lang:scala-compiler": [ + "scala.reflect.macros.compiler", + "scala.reflect.macros.contexts", + "scala.reflect.macros.runtime", + "scala.reflect.macros.util", + "scala.reflect.quasiquotes", + "scala.reflect.reify", + "scala.reflect.reify.codegen", + "scala.reflect.reify.phases", + "scala.reflect.reify.utils", + "scala.tools.ant", + "scala.tools.ant.sabbus", + "scala.tools.asm", + "scala.tools.asm.commons", + "scala.tools.asm.signature", + "scala.tools.asm.tree", + "scala.tools.asm.tree.analysis", + "scala.tools.asm.util", + "scala.tools.cmd", + "scala.tools.fusesource_embedded.hawtjni.runtime", + "scala.tools.fusesource_embedded.jansi", + "scala.tools.fusesource_embedded.jansi.internal", + "scala.tools.jline_embedded", + "scala.tools.jline_embedded.console", + "scala.tools.jline_embedded.console.completer", + "scala.tools.jline_embedded.console.history", + "scala.tools.jline_embedded.internal", + "scala.tools.nsc", + "scala.tools.nsc.ast", + "scala.tools.nsc.ast.parser", + "scala.tools.nsc.ast.parser.xml", + "scala.tools.nsc.backend", + "scala.tools.nsc.backend.jvm", + "scala.tools.nsc.backend.jvm.analysis", + "scala.tools.nsc.backend.jvm.opt", + "scala.tools.nsc.classpath", + "scala.tools.nsc.doc", + "scala.tools.nsc.doc.base", + "scala.tools.nsc.doc.base.comment", + "scala.tools.nsc.doc.doclet", + "scala.tools.nsc.doc.html", + "scala.tools.nsc.doc.html.page", + "scala.tools.nsc.doc.html.page.diagram", + "scala.tools.nsc.doc.model", + "scala.tools.nsc.doc.model.diagram", + "scala.tools.nsc.interactive", + "scala.tools.nsc.interactive.tests", + "scala.tools.nsc.interactive.tests.core", + "scala.tools.nsc.interpreter", + "scala.tools.nsc.interpreter.jline", + "scala.tools.nsc.interpreter.jline_embedded", + "scala.tools.nsc.interpreter.session", + "scala.tools.nsc.io", + "scala.tools.nsc.javac", + "scala.tools.nsc.plugins", + "scala.tools.nsc.reporters", + "scala.tools.nsc.settings", + "scala.tools.nsc.symtab", + "scala.tools.nsc.symtab.classfile", + "scala.tools.nsc.transform", + "scala.tools.nsc.transform.patmat", + "scala.tools.nsc.typechecker", + "scala.tools.nsc.util", + "scala.tools.partest", + "scala.tools.reflect", + "scala.tools.util" + ], + "org.scala-lang:scala-library": [ + "scala", + "scala.annotation", + "scala.annotation.meta", + "scala.annotation.unchecked", + "scala.beans", + "scala.collection", + "scala.collection.concurrent", + "scala.collection.convert", + "scala.collection.generic", + "scala.collection.immutable", + "scala.collection.mutable", + "scala.collection.parallel", + "scala.collection.parallel.immutable", + "scala.collection.parallel.mutable", + "scala.collection.script", + "scala.compat", + "scala.concurrent", + "scala.concurrent.duration", + "scala.concurrent.forkjoin", + "scala.concurrent.impl", + "scala.io", + "scala.math", + "scala.ref", + "scala.reflect", + "scala.reflect.macros.internal", + "scala.runtime", + "scala.runtime.java8", + "scala.sys", + "scala.sys.process", + "scala.text", + "scala.util", + "scala.util.control", + "scala.util.hashing", + "scala.util.matching" + ], + "org.scala-lang:scala-reflect": [ + "scala.reflect.api", + "scala.reflect.internal", + "scala.reflect.internal.annotations", + "scala.reflect.internal.pickling", + "scala.reflect.internal.settings", + "scala.reflect.internal.tpe", + "scala.reflect.internal.transform", + "scala.reflect.internal.util", + "scala.reflect.io", + "scala.reflect.macros", + "scala.reflect.macros.blackbox", + "scala.reflect.macros.whitebox", + "scala.reflect.runtime" + ] + }, + "repositories": { + "https://repo.maven.apache.org/maven2/": [ + "com.github.scopt:scopt_2.12", + "com.github.scopt:scopt_2.12:jar:sources", + "com.lucidchart:twirl-compiler-cli", + "com.lucidchart:twirl-compiler-cli:jar:sources", + "com.typesafe.play:twirl-api_2.12", + "com.typesafe.play:twirl-api_2.12:jar:sources", + "com.typesafe.play:twirl-compiler_2.12", + "com.typesafe.play:twirl-compiler_2.12:jar:sources", + "com.typesafe.play:twirl-parser_2.12", + "com.typesafe.play:twirl-parser_2.12:jar:sources", + "org.scala-lang.modules:scala-parser-combinators_2.12", + "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources", + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "org.scala-lang:scala-compiler", + "org.scala-lang:scala-compiler:jar:sources", + "org.scala-lang:scala-library", + "org.scala-lang:scala-library:jar:sources", + "org.scala-lang:scala-reflect", + "org.scala-lang:scala-reflect:jar:sources" + ], + "https://maven-central.storage-download.googleapis.com/maven2/": [ + "com.github.scopt:scopt_2.12", + "com.github.scopt:scopt_2.12:jar:sources", + "com.lucidchart:twirl-compiler-cli", + "com.lucidchart:twirl-compiler-cli:jar:sources", + "com.typesafe.play:twirl-api_2.12", + "com.typesafe.play:twirl-api_2.12:jar:sources", + "com.typesafe.play:twirl-compiler_2.12", + "com.typesafe.play:twirl-compiler_2.12:jar:sources", + "com.typesafe.play:twirl-parser_2.12", + "com.typesafe.play:twirl-parser_2.12:jar:sources", + "org.scala-lang.modules:scala-parser-combinators_2.12", + "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources", + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "org.scala-lang:scala-compiler", + "org.scala-lang:scala-compiler:jar:sources", + "org.scala-lang:scala-library", + "org.scala-lang:scala-library:jar:sources", + "org.scala-lang:scala-reflect", + "org.scala-lang:scala-reflect:jar:sources" + ], + "https://mirror.bazel.build/repo1.maven.org/maven2/": [ + "com.github.scopt:scopt_2.12", + "com.github.scopt:scopt_2.12:jar:sources", + "com.lucidchart:twirl-compiler-cli", + "com.lucidchart:twirl-compiler-cli:jar:sources", + "com.typesafe.play:twirl-api_2.12", + "com.typesafe.play:twirl-api_2.12:jar:sources", + "com.typesafe.play:twirl-compiler_2.12", + "com.typesafe.play:twirl-compiler_2.12:jar:sources", + "com.typesafe.play:twirl-parser_2.12", + "com.typesafe.play:twirl-parser_2.12:jar:sources", + "org.scala-lang.modules:scala-parser-combinators_2.12", + "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources", + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "org.scala-lang:scala-compiler", + "org.scala-lang:scala-compiler:jar:sources", + "org.scala-lang:scala-library", + "org.scala-lang:scala-library:jar:sources", + "org.scala-lang:scala-reflect", + "org.scala-lang:scala-reflect:jar:sources" + ] + }, + "version": "2" } diff --git a/twirl_test_install.json b/twirl_test_install.json index e550962..7c48a39 100644 --- a/twirl_test_install.json +++ b/twirl_test_install.json @@ -1,401 +1,322 @@ { - "dependency_tree": { - "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -1193139955, - "__RESOLVED_ARTIFACTS_HASH": 163133121, - "conflict_resolution": {}, - "dependencies": [ - { - "coord": "com.typesafe.play:twirl-api_2.12:jar:sources:1.2.1", - "dependencies": [ - "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.6", - "org.scala-lang:scala-library:jar:sources:2.12.2" - ], - "directDependencies": [ - "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.6", - "org.scala-lang:scala-library:jar:sources:2.12.2" - ], - "file": "v1/https/repo.maven.apache.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1-sources.jar" - ], - "sha256": "37115905a4a62ff85f1cb324407c672dbb5710a7b938c724fad418a31317d01a", - "url": "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1-sources.jar" - }, - { - "coord": "com.typesafe.play:twirl-api_2.12:1.2.1", - "dependencies": [ - "org.scala-lang.modules:scala-xml_2.12:1.0.6", - "org.scala-lang:scala-library:2.12.2" - ], - "directDependencies": [ - "org.scala-lang.modules:scala-xml_2.12:1.0.6", - "org.scala-lang:scala-library:2.12.2" - ], - "file": "v1/https/repo.maven.apache.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1.jar", - "https://maven-central.storage-download.googleapis.com/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1.jar" - ], - "sha256": "a49f55199ad9e3b19a5dc51c812edca5d270ee8ca7d763a793a0e462fc3dbf61", - "url": "https://repo.maven.apache.org/maven2/com/typesafe/play/twirl-api_2.12/1.2.1/twirl-api_2.12-1.2.1.jar" - }, - { - "coord": "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources:1.0.6", - "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.2" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.2" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.0.6/scala-parser-combinators_2.12-1.0.6-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.0.6/scala-parser-combinators_2.12-1.0.6-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.0.6/scala-parser-combinators_2.12-1.0.6-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.0.6/scala-parser-combinators_2.12-1.0.6-sources.jar" - ], - "sha256": "3735bad5882255d7561656a035129098c234fa17cbef517995c9f87fba7ab2d0", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.0.6/scala-parser-combinators_2.12-1.0.6-sources.jar" - }, - { - "coord": "org.scala-lang.modules:scala-parser-combinators_2.12:1.0.6", - "dependencies": [ - "org.scala-lang:scala-library:2.12.2" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.2" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.0.6/scala-parser-combinators_2.12-1.0.6.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.0.6/scala-parser-combinators_2.12-1.0.6.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.0.6/scala-parser-combinators_2.12-1.0.6.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.0.6/scala-parser-combinators_2.12-1.0.6.jar" - ], - "sha256": "c9dd59ef2231b73e2a415885bd9c5e4f9e593cd84c0d5a104d6722ce0294349d", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-parser-combinators_2.12/1.0.6/scala-parser-combinators_2.12-1.0.6.jar" - }, - { - "coord": "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.6", - "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.2" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.2" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6-sources.jar" - ], - "sha256": "a7e8aac79394df396afda98b35537791809d815ce15ab2224f7d31e50c753922", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6-sources.jar" - }, - { - "coord": "org.scala-lang.modules:scala-xml_2.12:1.0.6", - "dependencies": [ - "org.scala-lang:scala-library:2.12.2" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.2" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6.jar" - ], - "sha256": "7cc3b6ceb56e879cb977e8e043f4bfe2e062f78795efd7efa09f85003cb3230a", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6.jar" - }, - { - "coord": "org.scala-lang:scala-library:jar:sources:2.12.2", - "dependencies": [], - "directDependencies": [], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala-library/2.12.2/scala-library-2.12.2-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/scala-library/2.12.2/scala-library-2.12.2-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala-library/2.12.2/scala-library-2.12.2-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.2/scala-library-2.12.2-sources.jar" - ], - "sha256": "261c3f59e93ec851a40ca5d793e2487deb36453ec1ae506925565a204f483f5b", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala-library/2.12.2/scala-library-2.12.2-sources.jar" - }, - { - "coord": "org.scala-lang:scala-library:2.12.2", - "dependencies": [], - "directDependencies": [], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala-library/2.12.2/scala-library-2.12.2.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/scala-library/2.12.2/scala-library-2.12.2.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala-library/2.12.2/scala-library-2.12.2.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.2/scala-library-2.12.2.jar" - ], - "sha256": "dd668b609002b3578f2db83a1a684d706155bba2fc801cd411359fdd48218d00", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala-library/2.12.2/scala-library-2.12.2.jar" - }, - { - "coord": "org.scala-lang:scala-reflect:jar:sources:2.12.2", - "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.2" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.2" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.12.2/scala-reflect-2.12.2-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.12.2/scala-reflect-2.12.2-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala-reflect/2.12.2/scala-reflect-2.12.2-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.2/scala-reflect-2.12.2-sources.jar" - ], - "sha256": "cddd78ef5e0916367bdca191695ab229cd02ea0a2b5ba06075fc3575e936c9af", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.12.2/scala-reflect-2.12.2-sources.jar" - }, - { - "coord": "org.scala-lang:scala-reflect:2.12.2", - "dependencies": [ - "org.scala-lang:scala-library:2.12.2" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.2" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.12.2/scala-reflect-2.12.2.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.12.2/scala-reflect-2.12.2.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala-reflect/2.12.2/scala-reflect-2.12.2.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.2/scala-reflect-2.12.2.jar" - ], - "sha256": "98f9876d14b39fc7ec863c6b1b73c41a7653f886901b3ead0c4ca9215a688408", - "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.12.2/scala-reflect-2.12.2.jar" - }, - { - "coord": "org.scalaz:scalaz-core_2.12:jar:sources:7.2.12", - "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.2" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.2" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scalaz/scalaz-core_2.12/7.2.12/scalaz-core_2.12-7.2.12-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scalaz/scalaz-core_2.12/7.2.12/scalaz-core_2.12-7.2.12-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scalaz/scalaz-core_2.12/7.2.12/scalaz-core_2.12-7.2.12-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scalaz/scalaz-core_2.12/7.2.12/scalaz-core_2.12-7.2.12-sources.jar" - ], - "sha256": "0f8761b32e9a5f4957973e35754e380c98deea22285d961d735b717888c270c4", - "url": "https://repo.maven.apache.org/maven2/org/scalaz/scalaz-core_2.12/7.2.12/scalaz-core_2.12-7.2.12-sources.jar" - }, - { - "coord": "org.scalaz:scalaz-core_2.12:7.2.12", - "dependencies": [ - "org.scala-lang:scala-library:2.12.2" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.2" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scalaz/scalaz-core_2.12/7.2.12/scalaz-core_2.12-7.2.12.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scalaz/scalaz-core_2.12/7.2.12/scalaz-core_2.12-7.2.12.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scalaz/scalaz-core_2.12/7.2.12/scalaz-core_2.12-7.2.12.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scalaz/scalaz-core_2.12/7.2.12/scalaz-core_2.12-7.2.12.jar" - ], - "sha256": "fa0d36e43575ca7fd2a520a3f1dc5dbaa8259f13bb99685d23ae106c0fcd2df1", - "url": "https://repo.maven.apache.org/maven2/org/scalaz/scalaz-core_2.12/7.2.12/scalaz-core_2.12-7.2.12.jar" - }, - { - "coord": "org.scalaz:scalaz-effect_2.12:jar:sources:7.2.12", - "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.2", - "org.scalaz:scalaz-core_2.12:jar:sources:7.2.12" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.2", - "org.scalaz:scalaz-core_2.12:jar:sources:7.2.12" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scalaz/scalaz-effect_2.12/7.2.12/scalaz-effect_2.12-7.2.12-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scalaz/scalaz-effect_2.12/7.2.12/scalaz-effect_2.12-7.2.12-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scalaz/scalaz-effect_2.12/7.2.12/scalaz-effect_2.12-7.2.12-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scalaz/scalaz-effect_2.12/7.2.12/scalaz-effect_2.12-7.2.12-sources.jar" - ], - "sha256": "1407eddce20f50c3435aaed76633011de44ec71f6d288d201b29ccb8060bc25c", - "url": "https://repo.maven.apache.org/maven2/org/scalaz/scalaz-effect_2.12/7.2.12/scalaz-effect_2.12-7.2.12-sources.jar" - }, - { - "coord": "org.scalaz:scalaz-effect_2.12:7.2.12", - "dependencies": [ - "org.scala-lang:scala-library:2.12.2", - "org.scalaz:scalaz-core_2.12:7.2.12" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.2", - "org.scalaz:scalaz-core_2.12:7.2.12" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/scalaz/scalaz-effect_2.12/7.2.12/scalaz-effect_2.12-7.2.12.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/scalaz/scalaz-effect_2.12/7.2.12/scalaz-effect_2.12-7.2.12.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/scalaz/scalaz-effect_2.12/7.2.12/scalaz-effect_2.12-7.2.12.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/scalaz/scalaz-effect_2.12/7.2.12/scalaz-effect_2.12-7.2.12.jar" - ], - "sha256": "47927141e36a7adbd420d5a429660f387902d398b6713cb2c6be3db2d9365b21", - "url": "https://repo.maven.apache.org/maven2/org/scalaz/scalaz-effect_2.12/7.2.12/scalaz-effect_2.12-7.2.12.jar" - }, - { - "coord": "org.specs2:specs2-common_2.12:jar:sources:3.9.5", - "dependencies": [ - "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources:1.0.6", - "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.6", - "org.scala-lang:scala-library:jar:sources:2.12.2", - "org.scala-lang:scala-reflect:jar:sources:2.12.2", - "org.scalaz:scalaz-core_2.12:jar:sources:7.2.12", - "org.scalaz:scalaz-effect_2.12:jar:sources:7.2.12" - ], - "directDependencies": [ - "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources:1.0.6", - "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.6", - "org.scala-lang:scala-library:jar:sources:2.12.2", - "org.scala-lang:scala-reflect:jar:sources:2.12.2", - "org.scalaz:scalaz-core_2.12:jar:sources:7.2.12", - "org.scalaz:scalaz-effect_2.12:jar:sources:7.2.12" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/specs2/specs2-common_2.12/3.9.5/specs2-common_2.12-3.9.5-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/specs2/specs2-common_2.12/3.9.5/specs2-common_2.12-3.9.5-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/specs2/specs2-common_2.12/3.9.5/specs2-common_2.12-3.9.5-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/specs2/specs2-common_2.12/3.9.5/specs2-common_2.12-3.9.5-sources.jar" - ], - "sha256": "8fd91f2753c083c1a663a39cb2476eae1aa18c928b79e035c3a10824430115e7", - "url": "https://repo.maven.apache.org/maven2/org/specs2/specs2-common_2.12/3.9.5/specs2-common_2.12-3.9.5-sources.jar" - }, - { - "coord": "org.specs2:specs2-common_2.12:3.9.5", - "dependencies": [ - "org.scala-lang.modules:scala-parser-combinators_2.12:1.0.6", - "org.scala-lang.modules:scala-xml_2.12:1.0.6", - "org.scala-lang:scala-library:2.12.2", - "org.scala-lang:scala-reflect:2.12.2", - "org.scalaz:scalaz-core_2.12:7.2.12", - "org.scalaz:scalaz-effect_2.12:7.2.12" - ], - "directDependencies": [ - "org.scala-lang.modules:scala-parser-combinators_2.12:1.0.6", - "org.scala-lang.modules:scala-xml_2.12:1.0.6", - "org.scala-lang:scala-library:2.12.2", - "org.scala-lang:scala-reflect:2.12.2", - "org.scalaz:scalaz-core_2.12:7.2.12", - "org.scalaz:scalaz-effect_2.12:7.2.12" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/specs2/specs2-common_2.12/3.9.5/specs2-common_2.12-3.9.5.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/specs2/specs2-common_2.12/3.9.5/specs2-common_2.12-3.9.5.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/specs2/specs2-common_2.12/3.9.5/specs2-common_2.12-3.9.5.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/specs2/specs2-common_2.12/3.9.5/specs2-common_2.12-3.9.5.jar" - ], - "sha256": "9115e3f445b91137f3ab6ebb9ca6d6cbe3e5e54ea4668d794417378170cef628", - "url": "https://repo.maven.apache.org/maven2/org/specs2/specs2-common_2.12/3.9.5/specs2-common_2.12-3.9.5.jar" - }, - { - "coord": "org.specs2:specs2-core_2.12:jar:sources:3.9.5", - "dependencies": [ - "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources:1.0.6", - "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.6", - "org.scala-lang:scala-library:jar:sources:2.12.2", - "org.scala-lang:scala-reflect:jar:sources:2.12.2", - "org.scalaz:scalaz-core_2.12:jar:sources:7.2.12", - "org.scalaz:scalaz-effect_2.12:jar:sources:7.2.12", - "org.specs2:specs2-common_2.12:jar:sources:3.9.5", - "org.specs2:specs2-matcher_2.12:jar:sources:3.9.5" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.2", - "org.specs2:specs2-matcher_2.12:jar:sources:3.9.5" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/specs2/specs2-core_2.12/3.9.5/specs2-core_2.12-3.9.5-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/specs2/specs2-core_2.12/3.9.5/specs2-core_2.12-3.9.5-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/specs2/specs2-core_2.12/3.9.5/specs2-core_2.12-3.9.5-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/specs2/specs2-core_2.12/3.9.5/specs2-core_2.12-3.9.5-sources.jar" - ], - "sha256": "eb986ba65d85198836fd6fbd922a64fc0dfee5b76c96a7ee1f285f35837ce676", - "url": "https://repo.maven.apache.org/maven2/org/specs2/specs2-core_2.12/3.9.5/specs2-core_2.12-3.9.5-sources.jar" - }, - { - "coord": "org.specs2:specs2-core_2.12:3.9.5", - "dependencies": [ - "org.scala-lang.modules:scala-parser-combinators_2.12:1.0.6", - "org.scala-lang.modules:scala-xml_2.12:1.0.6", - "org.scala-lang:scala-library:2.12.2", - "org.scala-lang:scala-reflect:2.12.2", - "org.scalaz:scalaz-core_2.12:7.2.12", - "org.scalaz:scalaz-effect_2.12:7.2.12", - "org.specs2:specs2-common_2.12:3.9.5", - "org.specs2:specs2-matcher_2.12:3.9.5" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.2", - "org.specs2:specs2-matcher_2.12:3.9.5" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/specs2/specs2-core_2.12/3.9.5/specs2-core_2.12-3.9.5.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/specs2/specs2-core_2.12/3.9.5/specs2-core_2.12-3.9.5.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/specs2/specs2-core_2.12/3.9.5/specs2-core_2.12-3.9.5.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/specs2/specs2-core_2.12/3.9.5/specs2-core_2.12-3.9.5.jar" - ], - "sha256": "6c8667a4d73fc167b9df6d8d214ae2ed14925e5a1b0b30d649d9a63d2c32cbe3", - "url": "https://repo.maven.apache.org/maven2/org/specs2/specs2-core_2.12/3.9.5/specs2-core_2.12-3.9.5.jar" - }, - { - "coord": "org.specs2:specs2-matcher_2.12:jar:sources:3.9.5", - "dependencies": [ - "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources:1.0.6", - "org.scala-lang.modules:scala-xml_2.12:jar:sources:1.0.6", - "org.scala-lang:scala-library:jar:sources:2.12.2", - "org.scala-lang:scala-reflect:jar:sources:2.12.2", - "org.scalaz:scalaz-core_2.12:jar:sources:7.2.12", - "org.scalaz:scalaz-effect_2.12:jar:sources:7.2.12", - "org.specs2:specs2-common_2.12:jar:sources:3.9.5" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.2", - "org.specs2:specs2-common_2.12:jar:sources:3.9.5" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/specs2/specs2-matcher_2.12/3.9.5/specs2-matcher_2.12-3.9.5-sources.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/specs2/specs2-matcher_2.12/3.9.5/specs2-matcher_2.12-3.9.5-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/specs2/specs2-matcher_2.12/3.9.5/specs2-matcher_2.12-3.9.5-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/specs2/specs2-matcher_2.12/3.9.5/specs2-matcher_2.12-3.9.5-sources.jar" - ], - "sha256": "6f0aac870b35c6618bcddc82e39e0103c6b57a781557f1a96e512e8c0b001132", - "url": "https://repo.maven.apache.org/maven2/org/specs2/specs2-matcher_2.12/3.9.5/specs2-matcher_2.12-3.9.5-sources.jar" - }, - { - "coord": "org.specs2:specs2-matcher_2.12:3.9.5", - "dependencies": [ - "org.scala-lang.modules:scala-parser-combinators_2.12:1.0.6", - "org.scala-lang.modules:scala-xml_2.12:1.0.6", - "org.scala-lang:scala-library:2.12.2", - "org.scala-lang:scala-reflect:2.12.2", - "org.scalaz:scalaz-core_2.12:7.2.12", - "org.scalaz:scalaz-effect_2.12:7.2.12", - "org.specs2:specs2-common_2.12:3.9.5" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.2", - "org.specs2:specs2-common_2.12:3.9.5" - ], - "file": "v1/https/repo.maven.apache.org/maven2/org/specs2/specs2-matcher_2.12/3.9.5/specs2-matcher_2.12-3.9.5.jar", - "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/specs2/specs2-matcher_2.12/3.9.5/specs2-matcher_2.12-3.9.5.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/specs2/specs2-matcher_2.12/3.9.5/specs2-matcher_2.12-3.9.5.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/specs2/specs2-matcher_2.12/3.9.5/specs2-matcher_2.12-3.9.5.jar" - ], - "sha256": "a56dcd89584f30c40ddd0c674fcfc6aebd5935d2fd61c49a61480ac6f1963ac7", - "url": "https://repo.maven.apache.org/maven2/org/specs2/specs2-matcher_2.12/3.9.5/specs2-matcher_2.12-3.9.5.jar" - } - ], - "version": "0.1.0" + "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", + "__INPUT_ARTIFACTS_HASH": -1490000631, + "__RESOLVED_ARTIFACTS_HASH": 1016369120, + "artifacts": { + "com.typesafe.play:twirl-api_2.12": { + "shasums": { + "jar": "a49f55199ad9e3b19a5dc51c812edca5d270ee8ca7d763a793a0e462fc3dbf61", + "sources": "37115905a4a62ff85f1cb324407c672dbb5710a7b938c724fad418a31317d01a" + }, + "version": "1.2.1" + }, + "org.scala-lang.modules:scala-parser-combinators_2.12": { + "shasums": { + "jar": "c9dd59ef2231b73e2a415885bd9c5e4f9e593cd84c0d5a104d6722ce0294349d", + "sources": "3735bad5882255d7561656a035129098c234fa17cbef517995c9f87fba7ab2d0" + }, + "version": "1.0.6" + }, + "org.scala-lang.modules:scala-xml_2.12": { + "shasums": { + "jar": "7cc3b6ceb56e879cb977e8e043f4bfe2e062f78795efd7efa09f85003cb3230a", + "sources": "a7e8aac79394df396afda98b35537791809d815ce15ab2224f7d31e50c753922" + }, + "version": "1.0.6" + }, + "org.scala-lang:scala-library": { + "shasums": { + "jar": "dd668b609002b3578f2db83a1a684d706155bba2fc801cd411359fdd48218d00", + "sources": "261c3f59e93ec851a40ca5d793e2487deb36453ec1ae506925565a204f483f5b" + }, + "version": "2.12.2" + }, + "org.scala-lang:scala-reflect": { + "shasums": { + "jar": "98f9876d14b39fc7ec863c6b1b73c41a7653f886901b3ead0c4ca9215a688408", + "sources": "cddd78ef5e0916367bdca191695ab229cd02ea0a2b5ba06075fc3575e936c9af" + }, + "version": "2.12.2" + }, + "org.scalaz:scalaz-core_2.12": { + "shasums": { + "jar": "fa0d36e43575ca7fd2a520a3f1dc5dbaa8259f13bb99685d23ae106c0fcd2df1", + "sources": "0f8761b32e9a5f4957973e35754e380c98deea22285d961d735b717888c270c4" + }, + "version": "7.2.12" + }, + "org.scalaz:scalaz-effect_2.12": { + "shasums": { + "jar": "47927141e36a7adbd420d5a429660f387902d398b6713cb2c6be3db2d9365b21", + "sources": "1407eddce20f50c3435aaed76633011de44ec71f6d288d201b29ccb8060bc25c" + }, + "version": "7.2.12" + }, + "org.specs2:specs2-common_2.12": { + "shasums": { + "jar": "9115e3f445b91137f3ab6ebb9ca6d6cbe3e5e54ea4668d794417378170cef628", + "sources": "8fd91f2753c083c1a663a39cb2476eae1aa18c928b79e035c3a10824430115e7" + }, + "version": "3.9.5" + }, + "org.specs2:specs2-core_2.12": { + "shasums": { + "jar": "6c8667a4d73fc167b9df6d8d214ae2ed14925e5a1b0b30d649d9a63d2c32cbe3", + "sources": "eb986ba65d85198836fd6fbd922a64fc0dfee5b76c96a7ee1f285f35837ce676" + }, + "version": "3.9.5" + }, + "org.specs2:specs2-matcher_2.12": { + "shasums": { + "jar": "a56dcd89584f30c40ddd0c674fcfc6aebd5935d2fd61c49a61480ac6f1963ac7", + "sources": "6f0aac870b35c6618bcddc82e39e0103c6b57a781557f1a96e512e8c0b001132" + }, + "version": "3.9.5" } + }, + "dependencies": { + "com.typesafe.play:twirl-api_2.12": [ + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang:scala-library" + ], + "org.scala-lang.modules:scala-parser-combinators_2.12": [ + "org.scala-lang:scala-library" + ], + "org.scala-lang.modules:scala-xml_2.12": [ + "org.scala-lang:scala-library" + ], + "org.scala-lang:scala-reflect": [ + "org.scala-lang:scala-library" + ], + "org.scalaz:scalaz-core_2.12": [ + "org.scala-lang:scala-library" + ], + "org.scalaz:scalaz-effect_2.12": [ + "org.scala-lang:scala-library", + "org.scalaz:scalaz-core_2.12" + ], + "org.specs2:specs2-common_2.12": [ + "org.scala-lang.modules:scala-parser-combinators_2.12", + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang:scala-library", + "org.scala-lang:scala-reflect", + "org.scalaz:scalaz-core_2.12", + "org.scalaz:scalaz-effect_2.12" + ], + "org.specs2:specs2-core_2.12": [ + "org.scala-lang:scala-library", + "org.specs2:specs2-matcher_2.12" + ], + "org.specs2:specs2-matcher_2.12": [ + "org.scala-lang:scala-library", + "org.specs2:specs2-common_2.12" + ] + }, + "packages": { + "com.typesafe.play:twirl-api_2.12": [ + "play.twirl.api", + "play.twirl.api.utils" + ], + "org.scala-lang.modules:scala-parser-combinators_2.12": [ + "scala.util.parsing.combinator", + "scala.util.parsing.combinator.lexical", + "scala.util.parsing.combinator.syntactical", + "scala.util.parsing.combinator.token", + "scala.util.parsing.input", + "scala.util.parsing.json" + ], + "org.scala-lang.modules:scala-xml_2.12": [ + "scala.xml", + "scala.xml.dtd", + "scala.xml.dtd.impl", + "scala.xml.factory", + "scala.xml.include", + "scala.xml.include.sax", + "scala.xml.parsing", + "scala.xml.persistent", + "scala.xml.pull", + "scala.xml.transform" + ], + "org.scala-lang:scala-library": [ + "scala", + "scala.annotation", + "scala.annotation.meta", + "scala.annotation.unchecked", + "scala.beans", + "scala.collection", + "scala.collection.concurrent", + "scala.collection.convert", + "scala.collection.generic", + "scala.collection.immutable", + "scala.collection.mutable", + "scala.collection.parallel", + "scala.collection.parallel.immutable", + "scala.collection.parallel.mutable", + "scala.collection.script", + "scala.compat", + "scala.concurrent", + "scala.concurrent.duration", + "scala.concurrent.forkjoin", + "scala.concurrent.impl", + "scala.io", + "scala.math", + "scala.ref", + "scala.reflect", + "scala.reflect.macros.internal", + "scala.runtime", + "scala.runtime.java8", + "scala.sys", + "scala.sys.process", + "scala.text", + "scala.util", + "scala.util.control", + "scala.util.hashing", + "scala.util.matching" + ], + "org.scala-lang:scala-reflect": [ + "scala.reflect.api", + "scala.reflect.internal", + "scala.reflect.internal.annotations", + "scala.reflect.internal.pickling", + "scala.reflect.internal.settings", + "scala.reflect.internal.tpe", + "scala.reflect.internal.transform", + "scala.reflect.internal.util", + "scala.reflect.io", + "scala.reflect.macros", + "scala.reflect.macros.blackbox", + "scala.reflect.macros.whitebox", + "scala.reflect.runtime" + ], + "org.scalaz:scalaz-core_2.12": [ + "scalaz", + "scalaz.std", + "scalaz.std.java", + "scalaz.std.java.math", + "scalaz.std.java.util", + "scalaz.std.java.util.concurrent", + "scalaz.std.math", + "scalaz.syntax", + "scalaz.syntax.std" + ], + "org.scalaz:scalaz-effect_2.12": [ + "scalaz.effect", + "scalaz.std.effect", + "scalaz.std.effect.sql", + "scalaz.syntax.effect" + ], + "org.specs2:specs2-common_2.12": [ + "org.specs2.collection", + "org.specs2.concurrent", + "org.specs2.control", + "org.specs2.control.eff", + "org.specs2.control.eff.syntax", + "org.specs2.control.origami", + "org.specs2.control.producer", + "org.specs2.data", + "org.specs2.execute", + "org.specs2.info.common", + "org.specs2.io", + "org.specs2.json", + "org.specs2.main", + "org.specs2.reflect", + "org.specs2.text", + "org.specs2.time", + "org.specs2.xml", + "specs2" + ], + "org.specs2:specs2-core_2.12": [ + "org.specs2", + "org.specs2.info.core", + "org.specs2.mutable", + "org.specs2.mutable.script", + "org.specs2.reporter", + "org.specs2.runner", + "org.specs2.specification", + "org.specs2.specification.core", + "org.specs2.specification.core.mutable", + "org.specs2.specification.create", + "org.specs2.specification.create.mutable", + "org.specs2.specification.dsl", + "org.specs2.specification.dsl.mutable", + "org.specs2.specification.mutable", + "org.specs2.specification.process", + "org.specs2.specification.script", + "specs2" + ], + "org.specs2:specs2-matcher_2.12": [ + "org.specs2.info.matcher", + "org.specs2.matcher", + "org.specs2.matcher.describe" + ] + }, + "repositories": { + "https://repo.maven.apache.org/maven2/": [ + "com.typesafe.play:twirl-api_2.12", + "com.typesafe.play:twirl-api_2.12:jar:sources", + "org.scala-lang.modules:scala-parser-combinators_2.12", + "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources", + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "org.scala-lang:scala-library", + "org.scala-lang:scala-library:jar:sources", + "org.scala-lang:scala-reflect", + "org.scala-lang:scala-reflect:jar:sources", + "org.scalaz:scalaz-core_2.12", + "org.scalaz:scalaz-core_2.12:jar:sources", + "org.scalaz:scalaz-effect_2.12", + "org.scalaz:scalaz-effect_2.12:jar:sources", + "org.specs2:specs2-common_2.12", + "org.specs2:specs2-common_2.12:jar:sources", + "org.specs2:specs2-core_2.12", + "org.specs2:specs2-core_2.12:jar:sources", + "org.specs2:specs2-matcher_2.12", + "org.specs2:specs2-matcher_2.12:jar:sources" + ], + "https://maven-central.storage-download.googleapis.com/maven2/": [ + "com.typesafe.play:twirl-api_2.12", + "com.typesafe.play:twirl-api_2.12:jar:sources", + "org.scala-lang.modules:scala-parser-combinators_2.12", + "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources", + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "org.scala-lang:scala-library", + "org.scala-lang:scala-library:jar:sources", + "org.scala-lang:scala-reflect", + "org.scala-lang:scala-reflect:jar:sources", + "org.scalaz:scalaz-core_2.12", + "org.scalaz:scalaz-core_2.12:jar:sources", + "org.scalaz:scalaz-effect_2.12", + "org.scalaz:scalaz-effect_2.12:jar:sources", + "org.specs2:specs2-common_2.12", + "org.specs2:specs2-common_2.12:jar:sources", + "org.specs2:specs2-core_2.12", + "org.specs2:specs2-core_2.12:jar:sources", + "org.specs2:specs2-matcher_2.12", + "org.specs2:specs2-matcher_2.12:jar:sources" + ], + "https://mirror.bazel.build/repo1.maven.org/maven2/": [ + "com.typesafe.play:twirl-api_2.12", + "com.typesafe.play:twirl-api_2.12:jar:sources", + "org.scala-lang.modules:scala-parser-combinators_2.12", + "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources", + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "org.scala-lang:scala-library", + "org.scala-lang:scala-library:jar:sources", + "org.scala-lang:scala-reflect", + "org.scala-lang:scala-reflect:jar:sources", + "org.scalaz:scalaz-core_2.12", + "org.scalaz:scalaz-core_2.12:jar:sources", + "org.scalaz:scalaz-effect_2.12", + "org.scalaz:scalaz-effect_2.12:jar:sources", + "org.specs2:specs2-common_2.12", + "org.specs2:specs2-common_2.12:jar:sources", + "org.specs2:specs2-core_2.12", + "org.specs2:specs2-core_2.12:jar:sources", + "org.specs2:specs2-matcher_2.12", + "org.specs2:specs2-matcher_2.12:jar:sources" + ] + }, + "version": "2" } From 5ea4bd0aa2f941a54cb42bfa02bdf499db9d4752 Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Fri, 15 Sep 2023 16:30:22 -0600 Subject: [PATCH 02/11] Update github actions OS --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc53093..8b678a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: USE_BAZEL_VERSION: ${{ matrix.bazel_version }} strategy: matrix: - os: [ubuntu-18.04, macos-10.15] + os: [ubuntu-20.04] bazel_version: [bazelbuild/5.3.0, bazelbuild/6.3.2] steps: - uses: actions/checkout@v2 From 001e3471e2306aeb7761148815b4b1895edd544f Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Fri, 15 Sep 2023 17:09:18 -0600 Subject: [PATCH 03/11] Update some action versions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b678a4..5f9f357 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,8 @@ jobs: os: [ubuntu-20.04] bazel_version: [bazelbuild/5.3.0, bazelbuild/6.3.2] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 - run: npm install -g @bazel/bazelisk - run: cat .bazelrc.ci >> .bazelrc - run: ./scripts/skylint.sh From ed266fc0588e185f0530f1daa9e4ff9ec763bda0 Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Fri, 15 Sep 2023 17:36:22 -0600 Subject: [PATCH 04/11] Switch from skylint to buildifier --- .github/workflows/ci.yml | 2 +- BUILD.bazel | 2 ++ WORKSPACE | 64 +++++++++++++++++++++++++--------------- scripts/lint.sh | 4 +++ scripts/skylint.sh | 8 ----- 5 files changed, 48 insertions(+), 32 deletions(-) create mode 100755 scripts/lint.sh delete mode 100755 scripts/skylint.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f9f357..789d706 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-node@v3 - run: npm install -g @bazel/bazelisk - run: cat .bazelrc.ci >> .bazelrc - - run: ./scripts/skylint.sh + - run: ./scripts/lint.sh - run: ./test/run_all_tests.sh ci - run: ./scripts/gen-docs.sh && git diff --exit-code docs/ - run: bazel shutdown diff --git a/BUILD.bazel b/BUILD.bazel index e69de29..abf7653 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -0,0 +1,2 @@ +load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier") +buildifier(name = "buildifier") diff --git a/WORKSPACE b/WORKSPACE index 7cec9f3..5106d9c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -75,25 +75,43 @@ http_archive( load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories") skydoc_repositories() -# For Skylint -# Once https://github.com/bazelbuild/bazel/issues/4086 is done, this should be -# much simpler -bazel_version = "0.27.0" +# buildifier +buildtools_version = "4.2.2" http_archive( - name = "io_bazel", - sha256 = "2d86797a5b96163b7f5e9cbb8f09cc919066e7ee0fe1a614b79680ae36a14ef3", - strip_prefix = "bazel-{}".format(bazel_version), - urls = ["https://github.com/bazelbuild/bazel/archive/{}.zip".format(bazel_version)], + name = "com_github_bazelbuild_buildtools", + sha256 = "ae34c344514e08c23e90da0e2d6cb700fcd28e80c02e23e4d5715dddcb42f7b3", + strip_prefix = "buildtools-{}".format(buildtools_version), + url = "https://github.com/bazelbuild/buildtools/archive/refs/tags/{}.tar.gz".format(buildtools_version) ) -# Also for Skylint. Comes from -# https://github.com/cgrushko/proto_library/blob/master/WORKSPACE -protobuf_version = "3.11.4" + + +# buildifier is written in Go and hence needs rules_go to be built. +# See https://github.com/bazelbuild/rules_go for the up to date setup instructions. http_archive( - name = "com_google_protobuf", - sha256 = "9748c0d90e54ea09e5e75fb7fac16edce15d2028d4356f32211cfa3c0e956564", - strip_prefix = "protobuf-{}".format(protobuf_version), - type = "zip", - url = "https://github.com/protocolbuffers/protobuf/archive/v{}.zip".format(protobuf_version), + name = "io_bazel_rules_go", + sha256 = "6dc2da7ab4cf5d7bfc7c949776b1b7c733f05e56edc4bcd9022bb249d2e2a996", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip", + ], +) +load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies") + +go_rules_dependencies() + +load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains") + +go_register_toolchains(version = "1.20.3") + + +# Also for buildifier. Comes from +# https://github.com/bazelbuild/buildtools/blob/master/buildifier/README.md +protobuf_version = "3.19.4" +http_archive( +name = "com_google_protobuf", +sha256 = "3bd7828aa5af4b13b99c191e8b1e884ebfa9ad371b0ce264605d347f135d2568", +strip_prefix = "protobuf-{}".format(protobuf_version), +url = "https://github.com/protocolbuffers/protobuf/archive/v{}.tar.gz".format(protobuf_version), ) load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() @@ -102,16 +120,16 @@ protobuf_deps() # TODO: Move tests into their own worskpace s.t. we don't need their dependenices here rules_scala_annex_version = "938ffdc24fb25a58220aa650948761073f1dd83b" http_archive( - name = "rules_scala_annex", - sha256 = "ae0cfd560a5238248d5f4c9fcde352e5dfc87cba5efd0b97e4c88ea839fd51b5", - strip_prefix = "rules_scala-{}".format(rules_scala_annex_version), - type = "zip", - url = "https://github.com/lucidsoftware/rules_scala/archive/{}.zip".format(rules_scala_annex_version), +name = "rules_scala_annex", +sha256 = "ae0cfd560a5238248d5f4c9fcde352e5dfc87cba5efd0b97e4c88ea839fd51b5", +strip_prefix = "rules_scala-{}".format(rules_scala_annex_version), +type = "zip", +url = "https://github.com/lucidsoftware/rules_scala/archive/{}.zip".format(rules_scala_annex_version), ) bind( - name = "default_scala", - actual = "@rules_scala_annex//src/main/scala:zinc_2_12_10", +name = "default_scala", +actual = "@rules_scala_annex//src/main/scala:zinc_2_12_10", ) load("@rules_scala_annex//rules/scala:workspace.bzl", "scala_register_toolchains", "scala_repositories") diff --git a/scripts/lint.sh b/scripts/lint.sh new file mode 100755 index 0000000..724c495 --- /dev/null +++ b/scripts/lint.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +echo "Running buildifier" +bazel run //:buildifier -r --lint=warn "$(bazel info workspace)" diff --git a/scripts/skylint.sh b/scripts/skylint.sh deleted file mode 100755 index c762d6e..0000000 --- a/scripts/skylint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -echo "Running Skylint" -skylint_path=src/tools/skylark/java/com/google/devtools/skylark/skylint -bazel build @io_bazel//${skylint_path}:Skylint \ - && find "$(bazel info workspace)" -type f -name '*.bzl' \ - -a -not -path "$(bazel info workspace)/external-tools*" \ - | xargs "$(bazel info bazel-bin)/external/io_bazel/${skylint_path}/Skylint" From d29797cd6b8c752a9536a9726733bfc4817e1343 Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Fri, 15 Sep 2023 17:51:42 -0600 Subject: [PATCH 05/11] bazelisk is already installed on github actions --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 789d706..2dfb679 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,6 @@ jobs: bazel_version: [bazelbuild/5.3.0, bazelbuild/6.3.2] steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - - run: npm install -g @bazel/bazelisk - run: cat .bazelrc.ci >> .bazelrc - run: ./scripts/lint.sh - run: ./test/run_all_tests.sh ci From d4769fb271b826f2aa679cf2ff1b630bc61a6684 Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Sat, 16 Sep 2023 00:17:37 -0600 Subject: [PATCH 06/11] Fix buildifier Which also involves upgrading rules_sass and rules_nodejs --- BUILD.bazel | 1 + WORKSPACE | 95 ++++++++++++++++--------- compiler-cli/BUILD.bazel | 8 +-- test/BUILD.bazel | 82 +++++++++++----------- twirl/twirl.bzl | 146 +++++++++++++++++++-------------------- 5 files changed, 180 insertions(+), 152 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index abf7653..5b4cf50 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,2 +1,3 @@ load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier") + buildifier(name = "buildifier") diff --git a/WORKSPACE b/WORKSPACE index 5106d9c..910ac6f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -4,6 +4,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # rules_jvm_external RULES_JVM_EXTERNAL_TAG = "5.3" + http_archive( name = "rules_jvm_external", sha256 = "6cc8444b20307113a62b676846c29ff018402fd4c7097fcd6d0a0fd5f2e86429", @@ -13,58 +14,74 @@ http_archive( ) load(":workspace.bzl", "twirl_repositories") + twirl_repositories() + load("@twirl//:defs.bzl", twirl_pinned_maven_install = "pinned_maven_install") + twirl_pinned_maven_install() load(":test_workspace.bzl", "twirl_test_repositories") + twirl_test_repositories() + load("@twirl_test//:defs.bzl", twirl_test_pinned_maven_install = "pinned_maven_install") + twirl_test_pinned_maven_install() # Skylib -skylib_version = "1.0.2" # update this as needed +skylib_version = "1.4.2" # update this as needed + http_archive( name = "bazel_skylib", - sha256 = "64ad2728ccdd2044216e4cec7815918b7bb3bb28c95b7e9d951f9d4eccb07625", + sha256 = "0fa67483ecf6a7c62b892b6f0d68aa4135586478077f0f97c4fbf39201648cf4", strip_prefix = "bazel-skylib-{}".format(skylib_version), type = "zip", url = "https://github.com/bazelbuild/bazel-skylib/archive/{}.zip".format(skylib_version), ) + load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") + bazel_skylib_workspace() # rules_nodejs # To use the JavaScript version of Sass, we need to first install nodejs -rules_nodejs_version = "1.7.0" +rules_nodejs_version = "5.3.0" + http_archive( name = "build_bazel_rules_nodejs", - sha256 = "82030031436c265e7fc427b08d581eeb658d1feca23c73df6e633b0951e9f14f", + sha256 = "322b2ecebd564586f5ccdd645833d7a2ecae2db554886e4435c3d02bdf2ecdf4", strip_prefix = "rules_nodejs-{}".format(rules_nodejs_version), type = "zip", url = "https://github.com/bazelbuild/rules_nodejs/archive/{}.zip".format(rules_nodejs_version), ) +load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies") + +build_bazel_rules_nodejs_dependencies() + load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories") -node_repositories(package_json = []) + +node_repositories() # rules_sass -rules_sass_version = "1.26.2" # update this as needed +rules_sass_version = "1.67.0" # update this as needed + http_archive( name = "io_bazel_rules_sass", - sha256 = "a31026741e4af6f1e5bcc9cce23db0549ecdea6270c8919da09110886102eb8e", + sha256 = "b29eb037568be386f7d4976fd160fefac98e0e26e3056e55f0d3eba2a0afb874", strip_prefix = "rules_sass-{}".format(rules_sass_version), type = "zip", url = "https://github.com/bazelbuild/rules_sass/archive/{}.zip".format(rules_sass_version), ) -load("@io_bazel_rules_sass//:package.bzl", "rules_sass_dependencies") -rules_sass_dependencies() -load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories") +load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories") + sass_repositories() # Skydoc -skydoc_version = "0.3.0" # update this as needed +skydoc_version = "0.3.0" # update this as needed + http_archive( name = "io_bazel_skydoc", sha256 = "8762a212cff5f81505a1632630edcfe9adce381479a50a03c968bd2fc217972d", @@ -72,29 +89,32 @@ http_archive( type = "zip", url = "https://github.com/bazelbuild/skydoc/archive/{}.zip".format(skydoc_version), ) + load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories") + skydoc_repositories() # buildifier buildtools_version = "4.2.2" + http_archive( - name = "com_github_bazelbuild_buildtools", - sha256 = "ae34c344514e08c23e90da0e2d6cb700fcd28e80c02e23e4d5715dddcb42f7b3", - strip_prefix = "buildtools-{}".format(buildtools_version), - url = "https://github.com/bazelbuild/buildtools/archive/refs/tags/{}.tar.gz".format(buildtools_version) + name = "com_github_bazelbuild_buildtools", + sha256 = "ae34c344514e08c23e90da0e2d6cb700fcd28e80c02e23e4d5715dddcb42f7b3", + strip_prefix = "buildtools-{}".format(buildtools_version), + url = "https://github.com/bazelbuild/buildtools/archive/refs/tags/{}.tar.gz".format(buildtools_version), ) - # buildifier is written in Go and hence needs rules_go to be built. # See https://github.com/bazelbuild/rules_go for the up to date setup instructions. http_archive( - name = "io_bazel_rules_go", - sha256 = "6dc2da7ab4cf5d7bfc7c949776b1b7c733f05e56edc4bcd9022bb249d2e2a996", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip", - ], + name = "io_bazel_rules_go", + sha256 = "6dc2da7ab4cf5d7bfc7c949776b1b7c733f05e56edc4bcd9022bb249d2e2a996", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip", + ], ) + load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies") go_rules_dependencies() @@ -103,37 +123,44 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains") go_register_toolchains(version = "1.20.3") - # Also for buildifier. Comes from # https://github.com/bazelbuild/buildtools/blob/master/buildifier/README.md protobuf_version = "3.19.4" + http_archive( -name = "com_google_protobuf", -sha256 = "3bd7828aa5af4b13b99c191e8b1e884ebfa9ad371b0ce264605d347f135d2568", -strip_prefix = "protobuf-{}".format(protobuf_version), -url = "https://github.com/protocolbuffers/protobuf/archive/v{}.tar.gz".format(protobuf_version), + name = "com_google_protobuf", + sha256 = "3bd7828aa5af4b13b99c191e8b1e884ebfa9ad371b0ce264605d347f135d2568", + strip_prefix = "protobuf-{}".format(protobuf_version), + url = "https://github.com/protocolbuffers/protobuf/archive/v{}.tar.gz".format(protobuf_version), ) + load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") + protobuf_deps() # higherkindness/rules_scala (used for tests only) # TODO: Move tests into their own worskpace s.t. we don't need their dependenices here rules_scala_annex_version = "938ffdc24fb25a58220aa650948761073f1dd83b" + http_archive( -name = "rules_scala_annex", -sha256 = "ae0cfd560a5238248d5f4c9fcde352e5dfc87cba5efd0b97e4c88ea839fd51b5", -strip_prefix = "rules_scala-{}".format(rules_scala_annex_version), -type = "zip", -url = "https://github.com/lucidsoftware/rules_scala/archive/{}.zip".format(rules_scala_annex_version), + name = "rules_scala_annex", + sha256 = "ae0cfd560a5238248d5f4c9fcde352e5dfc87cba5efd0b97e4c88ea839fd51b5", + strip_prefix = "rules_scala-{}".format(rules_scala_annex_version), + type = "zip", + url = "https://github.com/lucidsoftware/rules_scala/archive/{}.zip".format(rules_scala_annex_version), ) bind( -name = "default_scala", -actual = "@rules_scala_annex//src/main/scala:zinc_2_12_10", + name = "default_scala", + actual = "@rules_scala_annex//src/main/scala:zinc_2_12_10", ) load("@rules_scala_annex//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() diff --git a/compiler-cli/BUILD.bazel b/compiler-cli/BUILD.bazel index 00f644a..dd04791 100644 --- a/compiler-cli/BUILD.bazel +++ b/compiler-cli/BUILD.bazel @@ -1,6 +1,6 @@ java_binary( - name = "compiler-cli", - runtime_deps = ["@twirl//:com_lucidchart_twirl_compiler_cli"], - main_class = "rulestwirl.twirl.CommandLineTwirlTemplateCompiler", - visibility = ["//visibility:public"] + name = "compiler-cli", + main_class = "rulestwirl.twirl.CommandLineTwirlTemplateCompiler", + visibility = ["//visibility:public"], + runtime_deps = ["@twirl//:com_lucidchart_twirl_compiler_cli"], ) diff --git a/test/BUILD.bazel b/test/BUILD.bazel index c98e6ae..ca2b591 100644 --- a/test/BUILD.bazel +++ b/test/BUILD.bazel @@ -2,54 +2,54 @@ load("@rules_scala_annex//rules:scala.bzl", "scala_test") load("//twirl:twirl.bzl", "twirl_templates") twirl_templates( - name = "twirl-test-templates-basic", - visibility = ["//visibility:public"], - source_directory = "twirl-templates", - srcs = [ - "twirl-templates/twirl/com/foo/views/hello.scala.html", - "twirl-templates/twirl/com/foo/views/hello.scala.txt", - "twirl-templates/twirl/com/foo/views/hello.scala.xml", - "twirl-templates/twirl/com/foo/views/hello.scala.js", - ], + name = "twirl-test-templates-basic", + srcs = [ + "twirl-templates/twirl/com/foo/views/hello.scala.html", + "twirl-templates/twirl/com/foo/views/hello.scala.js", + "twirl-templates/twirl/com/foo/views/hello.scala.txt", + "twirl-templates/twirl/com/foo/views/hello.scala.xml", + ], + source_directory = "twirl-templates", + visibility = ["//visibility:public"], ) twirl_templates( - name = "twirl-test-templates-additional-imports", - visibility = ["//visibility:public"], - source_directory = "twirl-templates", - srcs = [ - "twirl-templates/twirl/com/foo/views/addImports.scala.txt", - ], - additional_imports = ["rulestwirl.test.Person"], + name = "twirl-test-templates-additional-imports", + srcs = [ + "twirl-templates/twirl/com/foo/views/addImports.scala.txt", + ], + additional_imports = ["rulestwirl.test.Person"], + source_directory = "twirl-templates", + visibility = ["//visibility:public"], ) twirl_templates( - name = "twirl-test-templates-custom-formatter", - visibility = ["//visibility:public"], - source_directory = "twirl-templates", - srcs = [ - "twirl-templates/twirl/com/foo/views/customFormatter.scala.txt", - ], - additional_imports = ["rulestwirl.test.Person"], - template_formats = { - "txt": "rulestwirl.test.StrangeTxtFormat" - }, + name = "twirl-test-templates-custom-formatter", + srcs = [ + "twirl-templates/twirl/com/foo/views/customFormatter.scala.txt", + ], + additional_imports = ["rulestwirl.test.Person"], + source_directory = "twirl-templates", + template_formats = { + "txt": "rulestwirl.test.StrangeTxtFormat", + }, + visibility = ["//visibility:public"], ) scala_test( - name = "twirl-compiler-test", - srcs = [ - "TwirlCompilerTest.scala", - "Person.scala", - "StrangeTxtFormatter.scala", - ":twirl-test-templates-basic", - ":twirl-test-templates-additional-imports", - ":twirl-test-templates-custom-formatter", - ], - deps = [ - "@twirl_test//:com_typesafe_play_twirl_api_2_12", - "@twirl_test//:org_specs2_specs2_common_2_12", - "@twirl_test//:org_specs2_specs2_core_2_12", - "@twirl_test//:org_specs2_specs2_matcher_2_12", - ], + name = "twirl-compiler-test", + srcs = [ + "Person.scala", + "StrangeTxtFormatter.scala", + "TwirlCompilerTest.scala", + ":twirl-test-templates-additional-imports", + ":twirl-test-templates-basic", + ":twirl-test-templates-custom-formatter", + ], + deps = [ + "@twirl_test//:com_typesafe_play_twirl_api_2_12", + "@twirl_test//:org_specs2_specs2_common_2_12", + "@twirl_test//:org_specs2_specs2_core_2_12", + "@twirl_test//:org_specs2_specs2_matcher_2_12", + ], ) diff --git a/twirl/twirl.bzl b/twirl/twirl.bzl index 13580bf..78ec158 100644 --- a/twirl/twirl.bzl +++ b/twirl/twirl.bzl @@ -6,84 +6,84 @@ Bazel rules for running the [Twirl Template Compiler](https://github.com/playfra gendir_base_path = "main/twirl" play_imports = [ - "play.twirl.api._", - "play.twirl.api.TwirlFeatureImports._", - "play.twirl.api.TwirlHelperImports._", - "models._", - "controllers._", - "play.api.i18n._", - "views.html._", - "play.api.templates.PlayMagic._", - "play.api.mvc._", - "play.api.data._", + "play.twirl.api._", + "play.twirl.api.TwirlFeatureImports._", + "play.twirl.api.TwirlHelperImports._", + "models._", + "controllers._", + "play.api.i18n._", + "views.html._", + "play.api.templates.PlayMagic._", + "play.api.mvc._", + "play.api.data._", ] def _format_map_arg(format): - return "{}={}".format(*format) + return "{}={}".format(*format) def _format_map_args(formats): - return [_format_map_arg(format) for format in formats] + return [_format_map_arg(format) for format in formats] def _impl(ctx): - imports = play_imports + ctx.attr.additional_imports if ctx.attr.include_play_imports else ctx.attr.additional_imports + imports = play_imports + ctx.attr.additional_imports if ctx.attr.include_play_imports else ctx.attr.additional_imports - outputs = [] - for src in ctx.files.srcs: - parts = src.short_path.split(".") - output = ctx.actions.declare_file("gen/{}/{}".format(ctx.label.name, ".".join(parts[:-2] + [parts[-1], parts[-2]]))) + outputs = [] + for src in ctx.files.srcs: + parts = src.short_path.split(".") + output = ctx.actions.declare_file("gen/{}/{}".format(ctx.label.name, ".".join(parts[:-2] + [parts[-1], parts[-2]]))) - args = ctx.actions.args() - if hasattr(args, "add_all"): # Bazel 0.13.0+ - args.add_all(imports, format_each = "--additionalImport=%s") - args.add_all(ctx.attr.template_formats.items(), format_each = "--templateFormat=%s", map_each = _format_map_arg) - else: - args.add(imports, format = "--additionalImport=%s") - args.add(ctx.attr.template_formats.items(), format = "--templateFormat=%s", map_fn = _format_map_args) - args.add(output) - args.add(ctx.file.source_directory.path) - args.add(src) - args.set_param_file_format("multiline") - args.use_param_file("@%s", use_always = True) + args = ctx.actions.args() + if hasattr(args, "add_all"): # Bazel 0.13.0+ + args.add_all(imports, format_each = "--additionalImport=%s") + args.add_all(ctx.attr.template_formats.items(), format_each = "--templateFormat=%s", map_each = _format_map_arg) + else: + args.add(imports, format = "--additionalImport=%s") + args.add(ctx.attr.template_formats.items(), format = "--templateFormat=%s", map_fn = _format_map_args) + args.add(output) + args.add(ctx.file.source_directory.path) + args.add(src) + args.set_param_file_format("multiline") + args.use_param_file("@%s", use_always = True) - ctx.actions.run( - inputs = [src], - outputs = [output], - arguments = [args], - mnemonic = "TwirlCompile", - execution_requirements = {"supports-workers": "1"}, - progress_message = "Compiling twirl template", - executable = ctx.executable.twirl_compiler, - ) + ctx.actions.run( + inputs = [src], + outputs = [output], + arguments = [args], + mnemonic = "TwirlCompile", + execution_requirements = {"supports-workers": "1"}, + progress_message = "Compiling twirl template", + executable = ctx.executable.twirl_compiler, + ) - outputs.append(output) + outputs.append(output) - return [ - DefaultInfo(files = depset(outputs)) - ] + return [ + DefaultInfo(files = depset(outputs)), + ] twirl_templates = rule( - implementation = _impl, - doc = "Compiles Twirl templates to Scala sources files.", - attrs = { - "source_directory": attr.label( - doc = "Directories where Twirl template files are located.", - allow_single_file = True, - mandatory = True - ), - "srcs": attr.label_list( - doc = "The actual template files contained in the source_directory.", - allow_files = True, - mandatory = True - ), - "additional_imports": attr.string_list( - doc = "Additional imports to import to the Twirl templates.", - ), - "include_play_imports": attr.bool( - doc = "If true, include the imports the Play project includes by default.", - default = False - ), - "template_formats": attr.string_dict( - doc = """ + implementation = _impl, + doc = "Compiles Twirl templates to Scala sources files.", + attrs = { + "source_directory": attr.label( + doc = "Directories where Twirl template files are located.", + allow_single_file = True, + mandatory = True, + ), + "srcs": attr.label_list( + doc = "The actual template files contained in the source_directory.", + allow_files = True, + mandatory = True, + ), + "additional_imports": attr.string_list( + doc = "Additional imports to import to the Twirl templates.", + ), + "include_play_imports": attr.bool( + doc = "If true, include the imports the Play project includes by default.", + default = False, + ), + "template_formats": attr.string_dict( + doc = """ Formatter types for file extensions. The default formats are @@ -93,13 +93,13 @@ The default formats are "xml" -> "play.twirl.api.XmlFormat", "js" -> "play.twirl.api.JavaScriptFormat" ``` -""" - ), - "twirl_compiler": attr.label( - executable = True, - cfg = "host", - allow_files = True, - default = Label("//compiler-cli"), - ) - }, +""", + ), + "twirl_compiler": attr.label( + executable = True, + cfg = "host", + allow_files = True, + default = Label("//compiler-cli"), + ), + }, ) From 9fb6bc25dabae74cb3a6f0a036d1a0c61a6c670c Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Sat, 16 Sep 2023 00:19:49 -0600 Subject: [PATCH 07/11] Fix lint script --- scripts/lint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lint.sh b/scripts/lint.sh index 724c495..ac6494f 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash echo "Running buildifier" -bazel run //:buildifier -r --lint=warn "$(bazel info workspace)" +bazel run //:buildifier -- -r --lint=warn "$(bazel info workspace)" From 7e3607832e0384bf031a0756482463cd883d01ca Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Mon, 18 Sep 2023 14:52:13 -0600 Subject: [PATCH 08/11] Bump minimum version to 5.4 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2dfb679..4006d31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - bazel_version: [bazelbuild/5.3.0, bazelbuild/6.3.2] + bazel_version: [bazelbuild/5.4.0, bazelbuild/6.3.2] steps: - uses: actions/checkout@v3 - run: cat .bazelrc.ci >> .bazelrc From 5d3fad73fd224ea373c5f12a7a17d15afecc6cf5 Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Mon, 18 Sep 2023 16:26:23 -0600 Subject: [PATCH 09/11] Fix test build. Mostly. --- .bazelrc | 3 +++ WORKSPACE | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.bazelrc b/.bazelrc index 1fd90e1..5b83104 100644 --- a/.bazelrc +++ b/.bazelrc @@ -2,6 +2,9 @@ startup --expand_configs_in_place common:ci --color=yes +# At least until https://github.com/lucidsoftware/rules_scala/pull/40 is merged +common --incompatible_java_common_parameters=false + build:ci --verbose_failures build:ci --sandbox_debug build:ci --spawn_strategy=standalone diff --git a/WORKSPACE b/WORKSPACE index 910ac6f..7b6b636 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -152,7 +152,7 @@ http_archive( bind( name = "default_scala", - actual = "@rules_scala_annex//src/main/scala:zinc_2_12_10", + actual = "@rules_scala_annex//src/main/scala:zinc_2_13_11", ) load("@rules_scala_annex//rules/scala:workspace.bzl", "scala_register_toolchains", "scala_repositories") From 32c3b1c70af61fb706905a4f5ba3adbf6f071afe Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Mon, 18 Sep 2023 17:24:39 -0600 Subject: [PATCH 10/11] Upgrade to scala 2.13 So that stuff actually works --- test/BUILD.bazel | 8 +- test_workspace.bzl | 8 +- twirl_test_install.json | 289 ++++++++++++++++++++-------------------- 3 files changed, 155 insertions(+), 150 deletions(-) diff --git a/test/BUILD.bazel b/test/BUILD.bazel index ca2b591..c5fbdb2 100644 --- a/test/BUILD.bazel +++ b/test/BUILD.bazel @@ -47,9 +47,9 @@ scala_test( ":twirl-test-templates-custom-formatter", ], deps = [ - "@twirl_test//:com_typesafe_play_twirl_api_2_12", - "@twirl_test//:org_specs2_specs2_common_2_12", - "@twirl_test//:org_specs2_specs2_core_2_12", - "@twirl_test//:org_specs2_specs2_matcher_2_12", + "@twirl_test//:com_typesafe_play_twirl_api_2_13", + "@twirl_test//:org_specs2_specs2_common_2_13", + "@twirl_test//:org_specs2_specs2_core_2_13", + "@twirl_test//:org_specs2_specs2_matcher_2_13", ], ) diff --git a/test_workspace.bzl b/test_workspace.bzl index b98d9bc..96e0d50 100644 --- a/test_workspace.bzl +++ b/test_workspace.bzl @@ -8,10 +8,10 @@ def twirl_test_repositories(): maven_install( name = "twirl_test", artifacts = [ - "com.typesafe.play:twirl-api_2.12:1.2.1", - "org.specs2:specs2-common_2.12:3.9.5", - "org.specs2:specs2-core_2.12:3.9.5", - "org.specs2:specs2-matcher_2.12:3.9.5", + "com.typesafe.play:twirl-api_2.13:1.6.1", + "org.specs2:specs2-common_2.13:4.20.2", + "org.specs2:specs2-core_2.13:4.20.2", + "org.specs2:specs2-matcher_2.13:4.20.2", ], repositories = [ "https://repo.maven.apache.org/maven2", diff --git a/twirl_test_install.json b/twirl_test_install.json index 7c48a39..681353d 100644 --- a/twirl_test_install.json +++ b/twirl_test_install.json @@ -1,123 +1,137 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -1490000631, - "__RESOLVED_ARTIFACTS_HASH": 1016369120, + "__INPUT_ARTIFACTS_HASH": 160214524, + "__RESOLVED_ARTIFACTS_HASH": 991781382, "artifacts": { - "com.typesafe.play:twirl-api_2.12": { + "com.typesafe.play:twirl-api_2.13": { "shasums": { - "jar": "a49f55199ad9e3b19a5dc51c812edca5d270ee8ca7d763a793a0e462fc3dbf61", - "sources": "37115905a4a62ff85f1cb324407c672dbb5710a7b938c724fad418a31317d01a" + "jar": "deae48462005dfeb8fc5485f1e9bd120f32ced4f4090c9f0b40f411b61fe9f36", + "sources": "b276133e93c01aa50092fd64fd06e1353e0c3fa82beef7d35e2658f965eb059e" }, - "version": "1.2.1" + "version": "1.6.1" }, - "org.scala-lang.modules:scala-parser-combinators_2.12": { + "org.portable-scala:portable-scala-reflect_2.13": { "shasums": { - "jar": "c9dd59ef2231b73e2a415885bd9c5e4f9e593cd84c0d5a104d6722ce0294349d", - "sources": "3735bad5882255d7561656a035129098c234fa17cbef517995c9f87fba7ab2d0" + "jar": "11f2f59d0c228912811095025b36ce58a025a8397851d773295c8ad7862d8488", + "sources": "da225cd34412a66905e5d9f6bfa03c28933c41bb4ff44b468bdd573009c2758c" }, - "version": "1.0.6" + "version": "1.1.1" }, - "org.scala-lang.modules:scala-xml_2.12": { + "org.scala-lang.modules:scala-parser-combinators_2.13": { "shasums": { - "jar": "7cc3b6ceb56e879cb977e8e043f4bfe2e062f78795efd7efa09f85003cb3230a", - "sources": "a7e8aac79394df396afda98b35537791809d815ce15ab2224f7d31e50c753922" + "jar": "5c285b72e6dc0a98e99ae0a1ceeb4027dab9adfa441844046bd3f19e0efdcb54", + "sources": "a5cdd33bc2dcd8917e4fea30d31ea19d0d70cc5f6951c5a913428930ced8391a" }, - "version": "1.0.6" + "version": "1.1.2" + }, + "org.scala-lang.modules:scala-xml_2.13": { + "shasums": { + "jar": "0d9d63091a73cf837cd5412671a30abecad460dc254aeb43a2b18f4910af6a09", + "sources": "75edeab4d6688246d26a8de2deb430bc65a46dd25eb0350b3872c8631a9de602" + }, + "version": "2.2.0" }, "org.scala-lang:scala-library": { "shasums": { - "jar": "dd668b609002b3578f2db83a1a684d706155bba2fc801cd411359fdd48218d00", - "sources": "261c3f59e93ec851a40ca5d793e2487deb36453ec1ae506925565a204f483f5b" + "jar": "c6a879e4973a60f6162668542a33eaccc2bb565d1c934fb061c5844259131dd1", + "sources": "df3f19e71b4d2dd6bb882a6deafb31c7dceaad4f26489b9fd9ca56b493229174" }, - "version": "2.12.2" + "version": "2.13.12" }, "org.scala-lang:scala-reflect": { "shasums": { - "jar": "98f9876d14b39fc7ec863c6b1b73c41a7653f886901b3ead0c4ca9215a688408", - "sources": "cddd78ef5e0916367bdca191695ab229cd02ea0a2b5ba06075fc3575e936c9af" + "jar": "fdfbcc92e87f424578b303bcb47e0f55fee990c4b6da0006c9e75879d1e442e4", + "sources": "e5c7fb7de045c8b390b89e0a1f74d522b54dcd2268bb4cbe6e18fe75ffca90f2" }, - "version": "2.12.2" + "version": "2.13.8" }, - "org.scalaz:scalaz-core_2.12": { + "org.scala-sbt:test-interface": { "shasums": { - "jar": "fa0d36e43575ca7fd2a520a3f1dc5dbaa8259f13bb99685d23ae106c0fcd2df1", - "sources": "0f8761b32e9a5f4957973e35754e380c98deea22285d961d735b717888c270c4" + "jar": "15f70b38bb95f3002fec9aea54030f19bb4ecfbad64c67424b5e5fea09cd749e", + "sources": "c314491c9df4f0bd9dd125ef1d51228d70bd466ee57848df1cd1b96aea18a5ad" }, - "version": "7.2.12" + "version": "1.0" }, - "org.scalaz:scalaz-effect_2.12": { + "org.specs2:specs2-common_2.13": { "shasums": { - "jar": "47927141e36a7adbd420d5a429660f387902d398b6713cb2c6be3db2d9365b21", - "sources": "1407eddce20f50c3435aaed76633011de44ec71f6d288d201b29ccb8060bc25c" + "jar": "d212b03f5762b59d529d0e1331498c1a36001a014c924992c23dbf87737a59f4", + "sources": "df11701596ff94a6b24eba7e01267db61d329a4b346fc1601aa7a7c3d6ef9258" }, - "version": "7.2.12" + "version": "4.20.2" }, - "org.specs2:specs2-common_2.12": { + "org.specs2:specs2-core_2.13": { "shasums": { - "jar": "9115e3f445b91137f3ab6ebb9ca6d6cbe3e5e54ea4668d794417378170cef628", - "sources": "8fd91f2753c083c1a663a39cb2476eae1aa18c928b79e035c3a10824430115e7" + "jar": "5727e844716ef7327746d6572f1ced272cbe2e71748c9fd4093381a29ba98e23", + "sources": "975e9a203cfab60cf730360a3919f48e3dbbde377efec2142cf28f7fb5bbeb9a" }, - "version": "3.9.5" + "version": "4.20.2" }, - "org.specs2:specs2-core_2.12": { + "org.specs2:specs2-fp_2.13": { "shasums": { - "jar": "6c8667a4d73fc167b9df6d8d214ae2ed14925e5a1b0b30d649d9a63d2c32cbe3", - "sources": "eb986ba65d85198836fd6fbd922a64fc0dfee5b76c96a7ee1f285f35837ce676" + "jar": "92c84738367728680361088560072bc690c0fa02fa9879c65bc16b4abde2a1c8", + "sources": "f5a1928119c1871bf4dd981c8ea82d8a221dbc831ed507e9e1c5d40d3ce97c8a" }, - "version": "3.9.5" + "version": "4.20.2" }, - "org.specs2:specs2-matcher_2.12": { + "org.specs2:specs2-matcher_2.13": { "shasums": { - "jar": "a56dcd89584f30c40ddd0c674fcfc6aebd5935d2fd61c49a61480ac6f1963ac7", - "sources": "6f0aac870b35c6618bcddc82e39e0103c6b57a781557f1a96e512e8c0b001132" + "jar": "44bc38cc968dfb00d64020cbc6526beeee3071280a37d160ec7b23c1119c8999", + "sources": "c38bf789b4e3ae918c67719d8af039896c6653143deed82cf6747729a28df051" }, - "version": "3.9.5" + "version": "4.20.2" } }, "dependencies": { - "com.typesafe.play:twirl-api_2.12": [ - "org.scala-lang.modules:scala-xml_2.12", + "com.typesafe.play:twirl-api_2.13": [ + "org.scala-lang.modules:scala-xml_2.13", "org.scala-lang:scala-library" ], - "org.scala-lang.modules:scala-parser-combinators_2.12": [ + "org.portable-scala:portable-scala-reflect_2.13": [ "org.scala-lang:scala-library" ], - "org.scala-lang.modules:scala-xml_2.12": [ + "org.scala-lang.modules:scala-parser-combinators_2.13": [ "org.scala-lang:scala-library" ], - "org.scala-lang:scala-reflect": [ + "org.scala-lang.modules:scala-xml_2.13": [ "org.scala-lang:scala-library" ], - "org.scalaz:scalaz-core_2.12": [ + "org.scala-lang:scala-reflect": [ "org.scala-lang:scala-library" ], - "org.scalaz:scalaz-effect_2.12": [ - "org.scala-lang:scala-library", - "org.scalaz:scalaz-core_2.12" - ], - "org.specs2:specs2-common_2.12": [ - "org.scala-lang.modules:scala-parser-combinators_2.12", - "org.scala-lang.modules:scala-xml_2.12", + "org.specs2:specs2-common_2.13": [ + "org.portable-scala:portable-scala-reflect_2.13", + "org.scala-lang.modules:scala-parser-combinators_2.13", "org.scala-lang:scala-library", "org.scala-lang:scala-reflect", - "org.scalaz:scalaz-core_2.12", - "org.scalaz:scalaz-effect_2.12" + "org.scala-sbt:test-interface", + "org.specs2:specs2-fp_2.13" ], - "org.specs2:specs2-core_2.12": [ + "org.specs2:specs2-core_2.13": [ + "org.portable-scala:portable-scala-reflect_2.13", "org.scala-lang:scala-library", - "org.specs2:specs2-matcher_2.12" + "org.scala-sbt:test-interface", + "org.specs2:specs2-common_2.13", + "org.specs2:specs2-matcher_2.13" + ], + "org.specs2:specs2-fp_2.13": [ + "org.scala-lang:scala-library" ], - "org.specs2:specs2-matcher_2.12": [ + "org.specs2:specs2-matcher_2.13": [ "org.scala-lang:scala-library", - "org.specs2:specs2-common_2.12" + "org.specs2:specs2-common_2.13" ] }, "packages": { - "com.typesafe.play:twirl-api_2.12": [ + "com.typesafe.play:twirl-api_2.13": [ "play.twirl.api", "play.twirl.api.utils" ], - "org.scala-lang.modules:scala-parser-combinators_2.12": [ + "org.portable-scala:portable-scala-reflect_2.13": [ + "org.portablescala.reflect", + "org.portablescala.reflect.annotation", + "org.portablescala.reflect.internal" + ], + "org.scala-lang.modules:scala-parser-combinators_2.13": [ "scala.util.parsing.combinator", "scala.util.parsing.combinator.lexical", "scala.util.parsing.combinator.syntactical", @@ -125,7 +139,7 @@ "scala.util.parsing.input", "scala.util.parsing.json" ], - "org.scala-lang.modules:scala-xml_2.12": [ + "org.scala-lang.modules:scala-xml_2.13": [ "scala.xml", "scala.xml.dtd", "scala.xml.dtd.impl", @@ -133,8 +147,6 @@ "scala.xml.include", "scala.xml.include.sax", "scala.xml.parsing", - "scala.xml.persistent", - "scala.xml.pull", "scala.xml.transform" ], "org.scala-lang:scala-library": [ @@ -146,19 +158,17 @@ "scala.collection", "scala.collection.concurrent", "scala.collection.convert", + "scala.collection.convert.impl", "scala.collection.generic", "scala.collection.immutable", "scala.collection.mutable", - "scala.collection.parallel", - "scala.collection.parallel.immutable", - "scala.collection.parallel.mutable", - "scala.collection.script", "scala.compat", "scala.concurrent", "scala.concurrent.duration", - "scala.concurrent.forkjoin", "scala.concurrent.impl", "scala.io", + "scala.jdk", + "scala.jdk.javaapi", "scala.math", "scala.ref", "scala.reflect", @@ -167,7 +177,6 @@ "scala.runtime.java8", "scala.sys", "scala.sys.process", - "scala.text", "scala.util", "scala.util.control", "scala.util.hashing", @@ -188,24 +197,12 @@ "scala.reflect.macros.whitebox", "scala.reflect.runtime" ], - "org.scalaz:scalaz-core_2.12": [ - "scalaz", - "scalaz.std", - "scalaz.std.java", - "scalaz.std.java.math", - "scalaz.std.java.util", - "scalaz.std.java.util.concurrent", - "scalaz.std.math", - "scalaz.syntax", - "scalaz.syntax.std" - ], - "org.scalaz:scalaz-effect_2.12": [ - "scalaz.effect", - "scalaz.std.effect", - "scalaz.std.effect.sql", - "scalaz.syntax.effect" + "org.scala-sbt:test-interface": [ + "org.scalatools.testing", + "sbt.testing" ], - "org.specs2:specs2-common_2.12": [ + "org.specs2:specs2-common_2.13": [ + "org.specs2", "org.specs2.collection", "org.specs2.concurrent", "org.specs2.control", @@ -215,19 +212,19 @@ "org.specs2.control.producer", "org.specs2.data", "org.specs2.execute", - "org.specs2.info.common", "org.specs2.io", - "org.specs2.json", "org.specs2.main", "org.specs2.reflect", "org.specs2.text", "org.specs2.time", - "org.specs2.xml", "specs2" ], - "org.specs2:specs2-core_2.12": [ + "org.specs2:specs2-core_2.13": [ "org.specs2", - "org.specs2.info.core", + "org.specs2.control", + "org.specs2.execute", + "org.specs2.io", + "org.specs2.matcher", "org.specs2.mutable", "org.specs2.mutable.script", "org.specs2.reporter", @@ -244,78 +241,86 @@ "org.specs2.specification.script", "specs2" ], - "org.specs2:specs2-matcher_2.12": [ - "org.specs2.info.matcher", + "org.specs2:specs2-fp_2.13": [ + "org.specs2.fp" + ], + "org.specs2:specs2-matcher_2.13": [ "org.specs2.matcher", "org.specs2.matcher.describe" ] }, "repositories": { "https://repo.maven.apache.org/maven2/": [ - "com.typesafe.play:twirl-api_2.12", - "com.typesafe.play:twirl-api_2.12:jar:sources", - "org.scala-lang.modules:scala-parser-combinators_2.12", - "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources", - "org.scala-lang.modules:scala-xml_2.12", - "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "com.typesafe.play:twirl-api_2.13", + "com.typesafe.play:twirl-api_2.13:jar:sources", + "org.portable-scala:portable-scala-reflect_2.13", + "org.portable-scala:portable-scala-reflect_2.13:jar:sources", + "org.scala-lang.modules:scala-parser-combinators_2.13", + "org.scala-lang.modules:scala-parser-combinators_2.13:jar:sources", + "org.scala-lang.modules:scala-xml_2.13", + "org.scala-lang.modules:scala-xml_2.13:jar:sources", "org.scala-lang:scala-library", "org.scala-lang:scala-library:jar:sources", "org.scala-lang:scala-reflect", "org.scala-lang:scala-reflect:jar:sources", - "org.scalaz:scalaz-core_2.12", - "org.scalaz:scalaz-core_2.12:jar:sources", - "org.scalaz:scalaz-effect_2.12", - "org.scalaz:scalaz-effect_2.12:jar:sources", - "org.specs2:specs2-common_2.12", - "org.specs2:specs2-common_2.12:jar:sources", - "org.specs2:specs2-core_2.12", - "org.specs2:specs2-core_2.12:jar:sources", - "org.specs2:specs2-matcher_2.12", - "org.specs2:specs2-matcher_2.12:jar:sources" + "org.scala-sbt:test-interface", + "org.scala-sbt:test-interface:jar:sources", + "org.specs2:specs2-common_2.13", + "org.specs2:specs2-common_2.13:jar:sources", + "org.specs2:specs2-core_2.13", + "org.specs2:specs2-core_2.13:jar:sources", + "org.specs2:specs2-fp_2.13", + "org.specs2:specs2-fp_2.13:jar:sources", + "org.specs2:specs2-matcher_2.13", + "org.specs2:specs2-matcher_2.13:jar:sources" ], "https://maven-central.storage-download.googleapis.com/maven2/": [ - "com.typesafe.play:twirl-api_2.12", - "com.typesafe.play:twirl-api_2.12:jar:sources", - "org.scala-lang.modules:scala-parser-combinators_2.12", - "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources", - "org.scala-lang.modules:scala-xml_2.12", - "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "com.typesafe.play:twirl-api_2.13", + "com.typesafe.play:twirl-api_2.13:jar:sources", + "org.portable-scala:portable-scala-reflect_2.13", + "org.portable-scala:portable-scala-reflect_2.13:jar:sources", + "org.scala-lang.modules:scala-parser-combinators_2.13", + "org.scala-lang.modules:scala-parser-combinators_2.13:jar:sources", + "org.scala-lang.modules:scala-xml_2.13", + "org.scala-lang.modules:scala-xml_2.13:jar:sources", "org.scala-lang:scala-library", "org.scala-lang:scala-library:jar:sources", "org.scala-lang:scala-reflect", "org.scala-lang:scala-reflect:jar:sources", - "org.scalaz:scalaz-core_2.12", - "org.scalaz:scalaz-core_2.12:jar:sources", - "org.scalaz:scalaz-effect_2.12", - "org.scalaz:scalaz-effect_2.12:jar:sources", - "org.specs2:specs2-common_2.12", - "org.specs2:specs2-common_2.12:jar:sources", - "org.specs2:specs2-core_2.12", - "org.specs2:specs2-core_2.12:jar:sources", - "org.specs2:specs2-matcher_2.12", - "org.specs2:specs2-matcher_2.12:jar:sources" + "org.scala-sbt:test-interface", + "org.scala-sbt:test-interface:jar:sources", + "org.specs2:specs2-common_2.13", + "org.specs2:specs2-common_2.13:jar:sources", + "org.specs2:specs2-core_2.13", + "org.specs2:specs2-core_2.13:jar:sources", + "org.specs2:specs2-fp_2.13", + "org.specs2:specs2-fp_2.13:jar:sources", + "org.specs2:specs2-matcher_2.13", + "org.specs2:specs2-matcher_2.13:jar:sources" ], "https://mirror.bazel.build/repo1.maven.org/maven2/": [ - "com.typesafe.play:twirl-api_2.12", - "com.typesafe.play:twirl-api_2.12:jar:sources", - "org.scala-lang.modules:scala-parser-combinators_2.12", - "org.scala-lang.modules:scala-parser-combinators_2.12:jar:sources", - "org.scala-lang.modules:scala-xml_2.12", - "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "com.typesafe.play:twirl-api_2.13", + "com.typesafe.play:twirl-api_2.13:jar:sources", + "org.portable-scala:portable-scala-reflect_2.13", + "org.portable-scala:portable-scala-reflect_2.13:jar:sources", + "org.scala-lang.modules:scala-parser-combinators_2.13", + "org.scala-lang.modules:scala-parser-combinators_2.13:jar:sources", + "org.scala-lang.modules:scala-xml_2.13", + "org.scala-lang.modules:scala-xml_2.13:jar:sources", "org.scala-lang:scala-library", "org.scala-lang:scala-library:jar:sources", "org.scala-lang:scala-reflect", "org.scala-lang:scala-reflect:jar:sources", - "org.scalaz:scalaz-core_2.12", - "org.scalaz:scalaz-core_2.12:jar:sources", - "org.scalaz:scalaz-effect_2.12", - "org.scalaz:scalaz-effect_2.12:jar:sources", - "org.specs2:specs2-common_2.12", - "org.specs2:specs2-common_2.12:jar:sources", - "org.specs2:specs2-core_2.12", - "org.specs2:specs2-core_2.12:jar:sources", - "org.specs2:specs2-matcher_2.12", - "org.specs2:specs2-matcher_2.12:jar:sources" + "org.scala-sbt:test-interface", + "org.scala-sbt:test-interface:jar:sources", + "org.specs2:specs2-common_2.13", + "org.specs2:specs2-common_2.13:jar:sources", + "org.specs2:specs2-core_2.13", + "org.specs2:specs2-core_2.13:jar:sources", + "org.specs2:specs2-fp_2.13", + "org.specs2:specs2-fp_2.13:jar:sources", + "org.specs2:specs2-matcher_2.13", + "org.specs2:specs2-matcher_2.13:jar:sources" ] }, "version": "2" From 6a658a60b1906bf54fb0fed04a8b6325a3c6e017 Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Tue, 19 Sep 2023 12:22:21 -0600 Subject: [PATCH 11/11] Fix building docs Switch to using rules_pkg instead of the deprecated built in pkg_tar --- WORKSPACE | 13 +++++++++++++ twirl/BUILD.bazel | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 7b6b636..330a410 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -79,6 +79,19 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories") sass_repositories() + +rules_pkg_version = "0.9.1" +http_archive( + name = "rules_pkg", + sha256 = "8f9ee2dc10c1ae514ee599a8b42ed99fa262b757058f65ad3c384289ff70c4b8", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/{0}/rules_pkg-{0}.tar.gz".format(rules_pkg_version), + "https://github.com/bazelbuild/rules_pkg/releases/download/{0}/rules_pkg-{0}.tar.gz".format(rules_pkg_version), + ], +) +load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies") +rules_pkg_dependencies() + # Skydoc skydoc_version = "0.3.0" # update this as needed diff --git a/twirl/BUILD.bazel b/twirl/BUILD.bazel index 76860d1..430b1a0 100644 --- a/twirl/BUILD.bazel +++ b/twirl/BUILD.bazel @@ -2,7 +2,8 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load("@io_bazel_skydoc//stardoc:stardoc.bzl", "stardoc") -load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") +load("@rules_pkg//pkg:tar.bzl", "pkg_tar") +load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes") load("@bazel_skylib//lib:paths.bzl", "paths") [ @@ -20,7 +21,7 @@ load("@bazel_skylib//lib:paths.bzl", "paths") pkg_tar( name = "docs", srcs = [paths.replace_extension(file, ".md").replace("/", "_") for file in glob(["**/*.bzl"])], - mode = "0644", + mode = "0644" ) bzl_library(