ConsultingMD · tian000 · Jan 17, 2020 · May 24, 2019 · May 27, 2019 · May 31, 2019
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.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. -->
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ hash1
 hash2
 .DS_store
 .bazel_cache
+.ijwb
diff --git a/.travis.yml b/.travis.yml
@@ -1,66 +1,83 @@
-# trusty beta image has jdk8, gcc4.8.4
-dist: trusty
+dist: xenial
 sudo: required
-# xcode8 has jdk8
-osx_image: xcode8
-# Not technically required but suppresses 'Ruby' in Job status message.
 language: sh
 
+addons:
+  apt:
+    packages:
+    - libxml2-utils
+
 cache:
     directories:
      - .bazel_cache
+     - ~/.bazel_binaries
 
-os:
-  - linux
-  - osx
-  - windows
+_linux: &linux
+  os: linux
+_osx: &osx
+  os: osx
+  osx_image: xcode10.1
+_windows:
+  os: windows
 
-env:
-  # Linting is broken. Disable until fixed.
-  # See https://github.com/bazelbuild/rules_scala/pull/622
-  # we want to test the last release
-  #- V=0.16.1 TEST_SCRIPT=test_lint.sh
-  - V=0.23.1 TEST_SCRIPT=test_rules_scala
-    #- V=0.14.1 TEST_SCRIPT=test_intellij_aspect.sh
-  - V=0.23.1 TEST_SCRIPT=test_reproducibility
+###
+#
+# Want to update/change bazel versions?
+#
+# 1. Update the bazel_version case statement in
+#    ./tools/bazel to include hashes for the bazel version
+#    you're targeting.
+#
+# 2. either
+#    - If you're updating the default bazel version, change
+#      default_bazel_version in ./tools/bazel.
+#    or
+#    - If you want to add an additional bazel version to the build
+#      matrix, set BAZEL_VERSION=<desired-version> along side
+#      TEST_SCRIPT below.
+#
+# 3. If you need to update the Windows version, adjust
+#    the windows specific install code below.
+#
+###
 
+jobs:
+  include:
+# Lint
+    - stage: test
+      <<: *linux
+      env: TEST_SCRIPT=test_lint
+# Test
+    - <<: *linux
+      env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.1.0
+    - <<: *linux
+      env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=2.0.0
+    - <<: *linux
+      env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.1.0
+    - <<: *linux
+      env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=2.0.0
+    - <<: *osx
+      env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.1.0
+    - <<: *osx
+      env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=2.0.0
+    - <<: *osx
+      env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.1.0
+    - <<: *osx
+      env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=2.0.0
 
 before_install:
   - |
     if [[ "${TRAVIS_OS_NAME}" == "windows" ]]; then
       choco install jdk8 -params 'installdir=c:\\java8'
-      choco install bazel --version ${V}
-    else
-      if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-        OS=darwin
-      else
-        sudo sysctl kernel.unprivileged_userns_clone=1
-        sudo add-apt-repository -y ppa:openjdk-r/ppa
-        sudo apt-get update -q
-        sudo apt-get install openjdk-8-jdk -y
-        sudo apt-get install libxml2-utils -y
-        OS=linux
-      fi
-
-      if [[ $V =~ .*rc[0-9]+.* ]]; then
-        PRE_RC=$(expr "$V" : '\([0-9.]*\)rc.*')
-        RC_PRC=$(expr "$V" : '[0-9.]*\(rc.*\)')
-        URL="https://storage.googleapis.com/bazel/${PRE_RC}/${RC_PRC}/bazel-${V}-installer-${OS}-x86_64.sh"
-      else
-        URL="https://github.com/bazelbuild/bazel/releases/download/${V}/bazel-${V}-installer-${OS}-x86_64.sh"
-      fi
-      wget -O install.sh "${URL}"
-      chmod +x install.sh
-      ./install.sh --user
-      rm -f install.sh
+      choco install bazel --version 0.28.0
     fi
   - cat .bazelrc.travis >> .bazelrc
 
 script:
   - |
     if [[ "${TRAVIS_OS_NAME}" == "windows" ]]; then
       powershell -Command 'Set-ExecutionPolicy RemoteSigned -scope CurrentUser'
-      powershell -File ./${TEST_SCRIPT}.ps1
-    else
-      bash ./${TEST_SCRIPT}.sh ci
+      export JAVA_HOME='c:\\\\java8'
+      export BAZEL_VERSION=host
     fi
+    bash ./${TEST_SCRIPT}.sh ci
diff --git a/AUTHORS b/AUTHORS
@@ -10,3 +10,4 @@ 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>
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1 +1 @@
-* @iitaiz @johnynek @dinowernil
+* @ittaiz @dinowernil
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -17,6 +17,12 @@ 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).

diff --git a/README.md b/README.md
@@ -18,19 +18,30 @@ This project defines core build rules for [Scala](https://www.scala-lang.org/) t
 * [scala_library_suite](docs/scala_library_suite.md)
 * [scala_test_suite](docs/scala_test_suite.md)
 * [thrift_library](docs/thrift_library.md)
-* [scalapb_proto_library](docs/scalapb_proto_library.md)
+* [scala_proto_library](docs/scala_proto_library.md)
 * [scala_toolchain](docs/scala_toolchain.md)
 * [scala_import](docs/scala_import.md)
+* [scala_doc](docs/scala_doc.md)
 
 ## Getting started
 
-In order to use these rules you must have bazel 0.23 or later and add the
-following to your WORKSPACE file:
+1. [Install Bazel](https://docs.bazel.build/versions/master/install.html), see the [compatibility table](#bazel-compatible-versions).
+2. Add the following to your `WORKSPACE` file and update the `githash` if needed:
 
 ```python
-rules_scala_version="a89d44f7ef67d93dedfc9888630f48d7723516f7" # update this as needed
-
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+# bazel-skylib 0.8.0 released 2019.03.20 (https://github.com/bazelbuild/bazel-skylib/releases/tag/0.8.0)
+skylib_version = "0.8.0"
+http_archive(
+    name = "bazel_skylib",
+    type = "tar.gz",
+    url = "https://github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib.{}.tar.gz".format (skylib_version, skylib_version),
+    sha256 = "2ef429f5d7ce7111263289644d233707dba35e39696377ebab8b0bc701f7818e",
+)
+
+rules_scala_version="69d3c5b5d9b51537231746e93b4383384c9ebcf4" # update this as needed
+
 http_archive(
     name = "io_bazel_rules_scala",
     strip_prefix = "rules_scala-%s" % rules_scala_version,
@@ -44,8 +55,8 @@ scala_register_toolchains()
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
 scala_repositories()
 
-protobuf_version="66dc42d891a4fc8e9190c524fd67961688a37bbe"
-protobuf_version_sha256="983975ab66113cbaabea4b8ec9f3a73406d89ed74db9ae75c74888e685f956f8"
+protobuf_version="09745575a923640154bcf307fba8aedff47f240a"
+protobuf_version_sha256="416212e14481cff8fd4849b1c1c1200a7f34808a54377e22d7447efdf54ad758"
 
 http_archive(
     name = "com_google_protobuf",
@@ -54,6 +65,7 @@ http_archive(
     sha256 = protobuf_version_sha256,
 )
 ```
+
 This will load the `rules_scala` repository at the commit sha
 `rules_scala_version` into your Bazel project and register a [Scala
 toolchain](#scala_toolchain) at the default Scala version (2.11.12)
@@ -77,17 +89,19 @@ Rules scala supports all minor versions of Scala 2.11/2.12. By default `Scala 2.
 version you need to
 specify it when calling `scala_repositories`. `scala_repositories` takes a tuple `(scala_version, scala_version_jar_shas)`
 as a parameter where `scala_version` is the scala version and `scala_version_jar_shas` is a `dict` with
-`sha256` hashes for the maven artifacts `scala_library`, `scala_reflect` and `scala_compiler`:
+`sha256` hashes for the maven artifacts `scala_compiler`, `scala_library`, and `scala_reflect`:
+
 ```python
 scala_repositories((
-    "2.12.8",
+    "2.12.10",
     {
-       "scala_compiler": "f34e9119f45abd41e85b9e121ba19dd9288b3b4af7f7047e86dc70236708d170",
-       "scala_library": "321fb55685635c931eba4bc0d7668349da3f2c09aee2de93a70566066ff25c28",
-       "scala_reflect": "4d6405395c4599ce04cea08ba082339e3e42135de9aae2923c9f5367e957315a"
+       "scala_compiler": "cedc3b9c39d215a9a3ffc0cc75a1d784b51e9edc7f13051a1b4ad5ae22cfbc0c",
+       "scala_library": "0a57044d10895f8d3dd66ad4286891f607169d948845ac51e17b4c1cf0ab569d",
+       "scala_reflect": "56b609e1bab9144fb51525bfa01ccd72028154fc40a58685a1e9adcbe7835730"
     }
 ))
 ```
+
 If you're using any of the rules `twitter_scrooge`, `tut_repositories`, `scala_proto_repositories`
 or `specs2_junit_repositories` you also need to specify `scala_version` for them. See `./test_version/WORKSPACE.template`
 for an example workspace using another scala version.
@@ -97,7 +111,10 @@ for an example workspace using another scala version.
 
 | bazel  | rules_scala gitsha |
 |--------|--------------------|
-| 0.23.x | HEAD                                     |
+| 2.0.0  | HEAD               |
+| 1.1.0  | HEAD               |
+| 0.28.1 | bd0c388125e12f4f173648fc4474f73160a5c628 |
+| 0.23.x | ca655e5a330cbf1d66ce1d9baa63522752ec6011 |
 | 0.22.x | f3113fb6e9e35cb8f441d2305542026d98afc0a2 |
 | 0.16.x | f3113fb6e9e35cb8f441d2305542026d98afc0a2 |
 | 0.15.x | 3b9ab9be31ac217d3337c709cb6bfeb89c8dcbb1 |
@@ -174,6 +191,16 @@ Unused dependency checking can either be enabled globally for all targets using
 in these cases you can enable unused dependency checking globally through a toolchain and override individual misbehaving targets
 using the attribute.
 
+## Advanced configurable rules
+To make the ruleset more flexible and configurable, we introduce a phase architecture. By using a phase architecture, where rule implementations are defined as a list of phases that are executed sequentially, functionality can easily be added (or modified) by adding (or swapping) phases.
+
+Phases provide 3 major benefits:
+ - Consumers are able to configure the rules to their specific use cases by defining new phases within their workspace without impacting other consumers.
+ - Contributors are able to implement new functionalities by creating additional default phases.
+ - Phases give us more clear idea what steps are shared across rules.
+
+See [Customizable Phase](docs/customizable_phase.md) for more info.
+
 ## Building from source
 Test & Build:
 ```
@@ -204,7 +231,9 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for more info.
 Here's a (non-exhaustive) list of companies that use `rules_scala` in production. Don't see yours? [You can add it in a PR](https://github.com/bazelbuild/rules_scala/edit/master/README.md)!
 
 * [Ascend](https://ascend.io/)
+* [Canva](https://www.canva.com/)
 * [Etsy](https://www.etsy.com/)
+* [Grand Rounds](http://grandrounds.com/)
 * [Kitty Hawk](https://kittyhawk.aero/)
 * [Meetup](https://meetup.com/)
 * [Spotify](https://www.spotify.com/)