sync with upstream

.bazelci/presubmit.yml

@@ -1,24 +1,19 @@
 ---
-platforms:
-  ubuntu1604:
+validate_config: 1
+tasks:
+  ubuntu2004:
+    name: "bazel test //test/..."
+    platform: ubuntu2004
     shell_commands:
-    # Disable local disk caching on CI.
-    - mv tools/bazel.rc.buildkite tools/bazel.rc
-    - echo "import %workspace%/tools/bazel.rc" > .bazelrc
-    build_targets:
-    - "//test/..."
-    test_targets:
-    - "//test/..."
-  ubuntu1804:
-    shell_commands:
-    # Disable local disk caching on CI.
     - mv tools/bazel.rc.buildkite tools/bazel.rc
     - echo "import %workspace%/tools/bazel.rc" > .bazelrc
     build_targets:
     - "//test/..."
     test_targets:
     - "//test/..."
   macos:
+    name: "bazel test //test/..."
+    platform: macos
     shell_commands:
     # Disable local disk caching on CI.
     - mv tools/bazel.rc.buildkite tools/bazel.rc
@@ -27,8 +22,90 @@ platforms:
     - "//test/..."
     test_targets:
     - "//test/..."
-  rbe_ubuntu1604:
-    build_targets:
-    - "//test/..."
-    test_targets:
-    - "//test/..."
+  test_rules_scala_linux:
+    name: "./test_rules_scala"
+    platform: ubuntu2004
+    shell_commands:
+    # Install xmllint
+    - sudo apt update && sudo apt install --reinstall libxml2-utils -y
+    - "./test_rules_scala.sh"
+  test_rules_scala_linux_last_green:
+    name: "./test_rules_scala (Bazel green head)"
+    platform: ubuntu2004
+    bazel: last_green
+    shell_commands:
+    # Install xmllint
+    - sudo apt update && sudo apt install --reinstall libxml2-utils -y
+    - echo "build --enable_workspace" >> .bazelrc
+    - "./test_rules_scala.sh || buildkite-agent annotate --style 'warning' \"Optional build with latest Bazel version failed, [see here](${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}) (It is not mandatory but worth checking)\""
+  test_rules_scala_macos:
+    name: "./test_rules_scala"
+    platform: macos
+    shell_commands:
+    - "./test_rules_scala.sh"
+  test_rules_scala_win:
+    name: "./test_rules_scala"
+    platform: windows
+    shell_commands:
+    - "bash test_rules_scala.sh"
+  test_coverage_linux_6_5_0:
+    name: "./test_coverage"
+    platform: ubuntu2004
+    bazel: 6.5.0
+    shell_commands:
+      - "./test_coverage.sh"
+  test_coverage_macos_6.5.0:
+    name: "./test_coverage"
+    platform: macos
+    bazel: 6.5.0
+    shell_commands:
+      - "./test_coverage.sh"
+  test_reproducibility_linux:
+    name: "./test_reproducibility.sh"
+    platform: ubuntu1804
+    shell_commands:
+    - "./test_reproducibility.sh"
+  test_reproducibility_macos:
+    name: "./test_reproducibility.sh"
+    platform: macos
+    shell_commands:
+    - "./test_reproducibility.sh"
+  versions_linux:
+    name: "./test_version.sh"      
+    platform: ubuntu2004
+    shell_commands:
+    - "./test_version.sh"
+  versions_macos:
+    name: "./test_version.sh"
+    platform: macos
+    shell_commands:
+    - "./test_version.sh"
+  examples_linux:
+    name: "./test_examples"
+    platform: ubuntu2004
+    bazel: 6.5.0
+    shell_commands:
+      - "./test_examples.sh"
+  cross_build_linux:
+    name: "./test_cross_build"
+    platform: ubuntu2004
+    bazel: 6.5.0
+    shell_commands:
+      - "./test_cross_build.sh"
+  lint_linux:
+    name: "bazel //tools:lint_check"
+    platform: ubuntu2004
+    run_targets:
+    -  "//tools:lint_check"
+  test_rules_scala_jdk21:
+    name: "./test_rules_scala with jdk21"
+    platform: ubuntu2004
+    shell_commands:
+      - sudo apt update && sudo apt install -y libxml2-utils
+      - mv tools/bazel.rc.buildkite tools/bazel.rc
+      - echo "import %workspace%/tools/bazel.rc" > .bazelrc
+      - echo "build --java_language_version=21" >> .bazelrc
+      - echo "build --java_runtime_version=21" >> .bazelrc
+      - echo "build --tool_java_language_version=21" >> .bazelrc
+      - echo "build --tool_java_runtime_version=21" >> .bazelrc
+      - "./test_rules_scala.sh"

.bazelrc

@@ -0,0 +1,9 @@
+build --enable_platform_specific_config
+
+#Windows needs --worker_quit_after_build due to workers not being shut down when the compiler tools need to be rebuilt (resulting in 'file in use' errors). See Bazel Issue#10498.
+
+build:windows --worker_quit_after_build --enable_runfiles 
+
+# Remove upon completing Bzlmod compatibility work.
+# - https://github.com/bazelbuild/rules_scala/issues/1482
+build --noenable_bzlmod

.bazelversion

@@ -0,0 +1 @@
+6.5.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+### Description
+<!-- Mandatory: A crisp one or two line description of your proposed change. -->
+
+
+<!-- Optional:
+  A longer explanation of your proposed changes..
+  This includes listing any breaking changes, if there are any.
+-->
+
+### Motivation
+<!-- Mandatory: A summary of why you are making this change. -->

.github/workflows/release.yml

@@ -0,0 +1,27 @@
+# Cut a release whenever a new tag is pushed to the repo.
+# You should use an annotated tag, like `git tag -a v1.2.3`.
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Prepare workspace snippet
+        run: .github/workflows/workspace_snippet.sh ${{ env.GITHUB_REF_NAME }} > release_notes.txt
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          # Use GH feature to populate the changelog automatically
+          generate_release_notes: true
+          body_path: release_notes.txt
+          fail_on_unmatched_files: true
+          files: rules_scala-*.tar.gz

.github/workflows/workspace_snippet.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -o errexit -o nounset -o pipefail
+
+# Set by GH actions, see
+# https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
+TAG=${GITHUB_REF_NAME}
+PREFIX="rules_scala-${TAG:1}"
+ARCHIVE="rules_scala-$TAG.tar.gz"
+git archive --format=tar --prefix=${PREFIX}/ ${TAG} | gzip > $ARCHIVE
+SHA=$(shasum -a 256 $ARCHIVE | awk '{print $1}')
+
+cat << EOF
+## Using WORKSPACE
+
+Paste this snippet into your \`WORKSPACE\` file:
+
+\`\`\`starlark
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "io_bazel_rules_scala",
+    sha256 = "${SHA}",
+    strip_prefix = "${PREFIX}",
+    url = "https://github.com/bazelbuild/rules_scala/releases/download/${TAG}/${ARCHIVE}",
+)
+\`\`\`
+
+See https://github.com/bazelbuild/rules_scala#getting-started for full setup instructions.
+EOF

.gitignore

@@ -5,3 +5,9 @@ hash1
 hash2
 .DS_store
 .bazel_cache
+.ijwb
+.metals
+.vscode
+unformatted-*.backup.scala
+.scala-build
+test/semanticdb/tempsrc

.scalafmt.conf

@@ -0,0 +1,16 @@
+align.openParenCallSite = false
+align.openParenDefnSite = false
+continuationIndent.defnSite = 2
+danglingParentheses.preset = true
+docstrings.style = Asterisk
+importSelectors = singleLine
+maxColumn = 120
+verticalMultiline.newlineBeforeImplicitKW = true
+rewrite.redundantBraces.stringInterpolation = true
+rewrite.rules = [
+  RedundantParens,
+  PreferCurlyFors,
+  SortImports
+]
+unindentTopLevelOperators = false
+lineEndings=preserve

AUTHORS

@@ -10,3 +10,5 @@ Google Inc.
 Dino Wernli <dinowernli@gmail.com>
 Oscar Boykin <oscar.boykin@gmail.com>
 John T. Sullivan <john.t.sullivan@gmail.com>
+Andy Scott <andy.g.scott@gmail.com>
+Ittai Zeidman <ittaiz@gmail.com>

CODEOWNERS

@@ -1 +1 @@
-* @iitaiz @johnynek @dinowernil
+* @liucijus @simuons

CONTRIBUTING.md

@@ -17,9 +17,15 @@ Before you start working on a larger contribution, you should get in touch
 with us first. Use the issue tracker to explain your idea so we can help and
 possibly guide you.
 
+### Code organization
+
+Core Scala rules (including their implementations) and macros go in [./scala/private/rules/](./scala/private/rules/)
+and [./scala/private/macros/](./scala/private/macros/), respectively, and are re-exported for public use
+in [./scala/scala.bzl](./scala/scala.bzl).
+
 ### Code reviews and other contributions.
 **All submissions, including submissions by project members, require review.**
-Please follow the instructions in [the contributors documentation](http://bazel.io/contributing.html).
+Please follow the instructions in [the contributors documentation](https://bazel.build/contribute).
 
 ### The small print
 Contributions made by corporations are covered by a different agreement than
@@ -40,3 +46,10 @@ you can use the `lint.sh` script:
 
 Note that Skylint failures are ignored and that the fix
 command will modify your files in place.
+
+### Additional Tests to Run
+Some changes reqiring running additional tests which are not currently
+part of the CI pipeline.
+
+When editing code in `./third_party`, please run `./dangerous_test_thirdparty_version.sh`
+but read the comments at the beginning of the file first.

CONTRIBUTORS

@@ -21,3 +21,4 @@ Oscar Boykin <oscar.boykin@gmail.com>
 Justine Alexandra Roberts Tunney <jart@google.com>
 Natan Silnitsky <natans@wix.com>
 Nadav Wexler <nadavwe@wix.com>
+Ittai Zeidman <ittaiz@gmail.com>