Bump Build Dependencies

.gitattributes

@@ -21,6 +21,9 @@ text eol=lf
 *.txt     eol=lf
 *.xml     eol=lf
 
+# Some sbt launcher scripts can't handle CR in .jvmopts
+.jvmopts  eol=lf
+
 # Windows-specific files get windows endings
 *.bat     eol=crlf
 *.cmd     eol=crlf

.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# Files of which NthPortal has a lot of knowledge. Wildcards cover tests
+*LazyList*  @NthPortal
+**/scala/util/Using*  @NthPortal

.github/workflows/ci.yml

@@ -0,0 +1,47 @@
+name: Scala Merge CI
+
+on:
+  push:
+    branches: ['2.*.x']
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build_and_test:
+    name: Windows
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - run: git config --global core.autocrlf false
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      # Note that we don't use olafurpg/setup-scala; it wouldn't buy us anything
+      # over setup-java. (We don't want csbt or xsbt; we prefer the standard
+      # sbt launch script, which comes preinstalled on Windows (and Ubuntu).)
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 8
+
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.sbt
+            ~/.ivy2/cache
+            ~/.cache/coursier
+          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+
+      - name: Build
+        run: |
+          sbt setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
+
+      - name: Test
+        run: |
+          STARR=`cat buildcharacter.properties | grep ^maven.version.number | cut -d= -f2` && echo $STARR
+          sbt -Dstarr.version=$STARR setupValidateTest test:compile info testAll

.gitignore

@@ -12,10 +12,6 @@
 #
 # JARs aren't checked in, they are fetched by sbt
 #
-# We could be more concise with /lib/**/*.jar but that assumes
-# a late-model git.
-#
-/lib/ant/*.jar
 /lib/*.jar
 /test/files/codelib/*.jar
 /test/files/lib/*.jar
@@ -37,23 +33,35 @@
 /bin/
 /sandbox/
 
-# eclipse, intellij
-/.classpath
-/.project
+# intellij
 /src/intellij*/*.iml
 /src/intellij*/*.ipr
 /src/intellij*/*.iws
 **/.cache
 /.idea
 /.settings
 
+# vscode
+/.vscode
+
 # Standard symbolic link to build/quick/bin
 /qbin
 
 # sbt's target directories
 /target/
-/project/target/
-/project/project/target/
-/project/project/project/target/
+/project/**/target/
+/test/macro-annot/target/
+/test/files/target/
+/test/target/
 /build-sbt/
 local.sbt
+jitwatch.out
+
+# Used by the restarr/restarrFull commands as target directories
+/build-restarr/
+/target-restarr/
+
+# metals
+.metals
+.bloop
+project/**/metals.sbt

.mailmap

@@ -13,6 +13,7 @@ Alex Cruise <[email protected]> <[email protected]>
 A. P. Marki <[email protected]>
 Antonio Cunei <[email protected]>
 Antonio Cunei <[email protected]> <[email protected]>
+Björn Regnell <[email protected]>
 Buraq Emir <[email protected]>
 Caoyuan Deng <[email protected]>
 Chris Hodapp <[email protected]>
@@ -24,6 +25,7 @@ Damien Obristi <[email protected]>
 Daniel C. Sobral <[email protected]>
 Daniel C. Sobral <[email protected]> <dcs@dcs-132-CK-NF79.(none)>
 Daniel Lorch <[email protected]>
+Darcy Shen <[email protected]>
 Diego E. Alonso Blas <[email protected]>
 Diego E. Alonso Blas <[email protected]>
 Erik Stenman <[email protected]>
@@ -36,6 +38,9 @@ Harrison Houghton <[email protected]> <[email protected]>
 Ilya Sergei <[email protected]>
 Ingo Maier <[email protected]>
 Ingo Maier <[email protected]> <[email protected]>
+Jamie Thompson <[email protected]>
+Jan Arne Sparka <[email protected]>
+Jian Lan <[email protected]>
 Josh Suereth <[email protected]>
 Josh Suereth <[email protected]> <[email protected]>
 Julien Eberle <[email protected]>
@@ -52,25 +57,31 @@ Miguel Garcia <[email protected]> <[email protected]>
 Mike Skells <[email protected]>
 Mirco Dotta <[email protected]>
 Mirco Dotta <[email protected]> <[email protected]>
+Mitsuhiro Shibuya <[email protected]>
 Moez A. Abdel-Gawad <[email protected]>
 Mohsen Lesani <[email protected]>
 Nada Amin <[email protected]>
 Nada Amin <[email protected]> <[email protected]>
 Nada Amin <[email protected]> <[email protected]>
 Natallie Baikevich <[email protected]>
 Nikolay Mihaylov <[email protected]>
+NthPortal <[email protected]>
+NthPortal <[email protected]>
 Paolo Giarrusso <[email protected]>
 Pavel Pavlov <[email protected]>
 Philipp Haller <[email protected]>
 Philipp Haller <[email protected]> <[email protected]>
 Philippe Altherr <[email protected]>
+Philippus Baalman <[email protected]>
 Raphaël Noir <[email protected]>
 Roland Kuhn <[email protected]>
 Rüdiger Klaehn <[email protected]>
 Sebastian Hack <[email protected]>
 Simon Ochsenreither <[email protected]>
 Stepan Koltsov <[email protected]>
 Stéphane Micheloud <[email protected]>
+Takahashi Osamu <[email protected]>
+Trey Cahill <[email protected]>
 Unknown Committer <[email protected]>
 Unknown Committer <[email protected]> <[email protected]>
 Unknown Committer <[email protected]> <[email protected]>

.travis.yml

@@ -1,67 +1,160 @@
 version: ~> 1.0 # needed for imports
-
 import: scala/scala-dev:travis/default.yml
 
+dist: xenial  # GPG stuff breaks on bionic; scala/scala-dev#764
 language: scala
 
 stages:
-  - name: build
+  - build
+  - test
+
+templates: # this has no effect on travis, it's just a place to put our templates
+  pr-jdk8: &pr-jdk8
+    if: type = pull_request OR repo != scala/scala
+
+  cron-jdk16: &cron-jdk16
+    if: type = cron AND repo = scala/scala
+    env: ADOPTOPENJDK=16
+
+  build-for-testing: &build-for-testing
+    # pull request validation (w/ bootstrap)
+    # differs from the build that publishes releases / integration builds:
+    # - not using bash script setup, but just the underlying sbt calls
+    # - publishing locally rather than to Artifactory
+    # the bootstrap above is older historically; this way of doing it is newer
+    # and also simpler. we should aim to reduce/eliminate the duplication.
+    stage: build
+    name: build, publishLocal, build again
+    script:
+      - set -e
+      - sbt setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
+      - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
+      - sbt -Dstarr.version=$STARR setupValidateTest compile
+    workspaces:
+      create:
+        name: bootstrapped
+        paths:
+          # so new STARR will be available
+          - "buildcharacter.properties"
+          - "$HOME/.ivy2/local/org.scala-lang"
+          # so build products built using new STARR are kept
+          - "target"
+          - "project/target"
+          - "project/project/target"
+          - "project/project/project/target"
+          - "dist"
+          - "build"
+
+  test1: &test1
+    stage: test
+    name: tests (junit, scalacheck, et al)
+    workspaces:
+      use: bootstrapped
+    script:
+      - set -e
+      - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
+      - sbt -Dstarr.version=$STARR setupValidateTest Test/compile testAll1
+
+  test2: &test2
+    stage: test
+    name: tests (partest)
+    workspaces:
+      use: bootstrapped
+    script:
+      - set -e
+      - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
+      - sbt -Dstarr.version=$STARR setupValidateTest testAll2
 
 jobs:
-    include:
-
-      # full bootstrap and publish
-      - stage: build
-        if: type != pull_request
-        script:
-          # see comment in `bootstrap_fun` for details on the procedure
-          # env available in each stage
-          #  - by travis config (see below): secret env vars
-          #  - by `common` script: WORKSPACE, IVY2_DIR, SBT_CMD, integrationRepoUrl
-          #  - by `bootstrap_fun`: publishPrivateTask, ...
-          - (cd admin && ./init.sh)
-          - source scripts/common
-          - source scripts/bootstrap_fun
-          - determineScalaVersion
-          - deriveModuleVersions
-          - removeExistingBuilds $integrationRepoUrl
-          - if [ ! -z "$STARR_REF" ]; then buildStarr; fi
-          - buildLocker
-          - buildQuick
-          - triggerScalaDist
-
-      # pull request validation (w/ mini-bootstrap)
-      # "mini" in these senses:
-      # - it doesn't use the complicated legacy scripts.
-      # - it doesn't publish to scala-pr-validation-snapshots
-      #   (because we need secrets for that and Travis-CI doesn't give PR jobs access to secrets)
-      # it is still a true bootstrap.
-      - stage: build
-        name: "JDK 8 pr validation"
-        if: type = pull_request
-        script:
-          - sbt -warn setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
-          - STARR=`cat buildcharacter.properties | grep ^maven.version.number | cut -d= -f2` && echo $STARR
-          - sbt -Dstarr.version=$STARR -warn setupValidateTest test:compile info testAll
-
-      # build the spec using jekyll
-      - stage: build
-        language: ruby
-        install:
-          - ruby -v
-          - gem install bundler
-          - bundler --version
-          - bundle install
-        script:
-        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then (cd admin && ./init.sh); fi'
+  include:
+    - stage: build
+      if: (type = push OR type = api) AND repo = scala/scala # api for manually triggered release builds
+      name: publish (bootstrapped) to scala-integration or sonatype
+      script:
+        # see comment in `bootstrap_fun` for details on the procedure
+        # env available in each stage
+        #  - by travis config (see below): secret env vars
+        #  - by `common` script: WORKSPACE, IVY2_DIR, SBT_CMD, integrationRepoUrl
+        #  - by `bootstrap_fun`: publishPrivateTask, ...
+        - set -e
+        - (cd admin && ./init.sh)
+        - source scripts/common
+        - source scripts/bootstrap_fun
+        - determineScalaVersion
+        - removeExistingBuilds $integrationRepoUrl
+        - if [ ! -z "$STARR_REF" ]; then buildStarr; fi
+        - buildLocker
+        - buildQuick
+        - triggerScalaDist
+
+    - <<: *build-for-testing
+      <<: *pr-jdk8
+
+    - <<: *test1
+      <<: *pr-jdk8
+
+    - <<: *test2
+      <<: *pr-jdk8
+
+    - <<: *build-for-testing
+      <<: *cron-jdk16
+
+    - <<: *test1
+      <<: *cron-jdk16
+
+    - <<: *test2
+      <<: *cron-jdk16
+
+    - stage: test
+      name: build library with Scala 3
+      if: type = pull_request OR repo != scala/scala
+      workspaces:
+        use: bootstrapped
+      script:
+        - set -e
+        - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
+        - sbt -Dscala.build.compileWithDotty=true library/compile
+
+    - name: build benchmarks
+      if: type = pull_request OR repo != scala/scala
+      workspaces:
+        use: bootstrapped
+      script:
+        - set -e
+        - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
+        - sbt bench/Jmh/compile
+
+    - stage: build
+      if: type = pull_request OR type = push
+      name: language spec
+      # wkhtmltopdf requires libssl1.1, which we can't install on xenial
+      dist: bionic
+      language: ruby
+      install:
+        - ruby -v
+        - gem install bundler
+        - bundler --version
+        - bundle install
+        # cribbed from https://github.com/SebastiaanKlippert/go-wkhtmltopdf/blob/master/.travis.yml
+        - sudo apt-get update
+        - sudo apt-get install -y build-essential xorg xfonts-75dpi libpng16-16 libssl1.1
+        - wget --quiet "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.bionic_amd64.deb"
+        - sudo dpkg -i "wkhtmltox_0.12.6-1.bionic_amd64.deb"
+        - rm "wkhtmltox_0.12.6-1.bionic_amd64.deb"
+      script:
+        - set -e
+        - (cd admin && ./init.sh)
         - bundle exec jekyll build -s spec/ -d build/spec
-        after_success:
-        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./scripts/travis-publish-spec.sh; fi'
+        - export JEKYLL_ENV=spec-pdf
+        - bundle exec jekyll build -s spec/ -d build/spec-pdf
+        - ./scripts/generate-spec-pdf.sh
+      after_success:
+        - ./scripts/travis-publish-spec.sh
 
 env:
   global:
     - ADOPTOPENJDK=8
-    - secure: "TuJOUtALynPd+MV1AuMeIpVb8BUBHr7Ul7FS48XhS2PyuTRpEBkSWybYcNg3AXyzmWDAuOjUxbaNMQBvP8vvehTbIYls5H5wTGKvj0D0TNVaPIXjF8bA8KyNat9xGNzhnWm2/2BMaWpKBJWRF7Jb+zHhijMYCJEbkMtoiE5R/mY=" # PRIV_KEY_SECRET, for scripts/travis-publish-spec.sh
+    - secure: "P8EqpZoin/YTnwel9TTxSSAHtXfZ4M262BKXlYUZmjoQsjyvXDAeZ7yAqgAvX5BeRFrGkBToPiE+V60stdWkPKs3+9COw2BDUB1CULBHhRY9Lxordmz0xVhgEfsoH4f6r6wOlIQ9kuaWhmP+JdB/mzOHZhLch9ziPi8O46Z8t4k=" # PRIV_KEY_SECRET, for scripts/travis-publish-spec.sh
     - secure: "T1fxtvLTxioyXJYiC/zVYdNYsBOt+0Piw+xE04rB1pzeKahm9+G2mISdcAyqv6/vze9eIJt6jNHHpKX32/Z3Cs1/Ruha4m3k+jblj3S0SbxV6ht2ieJXLT5WoUPFRrU68KXI8wqUadXpjxeJJV53qF2FC4lhfMUsw1IwwMhdaE8=" # PRIVATE_REPO_PASS
     - secure: "feE5A8mYNpkNQKVwCj3aXrwjVrJWh/4ENpRfFlr2HOD9ORk1GORD5Yq907WZd+dTkYK54Lh1gA+qHOCIDgJHbi9ZLU+kjzEjtYKF6lQy6Wb0LI8smTOnAA6IWVVYifiXw8d66MI2MKZb2jjGeIzy8Q00SZjLhEGjLyTeCIB88Ws=" # SONA_USER
     - secure: "ek3As5q2tL8UBXcxSBbv4v5YgsoPD41SCzPOSu72kzfbngyxgQxrcziU5pIM+Lib9KaWex7hVVWNL38tMyDbu+0OpDv8bPjMujzlDx5I2pJUfuOJo7QRYsJE1nsXcY4cA72cCLfbRcLEkvtDAhcdLSaUOqlyQe5BY4X4fY5eoPA=" # SONA_PASS
@@ -74,4 +167,10 @@ cache:
     - $HOME/.rvm
 
 notifications:
+  slack:
+    rooms:
+      - typesafe:WoewGgHil2FkdGzJyV3phAhj
+    if: (type = cron OR type = push) AND repo = scala/scala
+    on_success: never
+    on_failure: change
   webhooks: https://scala-ci.typesafe.com/benchq/webhooks/travis