merge v2.13.8 tag to sbt-1.5 branch

.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/workflows/ci.yml

@@ -0,0 +1,51 @@
+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
+      matrix:
+        include:
+          - java: 8
+          - java: 17
+    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: temurin
+          java-version: ${{matrix.java}}
+
+      - 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

.travis.yml

@@ -8,135 +8,169 @@ stages:
   - 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-jdk17: &cron-jdk17
+    if: type = cron AND repo = scala/scala
+    env: ADOPTOPENJDK=17
+
+  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:
-      - stage: build
-        if: type != pull_request AND repo = scala/scala
-        name: bootstrap and publish
-        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
-
-      # pull request validation (w/ bootstrap)
-      # differs from the bootstrap above by:
-      # - 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
-        if: type = pull_request OR repo != scala/scala
-        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"
-
-      - stage: test
-        name: tests (junit, scalacheck, et al)
-        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 -Dstarr.version=$STARR setupValidateTest Test/compile testAll1
-
-      - name: tests (partest)
-        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 -Dstarr.version=$STARR setupValidateTest testAll2
-
-      - name: ensure standard library is buildable by 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
-
-      - stage: test
-        name: build benchmarks (bootstrapped)
-        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
-        name: language spec (Jekyll)
-        # 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
-          - 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
+  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-jdk17
+
+    - <<: *test1
+      <<: *cron-jdk17
+
+    - <<: *test2
+      <<: *cron-jdk17
+
+    - 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
+        - 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: "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
-    - secure: "dbAvl6KEuLwZ0MVQPZihFsPzCdiLbX0EFk3so+hcfEbksrmLQ1tn4X5ZM7Wy1UDR8uN9lxngEwHch7a7lKqpugzmXMew9Wnikr9WBWbJT77Z+XJ/jHI6YuiCRpRo+nvxXGp9Ry80tSIgx5eju0J83IaJL41BWlBkvyAd7YAHORI=" # GPG_SUBKEY_SECRET
-    - secure: "RTyzS6nUgthupw5M0fPwTlcOym1sWgBo8eXYepB2xGiQnRu4g583BGuNBW1UZ3vIjRETi/UKQ1HtMR+i7D8ptF1cNpomopncVJA1iy7pU2w0MJ0xgIPMuvtkIa3kxocd/AnxAp+UhUad3nC8lDpkvZsUhhyA0fb4iPKipd2b2xY=" # TRAVIS_TOKEN (login with GitHub as SethTisue)
+    - secure: "T1fxtvLTxioyXJYiC/zVYdNYsBOt+0Piw+xE04rB1pzeKahm9+G2mISdcAyqv6/vze9eIJt6jNHHpKX32/Z3Cs1/Ruha4m3k+jblj3S0SbxV6ht2ieJXLT5WoUPFRrU68KXI8wqUadXpjxeJJV53qF2FC4lhfMUsw1IwwMhdaE8=" # PRIVATE_REPO_PASS, for publishing to scala-ci Artifactory
+    - secure: "dbAvl6KEuLwZ0MVQPZihFsPzCdiLbX0EFk3so+hcfEbksrmLQ1tn4X5ZM7Wy1UDR8uN9lxngEwHch7a7lKqpugzmXMew9Wnikr9WBWbJT77Z+XJ/jHI6YuiCRpRo+nvxXGp9Ry80tSIgx5eju0J83IaJL41BWlBkvyAd7YAHORI=" # GPG_SUBKEY_SECRET, so we can sign JARs
+    - secure: "RTyzS6nUgthupw5M0fPwTlcOym1sWgBo8eXYepB2xGiQnRu4g583BGuNBW1UZ3vIjRETi/UKQ1HtMR+i7D8ptF1cNpomopncVJA1iy7pU2w0MJ0xgIPMuvtkIa3kxocd/AnxAp+UhUad3nC8lDpkvZsUhhyA0fb4iPKipd2b2xY=" # TRAVIS_TOKEN (login with GitHub as SethTisue), for triggering scala-dist job
+    - secure: "FvhicbSeys7VNTj9ZP/aNT0NhiQP/NNV0KRfK7IHxi3uOeaxFVfaQsln4lzqZn8dkntgzzNrE/VhvMIknfnISAPX7bShy6SRyj3V2BlcUpuem8WtwmkCaZ42xlCJteBL7NW0auG/8rxrNIAJXbRObqF+YdK6XsRMWaBMQHky+ss=" # SONA_USER, token username for publishing to Sonatype
+    - secure: "Y8CTlEdQbAS+P+LgkY05al/KSbccbX5BATm9N2GI9C6wH7oQuUU/VtU+bwvzeiF9DCsZPjrWXsa0JCuIQE+UzK1NWXxlkhUdGCaCBZ/nUecouBtMk2x/h7uIGpeYInxA041r5SuBecZuZQI79nhl+BwZSLu82Vy1QtP0/Cd8oRM=" # SONA_PASS, token password for publishing to Sonatype
 
 # caching for sdkman / sbt / ivy / coursier imported from scala-dev
 cache:
   directories:
     - $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