Zinc 1.4.2 (#1)

Co-authored-by: Timothy Klim <git@timothyklim.com>

Author: timothyklim

.bazelrc_shared

@@ -2,7 +2,7 @@ common --announce_rc
 common --color=yes
 
 build --experimental_strict_action_env
-build --javacopt="-source 8 -target 8"
+build --javacopt="-source 11 -target 11"
 
 build --strategy=ScalaCompile=worker
 build --worker_max_instances=4

.scalafmt.conf

@@ -1,15 +1,27 @@
-align.openParenCallSite = false
-align.openParenDefnSite = false
-continuationIndent.defnSite = 2
-danglingParentheses = true
-docstrings = JavaDoc
-importSelectors = singleLine
-maxColumn = 120
-verticalMultiline.newlineBeforeImplicitKW = true
-rewrite.redundantBraces.stringInterpolation = true
-rewrite.rules = [
-  RedundantParens,
-  PreferCurlyFors,
-  SortImports
-]
-unindentTopLevelOperators = false
+version = 2.6.4
+maxColumn = 150
+assumeStandardLibraryStripMargin = true
+continuationIndent.callSite = 2
+includeCurlyBraceInSelectChains = true
+# includeNoParensInSelectChains = true
+binPack.literalArgumentLists = false
+rewrite.rules = [AvoidInfix, SortImports, SortModifiers, RedundantParens, PreferCurlyFors] # RedundantBraces
+
+project.git = true
+
+newlines {
+  alwaysBeforeCurlyBraceLambdaParams = false
+  implicitParamListModifierPrefer = before
+}
+
+align = none
+align {
+  preset = none
+  stripMargin = true
+  openParenCallSite = false
+  openParenDefnSite = false
+  tokens = [
+    "%", "%%", "%%%", ":=", "~=", "=>"
+  ]
+}
+# optIn.breakChainOnFirstMethodDot = true

BUILD

@@ -1,10 +0,0 @@
-load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
-
-buildifier(
-    name = "buildifier",
-)
-
-buildifier(
-    name = "buildifier_check",
-    mode = "check",
-)

Makefile

@@ -0,0 +1,13 @@
+bzl-lint:
+	find . -type f -iname "*.bazel" -o -iname "*.bzl" -o -iname BUILD -o -iname WORKSPACE | xargs buildifier --lint=warn --warnings=all
+
+bzl-fmt:
+	find . -type f -iname "*.bazel" -o -iname "*.bzl" -o -iname BUILD -o -iname WORKSPACE xargs buildifier
+
+nix-fmt:
+	find . -name "*.nix" | xargs nixpkgs-fmt
+
+scala-fmt:
+	scalafmt -c .scalafmt.conf --mode changed --non-interactive --quiet .
+
+fmt: scala-fmt nix-fmt bzl-fmt

README.md

@@ -116,7 +116,7 @@ protobuf_deps()
 # Specify the scala compiler we wish to use; in this case, we'll use the default one specified in rules_scala_annex
 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",
 )
 ```
 

WORKSPACE

@@ -13,44 +13,6 @@ http_archive(
     url = "https://github.com/bazelbuild/skydoc/archive/{}.zip".format(skydoc_tag),
 )
 
-# com_github_bazelbuild_buildtools
-
-buildtools_tag = "0.29.0"
-
-buildtools_sha256 = "05eb52437fb250c7591dd6cbcfd1f9b5b61d85d6b20f04b041e0830dd1ab39b3"
-
-http_archive(
-    name = "com_github_bazelbuild_buildtools",
-    sha256 = buildtools_sha256,
-    strip_prefix = "buildtools-{}".format(buildtools_tag),
-    url = "https://github.com/bazelbuild/buildtools/archive/{}.zip".format(buildtools_tag),
-)
-
-load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies")
-
-buildifier_dependencies()
-
-# io_bazel_rules_go
-
-rules_go_tag = "v0.20.2"
-
-rules_go_sha256 = "b9aa86ec08a292b97ec4591cf578e020b35f98e12173bbd4a921f84f583aebd9"
-
-http_archive(
-    name = "io_bazel_rules_go",
-    sha256 = rules_go_sha256,
-    urls = [
-        "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/{tag}/rules_go-{tag}.tar.gz".format(tag = rules_go_tag),
-        "https://github.com/bazelbuild/rules_go/releases/download/{tag}/rules_go-{tag}.tar.gz".format(tag = rules_go_tag),
-    ],
-)
-
-load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
-
-go_rules_dependencies()
-
-go_register_toolchains()
-
 bazel_skylib_tag = "1.0.2"
 
 bazel_skylib_sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44"

annex_install.json

@@ -2,12 +2,12 @@
 
 The scala version used by a buildable target is specified via the `ScalaConfiguration` passed in to the rule's `scala` attribute.
 
-This attribute defaults to using the `default_scala` specified via `bind` in the `WORKSPACE` file of the repo. For example, suppose the `ScalaConfiguration` you wish to default to is defined by `//scala:2_11_12`. In your `WORKSPACE`, you would include:
+This attribute defaults to using the `default_scala` specified via `bind` in the `WORKSPACE` file of the repo. For example, suppose the `ScalaConfiguration` you wish to default to is defined by `//scala:2_13_12`. In your `WORKSPACE`, you would include:
 
 ```python
 bind(
     name = "default_scala",
-    actual = "//scala:2_11_12",
+    actual = "//scala:2_13_12",
 )
 ```
 
@@ -16,46 +16,46 @@ We provide two means of creating the `ScalaConfiguration`: `configure_bootstrap_
 Example:
 
 ```python
-compiler_classpath_2_12_8 = [
-    "@scala_compiler_2_12_8//jar",
-    "@scala_library_2_12_8//jar",
-    "@scala_reflect_2_12_8//jar",
+compiler_classpath_2_13_3 = [
+    "@scala_compiler_2_13_3//jar",
+    "@scala_library_2_13_3//jar",
+    "@scala_reflect_2_13_3//jar",
 ]
 
-runtime_classpath_2_12_8 = [
-    "@scala_library_2_12_8//jar",
+runtime_classpath_2_13_3 = [
+    "@scala_library_2_13_3//jar",
 ]
 
 # This creates a basic ScalaConfiguration that relies on the scalac compiler
 configure_bootstrap_scala(
-    name = "bootstrap_2_12_8",
-    compiler_classpath = compiler_classpath_2_12_8,
-    runtime_classpath = runtime_classpath_2_12_8,
-    version = "2.12.8",
+    name = "bootstrap_2_13_3",
+    compiler_classpath = compiler_classpath_2_13_3,
+    runtime_classpath = runtime_classpath_2_13_3,
+    version = "2.13.3",
     visibility = ["//visibility:public"],
 )
 
 # compiler bridge needed to configure zinc compiler
 scala_library(
-    name = "compiler_bridge_2_12_8",
+    name = "compiler_bridge_2_13_3",
     srcs = [
-        "@compiler_bridge_2_12//:src",
+        "@compiler_bridge_2_13//:src",
     ],
-    scala = ":bootstrap_2_12_8",
+    scala = ":bootstrap_2_13_3",
     visibility = ["//visibility:public"],
-    deps = compiler_classpath_2_12_8 + [
+    deps = compiler_classpath_2_13_3 + [
         "@scala_annex_org_scala_sbt_compiler_interface//jar",
         "@scala_annex_org_scala_sbt_util_interface//jar",
     ],
 )
 
 # This augments the configuration to configure the zinc compiler
 configure_zinc_scala(
-    name = "zinc_2_12_8",
-    compiler_bridge = ":compiler_bridge_2_12_8",
-    compiler_classpath = compiler_classpath_2_12_8,
-    runtime_classpath = runtime_classpath_2_12_8,
-    version = "2.12.8",
+    name = "zinc_2_13",
+    compiler_bridge = ":compiler_bridge_2_13_3",
+    compiler_classpath = compiler_classpath_2_13_3,
+    runtime_classpath = runtime_classpath_2_13_3,
+    version = "2.13.3",
     visibility = ["//visibility:public"],
 )
 ```
@@ -68,13 +68,13 @@ For example:
 scala_library(
   name = "example_compiled_with_scalac",
   srcs = glob(["**/*.scala"])
-  scala = "<package>:bootstrap_2_12_8
+  scala = "<package>:bootstrap_2_13_3
 )
 
 scala_library(
   name = "example_compiled_with_zinc",
   srcs = glob(["**/*.scala"])
-  scala = "<package>:zinc_2_12_8
+  scala = "<package>:zinc_2_13
 )
 
 # This would use whatever //external:default_scala points to (i.e. what you bind default_scala to in your WORKSPACE)