Merge branch 'master' of 'topic/sbt1'

Author: allanrenucci

.drone.yml

@@ -1,69 +1,62 @@
-# We override the default clone step to workaround a bug with GitHub (see #3415)
 clone:
+  git:
+    image: plugins/git
+    # We clone submodules ourselves
+    recursive: false
+
+pipeline:
+  # We add a custom clone step to workaround a bug with GitHub (see #3415)
+  # and speed up cloning submodules
   clone:
     image: plugins/git
     commands:
-      - sleep 5s
-      - git init
-      - git remote add origin $DRONE_REMOTE_URL
-      - git fetch --no-tags origin $DRONE_COMMIT_REF
-      - if [ $DRONE_BUILD_EVENT = "push" ]; then git reset --hard -q $DRONE_COMMIT_SHA; else git checkout -qf FETCH_HEAD; fi
-      - git submodule update --init --recursive
+      - ./project/scripts/ci-clone
 
-pipeline:
   # TESTS:
   # We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
   test_legacy:
     group: test
-    image: lampepfl/dotty:2017-10-20
+    image: lampepfl/dotty:2018-01-17
     commands:
       - cp -R . /tmp/0/ && cd /tmp/0/
       - ./project/scripts/sbt legacyTests
 
   test:
     group: test
-    image: lampepfl/dotty:2017-10-20
+    image: lampepfl/dotty:2018-01-17
     commands:
       - cp -R . /tmp/1/ && cd /tmp/1/
-      - ./project/scripts/sbt ";compile ;testAll ;dotty-bench/jmh:run 1 1 tests/pos/alias.scala"
+      - ./project/scripts/sbt ";compile ;test"
+      - ./project/scripts/sbtTests
 
   test_bootstrapped:
     group: test
-    image: lampepfl/dotty:2017-10-20
+    image: lampepfl/dotty:2018-01-17
     commands:
       - cp -R . /tmp/2/ && cd /tmp/2/
-      - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/testAll ;dotty-bench-bootstrapped/jmh:run 1 1 tests/pos/alias.scala"
+      - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
+      - ./project/scripts/sbtBootstrappedTests
 
   test_optimised:
     group: test
-    image: lampepfl/dotty:2017-10-20
+    image: lampepfl/dotty:2018-01-17
     commands:
       - cp -R . /tmp/3/ && cd /tmp/3/
-      - ./project/scripts/sbt dotty-optimised/testAll
+      - ./project/scripts/sbt dotty-optimised/test
 
-  test_sbt_1of2:
+  test_sbt:
     group: test
-    image: lampepfl/dotty:2017-10-20
+    image: lampepfl/dotty:2018-01-17
     commands:
       - cp -R . /tmp/4/ && cd /tmp/4/
-      - ./project/scripts/sbt "sbt-dotty/scripted compilerReporter/* discovery/* sbt-dotty/* source-dependencies/*1of2"
-    # when:
-      # sbt scripted tests are slow and don't run on PRs
-      # event: [ push, tag, deployment ]
-
-  test_sbt_2of2:
-    group: test
-    image: lampepfl/dotty:2017-10-20
-    commands:
-      - cp -R . /tmp/5/ && cd /tmp/5/
-      - ./project/scripts/sbt "sbt-dotty/scripted source-dependencies/*2of2"
+      - ./project/scripts/sbt sbt-dotty/scripted
     # when:
       # sbt scripted tests are slow and don't run on PRs
       # event: [ push, tag, deployment ]
 
   # DOCUMENTATION:
   documentation:
-    image: lampepfl/dotty:2017-10-20
+    image: lampepfl/dotty:2018-01-17
     commands:
       - ./project/scripts/genDocs
     secrets: [ bot_pass ]
@@ -75,29 +68,25 @@ pipeline:
   # PUBLISHING:
   # Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
   publish_nightly:
-    image: lampepfl/dotty:2017-10-20
+    image: lampepfl/dotty:2018-01-17
     environment:
       - NIGHTLYBUILD=yes
     commands:
       - ./project/scripts/sbtPublish ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
-    volumes:
-      - /home/drone/keys:/keys
-    secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
+    secrets: [ sonatype_user, sonatype_pw, pgp_pw, pgp_secret ]
     when:
       event: deployment
       environment: nightly
 
   publish_release:
-    image: lampepfl/dotty:2017-10-20
+    image: lampepfl/dotty:2018-01-17
     environment:
       - RELEASEBUILD=yes
     commands:
       # Produces dotty-version.{tar.gz, zip}
       - ./project/scripts/sbt dist-bootstrapped/packArchive
       - ./project/scripts/sbtPublish ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
-    volumes:
-      - /home/drone/keys:/keys
-    secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
+    secrets: [ sonatype_user, sonatype_pw, pgp_pw, pgp_secret ]
     when:
       event: tag
 
@@ -114,14 +103,12 @@ pipeline:
       event: tag
 
   publish_sbt_release:
-    image: lampepfl/dotty:2017-10-20
+    image: lampepfl/dotty:2018-01-17
     environment:
       - RELEASEBUILD=yes
     commands:
       - ./project/scripts/sbtPublish ";sbt-dotty/publishSigned ;sonatypeRelease"
-    volumes:
-      - /home/drone/keys:/keys
-    secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
+    secrets: [ sonatype_user, sonatype_pw, pgp_pw, pgp_secret ]
     when:
       event: deployment
       environment: sbt_release

.gitignore

@@ -71,3 +71,5 @@ compiler/test/debug/Gen.jar
 compiler/before-pickling.txt
 compiler/after-pickling.txt
 *.dotty-ide-version
+
+*.decompiled.out

.gitmodules

@@ -5,7 +5,7 @@
 [submodule "scala2-library"]
 	path = scala2-library
 	url = https://github.com/lampepfl/scala.git
-	branch = dotty-library
+	branch = dotty-library2.12
 [submodule "collection-strawman"]
 	path = collection-strawman
 	url = https://github.com/scala/collection-strawman.git

CONTRIBUTING.md

@@ -9,7 +9,6 @@ This is the process for committing code to the Scala project. There are of cours
 1. Make sure you have signed the [Scala CLA](http://typesafe.com/contribute/cla/scala), if not, sign it.
 2. Before starting to work on a feature or a fix, it's good practice to ensure that:
     1. There is a ticket for your work in the project's [issue tracker](https://github.com/lampepfl/dotty/issues);
-    2. If not, create it first (perhaps given a thumbs up from the dotty-internals mailing list first);
     2. The ticket has been discussed and prioritized by the team.
 3. You should always perform your work in its own Git branch. The branch should be given a descriptive name that explains its intent. Some teams also like adding the ticket number and/or the [GitHub](http://github.com) user ID to the branch name, these details is up to each of the individual teams. (See below for more details on branch naming.)
 4. When the feature or fix is completed you should open a [Pull Request](https://help.github.com/articles/using-pull-requests) on GitHub.

README.md

@@ -7,8 +7,6 @@ Community build: [![Community Build Status](https://travis-ci.org/lampepfl/dotty
 
 * [Homepage](http://dotty.epfl.ch)
 * [Documentation](http://dotty.epfl.ch/docs)
-* [FAQ](http://dotty.epfl.ch/#why-dotty)
-* [Mailing list](https://groups.google.com/forum/#!forum/dotty-internals)
 
 Try it out
 ==========

bin/common

@@ -13,9 +13,9 @@ shift # Mutates $@ by deleting the first element ($1)
 version="$ROOT/dist-bootstrapped/target/pack/VERSION"
 
 # Create the target if absent or if file changed in ROOT/compiler
-new_files="$(find "$ROOT/compiler" \( -iname "*.scala" -o -iname "*.java" \) -newer "$version" >& /dev/null)"
+new_files="$(find "$ROOT/compiler" \( -iname "*.scala" -o -iname "*.java" \) -newer "$version" 2> /dev/null)"
 
-if [ ! -f "$target" ] || [ ! -z "$new_files" ]; then
+if [ ! -f "$version" ] || [ ! -z "$new_files" ]; then
   echo "Building Dotty..."
   sbt "dist-bootstrapped/pack"
 fi