Merge pull request #1 from sbt/develop

Pull latest changes

.appveyor.yml

@@ -0,0 +1,162 @@
+image:
+  - MacOS
+  - Visual Studio 2015
+  - Visual Studio 2019
+  - Ubuntu
+
+build: off
+
+init:
+  - git config --global core.autocrlf input
+
+for:
+-
+  matrix:
+    only:
+      - image: Ubuntu
+
+  branches:
+    only:
+      - build-graal
+  artifacts:
+  - path: client/target/bin/sbtn
+    name: sbtn
+
+  install:
+  - curl -sL https://github.com/sbt/sbt/releases/download/v1.3.10/sbt-1.3.10.tgz > ~/sbt-bin.tgz
+  - mkdir ~/sbt
+  - tar -xf ~/sbt-bin.tgz --directory ~/sbt
+  - curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.11.0/install.sh | bash && . ~/.jabba/jabba.sh
+  - jabba install adopt@1.8.0-275
+  - jabba use adopt@1.8.0-275
+  - curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java8-linux-amd64-20.1.0.tar.gz > graalvm.tar.gz
+  - tar -xf graalvm.tar.gz
+  - export PATH="~/sbt/sbt/bin:$PATH"
+  - export PATH="$PATH:~/.jabba/jdk/adopt@1.8.0-275/bin"
+  - export JAVA_HOME="~/.jabba/jdk/adopt@1.8.0-275"
+
+  test_script:
+    - export PATH="$PATH:~/.jabba/jdk/adopt@1.8.0-275/bin"
+    - export PATH="$PATH:graalvm-ce-java8-20.1.0/bin"
+    - gu install native-image
+    - sbt "-Dsbt.io.virtual=false" "-Dsbt.native-image=$(pwd)/graalvm-ce-java8-20.1.0/bin/native-image" "sbtClientProj/buildNativeThinClient"
+
+-
+  matrix:
+    only:
+      - image: MacOS
+
+  branches:
+    only:
+      - build-graal
+  artifacts:
+  - path: client/target/bin/sbtn
+    name: mac-native-sbt-client
+
+  install:
+  - curl -sL https://github.com/sbt/sbt/releases/download/v1.3.10/sbt-1.3.10.tgz > ~/sbt-bin.tgz
+  - mkdir ~/sbt
+  - tar -xf ~/sbt-bin.tgz --directory ~/sbt
+  - curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.11.0/install.sh | bash && . ~/.jabba/jabba.sh
+  - jabba install adopt@1.8.0-222
+  - jabba use adopt@1.8.0-222
+  - curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java8-darwin-amd64-20.1.0.tar.gz > graalvm.tar.gz
+  - tar -xf graalvm.tar.gz
+  - export PATH="~/sbt/sbt/bin:$PATH"
+  - export PATH="$PATH:~/.jabba/jdk/adopt@1.8.0-222/bin"
+  - export JAVA_HOME="~/.jabba/jdk/adopt@1.8.0-222"
+
+  test_script:
+    - export PATH="$PATH:~/.jabba/jdk/adopt@1.8.0-222/Contents/Home/bin"
+    - export PATH="$PATH:graalvm-ce-java8-20.1.0/Contents/Home/bin"
+    - gu install native-image
+    - sbt "-Dsbt.io.virtual=false" "-Dsbt.native-image=$(pwd)/graalvm-ce-java8-20.1.0/Contents/Home/bin/native-image" "sbtClientProj/buildNativeThinClient"
+
+-
+  matrix:
+    only:
+      - image: Visual Studio 2015
+  branches:
+    only:
+      - build-graal
+
+  artifacts:
+  - path: client\target\bin\sbtn.exe
+    name: sbtn.exe
+  install:
+    - cinst adoptopenjdk8 -params 'installdir=C:\\jdk8'
+    - SET CI=true
+      #- choco install windows-sdk-7.1 kb2519277
+    - call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd"
+
+    - ps: |
+        Add-Type -AssemblyName System.IO.Compression.FileSystem
+        if (!(Test-Path -Path "C:\sbt" )) {
+          (new-object System.Net.WebClient).DownloadFile(
+            'https://github.com/sbt/sbt/releases/download/v1.3.10/sbt-1.3.10.zip',
+            'C:\sbt-bin.zip'
+          )
+          [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sbt-bin.zip", "C:\sbt")
+        }
+        if (!(Test-Path -Path "C:\graalvm-ce-java8-20.2.0-dev" )) {
+          (new-object System.Net.WebClient).DownloadFile(
+            'https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java8-windows-amd64-20.1.0.zip',
+            'C:\graalvm-ce-java8-20.1.0.zip'
+          )
+          [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\graalvm-ce-java8-20.1.0.zip", "C:\")
+        }
+        if (!(Test-Path -Path "C:\zulu-jdk7" )) {
+          (new-object System.Net.WebClient).DownloadFile(
+            'https://cdn.azul.com/zulu/bin/zulu7.38.0.11-ca-jdk7.0.262-win_x64.zip',
+            'C:\zulu-jdk7.zip'
+          )
+          [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\zulu-jdk7.zip", "C:\")
+        }
+    - SET PATH=C:\graalvm-ce-java8-20.1.0\bin;%PATH%
+    - SET PATH=C:\sbt\sbt\bin;%PATH%
+    - SET JAVA_HOME=C:\jdk8
+    - gu install native-image
+    - rm .sbtopts
+
+  cache:
+    - '%USERPROFILE%\.ivy2\cache'
+    - '%LOCALAPPDATA%\Coursier\Cache\v1'
+    - '%USERPROFILE%\.sbt'
+
+  test_script:
+    - sbt "-Dsbt.io.virtual=false" "-Dsbt.native-image=C:\graalvm-ce-java8-20.1.0\bin\native-image.cmd" "sbtClientProj/buildNativeThinClient"
+-
+  matrix:
+    only:
+      - image: Visual Studio 2019
+  branches:
+    except:
+      - build-graal
+  install:
+    - cinst adoptopenjdk8 -params 'installdir=C:\\jdk8'
+    - SET JAVA_HOME=C:\jdk8
+    - SET PATH=C:\jdk8\bin;%PATH%
+    - SET CI=true
+
+    - ps: |
+        Add-Type -AssemblyName System.IO.Compression.FileSystem
+        if (!(Test-Path -Path "C:\sbt" )) {
+          (new-object System.Net.WebClient).DownloadFile(
+            'https://github.com/sbt/sbt/releases/download/v1.3.10/sbt-1.3.10.zip',
+            'C:\sbt-bin.zip'
+          )
+          [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sbt-bin.zip", "C:\sbt")
+        }
+    - SET PATH=C:\sbt\sbt\bin;%PATH%
+    - SET SBT_OPTS=-Xmx4g -Dsbt.supershell=never -Dfile.encoding=UTF8
+    - rm .sbtopts
+
+  cache:
+    - '%USERPROFILE%\.ivy2\cache'
+    - '%LOCALAPPDATA%\Coursier\Cache\v1'
+    - '%USERPROFILE%\.sbt'
+
+  test_script:
+    # The server tests often fail in CI when run together so just run a single test to ensure
+    # that the thin client works on windows
+    - sbt "-Dsbt.io.virtual=false" "scripted actions/* reporter/source-mapper classloader-cache/* nio/* watch/*" "serverTestProj/testOnly testpkg.ClientTest"

.gitattributes

@@ -1,7 +1,4 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files we want to always be normalized and converted 
-# to native line endings on checkout.
-*.scala text
-*.java text
+# Exclude contraband generated files from diff (by default - you can see it if you want)
+**/contraband-scala/**/* -diff merge=ours
+**/contraband-scala/**/* linguist-generated=true
+**/contraband-scala/**/* diff

.github/ISSUE_TEMPLATE/---bug-report.md

@@ -0,0 +1,22 @@
+---
+name: "\U0001F41B Bug report"
+about: Create a report to help us improve
+title: ''
+labels: Bug
+assignees: ''
+
+---
+
+## steps
+
+<!-- Describe exact steps to reproduce your problems on our computer, including sbt version and build.sbt  -->
+
+## problem
+
+<!-- Next, describe the problem, or what you think is the problem. -->
+
+## expectation
+
+<!-- Describe what you think should've happened. -->
+
+## notes

.github/ISSUE_TEMPLATE/--feature-request.md

@@ -0,0 +1,10 @@
+---
+name: "\U0001F389 Feature request"
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Please use https://discuss.lightbend.com/c/tooling including a specific user story instead of posting them to the issue tracker.

.github/ISSUE_TEMPLATE/--question.md

@@ -0,0 +1,10 @@
+---
+name: "❓ Question"
+about: Please use https://stackoverflow.com/questions/tagged/sbt for questions
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Please use https://stackoverflow.com/questions/tagged/sbt for questions instead of posting them to the issue tracker.

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

@@ -0,0 +1,108 @@
+name: CI
+on:
+  pull_request:
+  push:
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            java: 11
+            jobtype: 1
+          - os: ubuntu-latest
+            java: 11
+            jobtype: 2
+          - os: ubuntu-latest
+            java: 11
+            jobtype: 3
+          - os: ubuntu-latest
+            java: 11
+            jobtype: 4
+          - os: ubuntu-latest
+            java: 11
+            jobtype: 5
+          - os: ubuntu-latest
+            java: 8
+            jobtype: 6
+    runs-on: ${{ matrix.os }}
+    env:
+      JAVA_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
+      SCALA_212: 2.12.13
+      SCALA_213: 2.13.3
+      UTIL_TESTS: utilCache/test;utilControl/test;utilInterface/test;utilLogging/test;utilPosition/test;utilRelation/test;utilScripted/test;utilTracking/test
+      SBT_LOCAL: false
+    steps:
+    - name: Checkout sbt/sbt
+      uses: actions/checkout@v2
+    - name: Checkout sbt/io
+      uses: actions/checkout@v2
+      with:
+        repository: sbt/io
+        ref: develop
+        path: io
+    - name: Checkout sbt/librarymanagement
+      uses: actions/checkout@v2
+      with:
+        repository: sbt/librarymanagement
+        ref: develop
+        path: librarymanagement
+    - name: Checkout sbt/zinc
+      uses: actions/checkout@v2
+      with:
+        repository: sbt/zinc
+        ref: develop
+        path: zinc
+    - name: Setup
+      uses: olafurpg/setup-scala@v10
+      with:
+        java-version: "adopt@1.${{ matrix.java }}"
+    - name: Coursier cache
+      uses: coursier/cache-action@v6
+    - name: Cache sbt
+      uses: actions/cache@v2.1.3
+      with:
+        path: ~/.sbt
+        key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+    - name: Build and test
+      run: |
+        rm -rf "$HOME/.sbt/scripted/" || true
+        case ${{ matrix.jobtype }} in
+          1)
+            sbt -v "mimaReportBinaryIssues ; javafmtCheck ; Test / javafmtCheck; scalafmtCheckAll ; scalafmtSbtCheck; serverTestProj/scalafmtCheckAll; headerCheck ;test:headerCheck ;whitesourceOnPush ;test:compile; publishLocal; test; serverTestProj/test; doc; $UTIL_TESTS; ++$SCALA_213; $UTIL_TESTS"
+            ;;
+          2)
+            sbt -v "scripted actions/* apiinfo/* compiler-project/* ivy-deps-management/* reporter/* tests/* watch/* classloader-cache/* package/*"
+            ;;
+          3)
+            sbt -v "dependencyTreeProj/publishLocal; scripted dependency-graph/* dependency-management/* plugins/* project-load/* java/* run/* nio/*"
+            ;;
+          4)
+            sbt -v "repoOverrideTest:scripted dependency-management/*; scripted source-dependencies/* project/*"
+            ;;
+          5)
+            sbt -v "++$SCALA_213!; test;"
+            ;;
+          6)
+            # build from fresh IO, LM, and Zinc
+            BUILD_VERSION="1.5.0-SNAPSHOT"
+            cd io
+            sbt -v -Dsbt.build.version=${BUILD_VERSION} +publishLocal
+            cd ../
+            sbt -Dsbtlm.path=$HOME/work/sbt/sbt/librarymanagement -Dsbtzinc.path=$HOME/work/sbt/sbt/zinc -Dsbt.build.version=$BUILD_VERSION -Dsbt.build.fatal=false "+lowerUtils/publishLocal; {librarymanagement}/publishLocal; {zinc}/publishLocal; upperModules/publishLocal"
+            rm -r $(find $HOME/.sbt/boot -name "*-SNAPSHOT") || true
+            sbt -v -Dsbt.version=$BUILD_VERSION "++$SCALA_213; $UTIL_TESTS; ++$SCALA_212; $UTIL_TESTS; scripted actions/* source-dependencies/*1of3 dependency-management/*1of4 java/*"
+            ;;
+          *)
+            echo unknown jobtype
+            exit 1
+        esac
+        rm -rf "$HOME/.sbt/scripted/" || true
+        rm -rf "$HOME/.ivy2/local" || true
+        rm -r $(find $HOME/.sbt/boot -name "*-SNAPSHOT") || true
+        find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
+        find $HOME/.ivy2/cache                       -name "ivydata-*.properties" -delete || true
+        find $HOME/.cache/coursier/v1                -name "ivydata-*.properties" -delete || true
+        find $HOME/.sbt                              -name "*.lock"               -delete || true

.github/workflows/nightly.yml

@@ -0,0 +1,63 @@
+name: Nightly
+on:
+  schedule:
+    # 08:00 UTC = 03:00 EST
+    - cron:  '0 8 * * *'
+
+jobs:
+  deploy:
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            java: 8
+    runs-on: ${{ matrix.os }}
+    env:
+      JAVA_OPTS: -Xms800M -Xmx800M -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
+    steps:
+    - name: Checkout sbt/sbt
+      uses: actions/checkout@v2
+    - name: Checkout sbt/io
+      uses: actions/checkout@v2
+      with:
+        repository: sbt/io
+        ref: develop
+        path: io
+    - name: Checkout sbt/librarymanagement
+      uses: actions/checkout@v2
+      with:
+        repository: sbt/librarymanagement
+        ref: develop
+        path: librarymanagement
+    - name: Checkout sbt/zinc
+      uses: actions/checkout@v2
+      with:
+        repository: sbt/zinc
+        ref: develop
+        path: zinc
+    - name: Setup
+      uses: olafurpg/setup-scala@v10
+      with:
+        java-version: "adopt@1.${{ matrix.java }}"
+    - name: Coursier cache
+      uses: coursier/cache-action@v6
+    - name: Build and deploy
+      run: |
+        # build from fresh IO, LM, and Zinc
+        TIMESTAMP=$(TZ=UTC date +%Y%m%dT%H%M%S)
+        export BUILD_VERSION="1.5.0-bin-${TIMESTAMP}"
+        cd io
+        sbt -v +publish
+        cd ../
+        sbt -Dsbtlm.path=$HOME/work/sbt/sbt/librarymanagement -Dsbtzinc.path=$HOME/work/sbt/sbt/zinc -Dsbt.build.fatal=false "+lowerUtils/publish; {librarymanagement}/publish; {zinc}/publish; upperModules/publish; bundledLauncherProj/publish"
+        rm -rf "$HOME/.ivy2/local" || true
+        rm -r $(find $HOME/.sbt/boot -name "*-SNAPSHOT") || true
+        find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
+        find $HOME/.ivy2/cache                       -name "ivydata-*.properties" -delete || true
+        find $HOME/.cache/coursier/v1                -name "ivydata-*.properties" -delete || true
+        find $HOME/.sbt                              -name "*.lock"               -delete || true
+      env:
+        BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
+        BINTRAY_PASS: ${{ secrets.BINTRAY_PASS }}
+        BINTRAY_REPOSITORY: maven-snapshots
+        BINTRAY_PACKAGE: sbt