Merge pull request #1 from lampepfl/master

Pull updates from base repo.

Author: Iltotore

.github/workflows/ci.yaml

@@ -0,0 +1,8 @@
+name: Scala CLA
+on: [pull_request]
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: ./project/scripts/check-cla.sh

.github/workflows/cla.yml

@@ -0,0 +1,4 @@
+[repositories]
+local
+my-ivy-proxy-releases: https://scala-webapps.epfl.ch/artifactory/sbt-plugin-releases/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]
+my-maven-proxy-releases: https://scala-webapps.epfl.ch/artifactory/central/

.github/workflows/repositories

@@ -0,0 +1,97 @@
+name: CI for Scala3doc
+
+on:
+  push:
+  pull_request:
+jobs:
+  build:
+    env:
+      AZURE_STORAGE_SAS_TOKEN: ${{ secrets.AZURE_STORAGE_SAS_TOKEN }}
+    runs-on: ubuntu-latest
+    if: "github.event_name == 'pull_request' || contains(github.event.ref, 'scala3doc') || contains(github.event.ref, 'master')"
+
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v2
+
+      - name: Cache Coursier
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/coursier
+          key: sbt-coursier-cache
+      - name: Cache SBT
+        uses: actions/cache@v1
+        with:
+          path: ~/.sbt
+          key: sbt-${{ hashFiles('**/build.sbt') }}
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Compile and test
+        run: ./project/scripts/sbt scala3doc/test
+
+      - name: Locally publish self
+        run: ./project/scripts/sbt scala3doc/publishLocal
+
+      - name: Generate self documentation
+        run: ./project/scripts/sbt scala3doc/generateSelfDocumentation
+
+      - name: Generate testcases documentation
+        run: ./project/scripts/sbt scala3doc/generateTestcasesDocumentation
+
+      - name: Generate Scala 3 documentation
+        run: ./project/scripts/sbt scala3doc/generateScala3Documentation
+
+      - name: Generate documentation for example project using dotty-sbt
+        run: ./project/scripts/sbt "sbt-dotty/scripted sbt-dotty/scala3doc"
+
+      - name: Generate index file
+        run: scala3doc/scripts/mk-index.sh scala3doc/output > scala3doc/output/index.html
+
+      - name: Upload documentation to server
+        uses: azure/CLI@v1
+        if: env.AZURE_STORAGE_SAS_TOKEN
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        with:
+          inlineScript: |
+            DOC_DEST=pr-${PR_NUMBER:-${GITHUB_REF##*/}}
+            echo uplading docs to https://scala3doc.virtuslab.com/$DOC_DEST
+            az storage container create --name $DOC_DEST --account-name scala3docstorage --public-access container
+            az storage blob sync -s scala3doc/output -c $DOC_DEST --account-name scala3docstorage
+
+  community-docs:
+    env:
+      AZURE_STORAGE_SAS_TOKEN: ${{ secrets.AZURE_STORAGE_SAS_TOKEN }}
+    runs-on: ubuntu-latest
+    if: "github.event_name == 'pull_request' || contains(github.event.ref, 'scala3doc') || contains(github.event.ref, 'master')"
+
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+
+      - name: Init submodules
+        run: git submodule update --init --recursive --jobs 7
+
+      - name: Generate docs
+        run: ./project/scripts/sbt "community-build/run doc all docsOutput"
+
+      - name: Upload documentation to server
+        uses: azure/CLI@v1
+        if: env.AZURE_STORAGE_SAS_TOKEN
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        with:
+          inlineScript: |
+            DOC_DEST=pr-${PR_NUMBER:-${GITHUB_REF##*/}}-docs
+            echo uplading docs to https://scala3doc.virtuslab.com/$DOC_DEST
+            az storage container create --name $DOC_DEST --account-name scala3docstorage --public-access container
+            az storage blob sync -s community-build/docsOutput -c $DOC_DEST --account-name scala3docstorage

.github/workflows/scala3doc.yaml

@@ -1,7 +1,6 @@
 *.DS_Store
 *.class
 *.tasty
-*.hasTasty
 *.log
 *.swp
 *~
@@ -24,12 +23,12 @@ local.sbt
 # npm
 node_modules
 
-# VS Code 
+# VS Code
 .vscode/
 # Metals
 .bloop/
 .metals/
-project/metals.sbt
+metals.sbt
 
 # Scala-IDE specific
 .scala_dependencies
@@ -82,8 +81,13 @@ bench/compile.txt
 # The vscode app for testing
 vscode-dotty/.vscode-test
 
-community-build/dotty-bootstrapped.version
+community-build/scala3-bootstrapped.version
 community-build/sbt-dotty-sbt
+community-build/sbt-scalajs-sbt
 
 # Vulpix output files
 *.check.out
+!/dist/bin/
+
+# Bloop
+.bsp

.gitignore

@@ -13,12 +13,6 @@
 [submodule "community-build/community-projects/scalatest"]
 	path = community-build/community-projects/scalatest
 	url = https://github.com/dotty-staging/scalatest
-[submodule "community-build/community-projects/scopt"]
-	path = community-build/community-projects/scopt
-	url = https://github.com/dotty-staging/scopt
-[submodule "community-build/community-projects/squants"]
-	path = community-build/community-projects/squants
-	url = https://github.com/dotty-staging/squants
 [submodule "community-build/community-projects/scalap"]
 	path = community-build/community-projects/scalap
 	url = https://github.com/dotty-staging/scala
@@ -67,7 +61,7 @@
 	url = https://github.com/dotty-staging/upickle.git
 [submodule "community-build/community-projects/sconfig"]
 	path = community-build/community-projects/sconfig
-	url = https://github.com/ekrich/sconfig.git
+	url = https://github.com/dotty-staging/sconfig.git
 [submodule "community-build/community-projects/zio"]
 	path = community-build/community-projects/zio
 	url = https://github.com/dotty-staging/zio.git
@@ -95,8 +89,88 @@
 	path = community-build/community-projects/scalaz
 	url = https://github.com/dotty-staging/scalaz.git
 [submodule "community-build/community-projects/endpoints"]
-	path = community-build/community-projects/endpoints
+	path = community-build/community-projects/endpoints4s
 	url = https://github.com/dotty-staging/endpoints.git
 [submodule "community-build/community-projects/scas"]
 	path = community-build/community-projects/scas
 	url = https://github.com/dotty-staging/scas.git
+[submodule "community-build/community-projects/fansi"]
+	path = community-build/community-projects/fansi
+	url = https://github.com/dotty-staging/fansi.git
+[submodule "community-build/community-projects/PPrint"]
+	path = community-build/community-projects/PPrint
+	url = https://github.com/dotty-staging/PPrint.git
+[submodule "community-build/community-projects/requests-scala"]
+	path = community-build/community-projects/requests-scala
+	url = https://github.com/dotty-staging/requests-scala.git
+[submodule "community-build/community-projects/cats-effect-2"]
+	path = community-build/community-projects/cats-effect-2
+	url = https://github.com/dotty-staging/cats-effect.git
+	branch = series/2.x
+[submodule "community-build/community-projects/cats-effect-3"]
+	path = community-build/community-projects/cats-effect-3
+	url = https://github.com/dotty-staging/cats-effect.git
+	branch = series/3.x
+[submodule "community-build/community-projects/scala-parallel-collections"]
+	path = community-build/community-projects/scala-parallel-collections
+	url = https://github.com/dotty-staging/scala-parallel-collections.git
+[submodule "community-build/community-projects/scala-collection-compat"]
+	path = community-build/community-projects/scala-collection-compat
+	url = https://github.com/dotty-staging/scala-collection-compat.git
+[submodule "community-build/community-projects/verify"]
+	path = community-build/community-projects/verify
+	url = https://github.com/dotty-staging/nanotest-strawman.git
+[submodule "community-build/community-projects/discipline"]
+	path = community-build/community-projects/discipline
+	url = https://github.com/dotty-staging/discipline.git
+[submodule "community-build/community-projects/discipline-munit"]
+	path = community-build/community-projects/discipline-munit
+	url = https://github.com/dotty-staging/discipline-munit.git
+[submodule "community-build/community-projects/discipline-specs2"]
+	path = community-build/community-projects/discipline-specs2
+	url = https://github.com/dotty-staging/discipline-specs2.git
+[submodule "community-build/community-projects/simulacrum-scalafix"]
+	path = community-build/community-projects/simulacrum-scalafix
+	url = https://github.com/dotty-staging/simulacrum-scalafix.git
+[submodule "community-build/community-projects/cats"]
+	path = community-build/community-projects/cats
+	url = https://github.com/dotty-staging/cats.git
+[submodule "community-build/community-projects/cats-mtl"]
+	path = community-build/community-projects/cats-mtl
+	url = https://github.com/dotty-staging/cats-mtl.git
+[submodule "community-build/community-projects/coop"]
+	path = community-build/community-projects/coop
+	url = https://github.com/dotty-staging/coop.git
+[submodule "community-build/community-projects/AsyncFile"]
+	path = community-build/community-projects/AsyncFile
+	url = https://github.com/dotty-staging/AsyncFile.git
+[submodule "community-build/community-projects/Equal"]
+	path = community-build/community-projects/Equal
+	url = https://github.com/dotty-staging/Equal.git
+[submodule "community-build/community-projects/FingerTree"]
+	path = community-build/community-projects/FingerTree
+	url = https://github.com/dotty-staging/FingerTree.git
+[submodule "community-build/community-projects/Log"]
+	path = community-build/community-projects/Log
+	url = https://github.com/dotty-staging/Log.git
+[submodule "community-build/community-projects/Model"]
+	path = community-build/community-projects/Model
+	url = https://github.com/dotty-staging/Model.git
+[submodule "community-build/community-projects/Numbers"]
+	path = community-build/community-projects/Numbers
+	url = https://github.com/dotty-staging/Numbers.git
+[submodule "community-build/community-projects/Serial"]
+	path = community-build/community-projects/Serial
+	url = https://github.com/dotty-staging/Serial.git
+[submodule "community-build/community-projects/Span"]
+	path = community-build/community-projects/Span
+	url = https://github.com/dotty-staging/Span.git
+[submodule "community-build/community-projects/Lucre"]
+	path = community-build/community-projects/Lucre
+	url = https://github.com/dotty-staging/Lucre.git
+[submodule "community-build/community-projects/scala-stm"]
+	path = community-build/community-projects/scala-stm
+	url = https://github.com/dotty-staging/scala-stm.git
+[submodule "community-build/community-projects/scalatestplus-junit"]
+	path = community-build/community-projects/scalatestplus-junit
+	url = https://github.com/dotty-staging/scalatestplus-junit.git

.gitmodules

@@ -1,4 +1,5 @@
 -Xss1m
 -Xms512m
--Xmx1200m
+-Xmx4096m
 -XX:MaxInlineLevel=35
+-XX:ReservedCodeCacheSize=512m

.jvmopts

@@ -7,7 +7,7 @@
 
   "search.exclude": {
     "**/*.class": true,
-    "**/*.hasTasty": true,
+    "**/*.tasty": true,
     "**/target/": true,
     "community-build/community-projects": true
   }

.vscode-template/settings.json

@@ -17,6 +17,8 @@ import scala.collection.JavaConverters._
 import scala.io.Source
 import scala.util.Using
 
+import dotty.tools.io.AbstractFile
+
 object Bench {
   val COMPILE_OPTS_FILE = "compile.txt"
 
@@ -93,16 +95,16 @@ class CompilerOptions {
 
 class Worker extends Driver {
   // override to avoid printing summary information
-  override  def doCompile(compiler: Compiler, fileNames: List[String])(implicit ctx: Context): Reporter =
-    if (fileNames.nonEmpty)
+  override  def doCompile(compiler: Compiler, files: List[AbstractFile])(implicit ctx: Context): Reporter =
+    if (files.nonEmpty)
       try {
         val run = compiler.newRun
-        run.compile(fileNames)
+        run.compile(files)
         ctx.reporter
       }
       catch {
         case ex: FatalError  =>
-          ctx.error(ex.getMessage) // signals that we should fail compilation.
+          report.error(ex.getMessage) // signals that we should fail compilation.
           ctx.reporter
       }
     else ctx.reporter

bench/src/main/scala/Benchmarks.scala

@@ -20,4 +20,4 @@ if [ ! -f "$version" ] || [ ! -z "$new_files" ]; then
   (cd $ROOT && sbt "dist/pack")
 fi
 
-eval "$target" "$@"
+"$target" "$@"

bin/common

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
+
+"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/scala" "$@"

bin/dotc

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
+
+"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/scalac" "$@"

bin/dotd

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
+
+"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/scalad" "$@"