Merge pull request #98 from typelevel/update-typesafe

Update fork from upstream repo

Author: folone

CONTRIBUTING.md

@@ -86,7 +86,7 @@ A pull request should consist of commits with messages that clearly state what p
 
 Commit logs should be stated in the active, present tense.
 
-A commit's subject should be 60 characters or less.  Overall, think of
+A commit's subject should be 72 characters or less.  Overall, think of
 the first line of the commit as a description of the action performed
 by the commit on the code base, so use the active voice and the
 present tense.  That also makes the commit subjects easy to reuse in
@@ -113,7 +113,7 @@ Our pull request bot, Scabot, automatically builds all the commits in a PR indiv
 
 Click on the little x next to a commit sha to go to the overview of the PR validation job. To diagnose a failure, consult the console output of the job that failed.
 
-See the [scala-jenkins-infra repo](https://github.com/scala/scala-jenkins-infra) and [Scabot repo](https://github.com/) for full details on PR validation.  One tip you should know is that commenting `/rebuild` on a PR asks validation to be run again on the same commits. This is only necessary when a spurious failure occurred.
+See the [scala-jenkins-infra repo](https://github.com/scala/scala-jenkins-infra) and [Scabot repo](https://github.com/scala/scabot) for full details on PR validation.  One tip you should know is that commenting `/rebuild` on a PR asks validation to be run again on the same commits. This is only necessary when a spurious failure occurred.
 
 ### Pass code review
 

README.md

@@ -43,5 +43,72 @@ scalaVersion := "2.11.3-typelevel"
 
 libraryDependencies += "org.scala-lang" % "scala-typelevel" % scalaVersion.value
 
-resolvers += Resolver.mavenLocal
+  - Run `ant init` to download some necessary jars.
+  - Import the project (in `src/eclipse`) via `File` → `Import Existing Projects into Workspace`. Check all projects and click ok.
+
+For important details on building, debugging and file encodings, please see [the excellent tutorial on scala-ide.org](http://scala-ide.org/docs/tutorials/scalac-trunk/index.html) and the included README.md in src/eclipse.
+
+### IntelliJ 14
+Use the latest IntelliJ IDEA release and install the Scala plugin from within the IDE.
+
+The following steps are required to use IntelliJ IDEA on Scala trunk
+ - Run `ant init`. This will download some JARs to `./build/deps`, which are included in IntelliJ's classpath.
+ - Run `./src/intellij/setup.sh`.
+ - Open `./src/intellij/scala.ipr` in IntelliJ.
+ - `File` → `Project Structure` → `Project` → `Project SDK`. Create an SDK entry named "1.6" containing the Java 1.6 SDK.
+   (You may use a later SDK for local development, but the CI will verify against Java 6.)
+
+Compilation within IDEA is performed in `-Dlocker.skip=1` mode: the sources are built
+directly using the STARR compiler (which is downloaded from [the Central Repository](http://central.sonatype.org/), according to `starr.version` in `versions.properties`).
+
+## Building with sbt (EXPERIMENTAL)
+
+The experimental sbt-based build definition has arrived! Run `sbt package`
+to build the compiler. You can run `sbt test` to run unit (JUnit) tests.
+Use `sbt test/it:test` to run integration (partest) tests.
+
+We would like to migrate to sbt build as quickly as possible. If you would
+like to help please use the scala-internals mailing list to discuss your
+ideas and coordinate your effort with others.
+
+## Building with Ant
+
+NOTE: we are working on migrating the build to sbt.
+
+Run `ant build-opt` to build an optimized version of the compiler.
+Verify your build using `ant test-opt`.
+
+The Scala build system is based on Apache Ant. Most required pre-compiled
+libraries are part of the repository (in 'lib/'). The following however is
+assumed to be installed on the build machine: TODO
+
+### Ant Tips and tricks
+
+Here are some common commands. Most ant targets offer a `-opt` variant that runs under `-optimise` (CI runs the -optimize variant).
+
+Command                 | Description
+----------------------- | -----------
+`./pull-binary-libs.sh` | downloads all binary artifacts associated with this commit.
+`ant -p`                | prints out information about the commonly used ant targets.
+`ant` or `ant build`    | A quick compilation (to `build/quick`) of your changes using the locker compiler.
+`ant dist`              | builds a distribution in 'dists/latest'.
+`ant all.clean`         | removes all build files and all distributions.
+
+A typical debug cycle incrementally builds quick, then uses it to compile and run the file
+`sandbox/test.scala` as follows:
+
+  - `ant && build/quick/bin/scalac -d sandbox sandbox/test.scala && build/quick/bin/scala -cp sandbox Test`
+
+We typically alias `build/quick/bin/scalac -d sandbox` to `qsc` and `build/quick/bin/scala -cp sandbox` to `qs` in our shell.
+
+`ant test-opt` tests that your code is working and fit to be committed:
+
+  - Runs the test suite and bootstrapping test on quick.
+  - You can run the suite only (skipping strap) with `ant test.suite`.
+
+`ant docs` generates the HTML documentation for the library from the sources using the scaladoc tool in quick.
+Note: on most machines this requires more heap than is allocated by default.  You can adjust the parameters with `ANT_OPTS`. Example command line:
+
+```sh
+ANT_OPTS="-Xms512M -Xmx2048M -Xss1M -XX:MaxPermSize=128M" ant docs
 ```

build-ant-macros.xml

@@ -492,9 +492,9 @@
             <manifest>
               <attribute name="Manifest-Version" value="1.0"/>
               <attribute name="Bundle-Name" value="${@{project}.description} Sources"/>
-              <attribute name="Bundle-SymbolicName" value="org.scala-lang.${@{project}.package}${@{project}.name}${@{project}.namesuffix}.source"/>
+              <attribute name="Bundle-SymbolicName" value="org.typelevel.${@{project}.package}${@{project}.name}${@{project}.namesuffix}.source"/>
               <attribute name="Bundle-Version" value="${@{project}.version}"/>
-              <attribute name="Eclipse-SourceBundle" value="org.scala-lang.${@{project}.package}${@{project}.name}${@{project}.namesuffix};version=&quot;${@{project}.version}&quot;;roots:=&quot;.&quot;"/>
+              <attribute name="Eclipse-SourceBundle" value="org.typelevel.${@{project}.package}${@{project}.name}${@{project}.namesuffix};version=&quot;${@{project}.version}&quot;;roots:=&quot;.&quot;"/>
             </manifest>
           </jar>
         </then>
@@ -505,7 +505,7 @@
   <macrodef name="copy-bundle">
     <attribute name="project"/>
     <sequential>
-      <copy tofile="${dist.dir}/${@{project}.targetdir}/${@{project}.name}.jar" file="${build-osgi.dir}/org.scala-lang.${@{project}.package}${@{project}.name}.jar" overwrite="true"/>
+      <copy tofile="${dist.dir}/${@{project}.targetdir}/${@{project}.name}.jar" file="${build-osgi.dir}/org.typelevel.${@{project}.package}${@{project}.name}.jar" overwrite="true"/>
       <copy tofile="${dist.dir}/src/${@{project}.name}-src.jar" file="${@{project}.srcjar}" overwrite="true"/>
     </sequential>
   </macrodef>
@@ -516,7 +516,7 @@
       <local name="artifact-base"/>
       <property name="artifact-base" value="${dist.maven}/${@{project}.dir}${@{project}.name}/${@{project}.name}"/>
       <mkdir dir="${dist.maven}/${@{project}.dir}${@{project}.name}"/>
-      <copy tofile="${artifact-base}.jar" file="${build-osgi.dir}/org.scala-lang.${@{project}.package}${@{project}.name}${@{project}.namesuffix}.jar" overwrite="true"/>
+      <copy tofile="${artifact-base}.jar" file="${build-osgi.dir}/org.typelevel.${@{project}.package}${@{project}.name}${@{project}.namesuffix}.jar" overwrite="true"/>
       <copy tofile="${artifact-base}-src.jar" file="${build-osgi.dir}/${@{project}.name}-src.jar" overwrite="true"/>
       <copy tofile="${artifact-base}-pom.xml" file="${src.dir}/build/maven/${@{project}.dir}/${@{project}.name}-pom.xml" overwrite="true"/>
       <if>

build.sbt

@@ -67,7 +67,7 @@ val credentialsSetting = credentials += {
   }
 }
 
-val bootstrapScalaVersion = "2.11.5"
+val bootstrapScalaVersion = versionProps("starr.version")
 
 def withoutScalaLang(moduleId: ModuleID): ModuleID = moduleId exclude("org.scala-lang", "*")
 
@@ -81,7 +81,7 @@ val junitIntefaceDep = "com.novocode" % "junit-interface" % "0.11" % "test"
 val asmDep = "org.scala-lang.modules" % "scala-asm" % versionProps("scala-asm.version")
 val jlineDep = "jline" % "jline" % versionProps("jline.version")
 val antDep = "org.apache.ant" % "ant" % "1.9.4"
-val scalacheckDep = withoutScalaLang("org.scalacheck" %% "scalacheck" % "1.11.4")
+val scalacheckDep = withoutScalaLang("org.scalacheck" %% "scalacheck" % versionNumber("scalacheck") % "it")
 
 lazy val commonSettings = clearSourceAndResourceDirectories ++ Seq[Setting[_]](
   organization := "org.typelevel",

build.xml

@@ -507,6 +507,11 @@ TODO:
     </condition>
 
     <fail if="has.unsupported.jdk" message="JDK ${ant.java.version} is not supported by this build!"/>
+    <fail message="Ant 1.9+ required">
+      <condition>
+        <not><antversion atleast="1.9" /></not>
+      </condition>
+    </fail>
 
     <!-- Allow this to be overridden simply -->
     <property name="sbt.latest.version"    value="0.12.4"/>

docs/TODO

@@ -53,7 +53,7 @@
 
   The process is about the same for symbols in PolyTypes. The main
   difference is that type parameters may be referenced and thus we
-  need something like De Bruijn indicies to represent these
+  need something like De Bruijn indices to represent these
   references.
 
 

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=0.13.9

scripts/jobs/integrate/bootstrap

@@ -33,7 +33,7 @@
 #    - Set <MODULE>_VER to override the default, e.g. XML_VER="1.0.4".
 #    - The git revision is set to <MODULE>_REF="v$<MODULE>_VER". Make sure the tag exists (you can't override <MODULE>_REF).
 #
-#  - Otherwise (moduleVersioning has some other value): in this mode we use nightly version nubmers for modules.
+#  - Otherwise (moduleVersioning has some other value): in this mode we use nightly version numbers for modules.
 #    - By default the script sets all <MODULE>_REF to "HEAD", override to build a specific revision.
 #    - The <MODULE>_VER is set to a nightly version, for example "1.0.3-7-g14888a2-nightly" (you can't override <MODULE>_VER)
 
@@ -348,7 +348,7 @@ scalaVerToBinary() {
   #  - the suffix starts with "-bin": 2.12.0-bin-M1
   #  - the patch version is > 0     : 2.12.1-M1, 1.12.3-RC2, 2.12.1-sha-nightly, 2.12.2-SNAPSHOT
   #
-  # Othwersise, the binary version is the full version: 2.12.0-M1, 2.12.0-RC2, 2.12.0-sha-nightly, 2.12.0-SNAPSHOT
+  # Otherwise, the binary version is the full version: 2.12.0-M1, 2.12.0-RC2, 2.12.0-sha-nightly, 2.12.0-SNAPSHOT
   #
   # Adapted from sbt: https://github.com/sbt/sbt/blob/0.13.8/util/cross/src/main/input_sources/CrossVersionUtil.scala#L39
   #
@@ -564,7 +564,7 @@ bootstrap() {
 
   echo "### Bootstrapping Scala using locker"
 
-  # # TODO: close all open staging repos so that we can be reaonably sure the only open one we see after publishing below is ours
+  # # TODO: close all open staging repos so that we can be reasonably sure the only open one we see after publishing below is ours
   # # the ant call will create a new one
   #
   # Rebuild Scala with these modules so that all binary versions are consistent.

spec/01-lexical-syntax.md

@@ -443,7 +443,7 @@ multiLineChars  ::=  {[‘"’] [‘"’] charNoDoubleQuote} {‘"’}
 
 A multi-line string literal is a sequence of characters enclosed in
 triple quotes `""" ... """`. The sequence of characters is
-arbitrary, except that it may contain three or more consuctive quote characters
+arbitrary, except that it may contain three or more consecutive quote characters
 only at the very end. Characters
 must not necessarily be printable; newlines or other
 control characters are also permitted.  Unicode escapes work as everywhere else, but none

spec/05-classes-and-objects.md

@@ -631,7 +631,7 @@ class Outer {
 ```
 
 Here, accesses to the method `f` can appear anywhere within
-`OuterClass`, but not outside it. Accesses to method
+`Outer`, but not outside it. Accesses to method
 `g` can appear anywhere within the package
 `outerpkg.innerpkg`, as would be the case for
 package-private methods in Java. Finally, accesses to method

spec/06-expressions.md

@@ -1736,7 +1736,7 @@ so `scala.Any` is the type inferred for `a`.
 _Eta-expansion_ converts an expression of method type to an
 equivalent expression of function type. It proceeds in two steps.
 
-First, one identifes the maximal sub-expressions of $e$; let's
+First, one identifies the maximal sub-expressions of $e$; let's
 say these are $e_1 , \ldots , e_m$. For each of these, one creates a
 fresh name $x_i$. Let $e'$ be the expression resulting from
 replacing every maximal subexpression $e_i$ in $e$ by the

spec/07-implicits.md

@@ -84,7 +84,7 @@ The _parts_ of a type $T$ are:
 - if $T$ is an abstract type, the parts of its upper bound;
 - if $T$ denotes an implicit conversion to a type with a method with argument types $T_1 , \ldots , T_n$ and result type $U$,
   the union of the parts of $T_1 , \ldots , T_n$ and $U$;
-- the parts of quantified (existential or univeral) and annotated types are defined as the parts of the underlying types (e.g., the parts of `T forSome { ... }` are the parts of `T`);
+- the parts of quantified (existential or universal) and annotated types are defined as the parts of the underlying types (e.g., the parts of `T forSome { ... }` are the parts of `T`);
 - in all other cases, just $T$ itself.
 
 Note that packages are internally represented as classes with companion modules to hold the package members.

spec/12-the-scala-standard-library.md

@@ -171,7 +171,7 @@ Any numeric value type $T$ supports the following methods.
     evaluated by converting the receiver and its argument to their
     operation type and performing the given arithmetic operation of that
     type.
-  * Parameterless arithmethic methods identity (`+`) and negation
+  * Parameterless arithmetic methods identity (`+`) and negation
     (`-`), with result type $T$.  The first of these returns the
     receiver unchanged, whereas the second returns its negation.
   * Conversion methods `toByte`, `toShort`, `toChar`,
@@ -194,7 +194,7 @@ Integer numeric value types support in addition the following operations:
     operation of that type.
 
   * A parameterless bit-negation method (`~`). Its result type is
-    the reciver type $T$ or `Int`, whichever is larger.
+    the receiver type $T$ or `Int`, whichever is larger.
     The operation is evaluated by converting the receiver to the result
     type and negating every bit in its value.
   * Bit-shift methods left-shift (`<<`), arithmetic right-shift
@@ -745,7 +745,7 @@ object Predef {
   def readf2(format: String) = Console.readf2(format)
   def readf3(format: String) = Console.readf3(format)
 
-  // Implict conversions ------------------------------------------------
+  // Implicit conversions ------------------------------------------------
 
   ...
 }

spec/15-changelog.md

@@ -31,7 +31,7 @@ formal parameter types. Added section on
 [numeric widening](06-expressions.html#numeric-widening) to support
 weak conformance.
 
-Tightened rules to avoid accidential [overrides](05-classes-and-objects.html#overriding).
+Tightened rules to avoid accidental [overrides](05-classes-and-objects.html#overriding).
 
 Removed class literals.
 
@@ -53,7 +53,7 @@ has been brought in line with. From now on `+=`, has the same precedence as `=`.
 
 #### Wildcards as function parameters
 
-A formal parameter to an anonymous fucntion may now be a
+A formal parameter to an anonymous function may now be a
 [wildcard represented by an underscore](06-expressions.html#placeholder-syntax-for-anonymous-functions).
 
 >      _ => 7   // The function that ignores its argument

src/actors/scala/actors/Future.scala

@@ -12,7 +12,7 @@ package scala.actors
 import scala.actors.scheduler.DaemonScheduler
 import scala.concurrent.SyncVar
 
-/** A function of arity 0, returing a value of type `T` that,
+/** A function of arity 0, returning a value of type `T` that,
  *  when applied, blocks the current actor (`Actor.self`)
  *  until the future's value is available.
  *

src/build/bnd/scala-actors.bnd

@@ -1,5 +1,5 @@
 Bundle-Name: Scala Actors
-Bundle-SymbolicName: org.scala-lang.scala-actors
+Bundle-SymbolicName: org.typelevel.scala-actors
 ver: @VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}

src/build/bnd/scala-compiler-doc.bnd

@@ -1,5 +1,5 @@
 Bundle-Name: Scala Documentation Generator
-Bundle-SymbolicName: org.scala-lang.modules.scala-compiler-doc_@SCALA_BINARY_VERSION@
+Bundle-SymbolicName: org.typelevel.modules.scala-compiler-doc_@SCALA_BINARY_VERSION@
 ver: @SCALA_COMPILER_DOC_VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}

src/build/bnd/scala-compiler-interactive.bnd

@@ -1,5 +1,5 @@
 Bundle-Name: Scala Interactive Compiler
-Bundle-SymbolicName: org.scala-lang.modules.scala-compiler-interactive_@SCALA_BINARY_VERSION@
+Bundle-SymbolicName: org.typelevel.modules.scala-compiler-interactive_@SCALA_BINARY_VERSION@
 ver: @SCALA_COMPILER_INTERACTIVE_VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}

src/build/bnd/scala-compiler.bnd

@@ -1,5 +1,5 @@
 Bundle-Name: Scala Compiler
-Bundle-SymbolicName: org.scala-lang.scala-compiler
+Bundle-SymbolicName: org.typelevel.scala-compiler
 ver: @VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}

src/build/bnd/scala-continuations-library.bnd

@@ -1,5 +1,5 @@
 Bundle-Name: Scala Delimited Continuations Library
-Bundle-SymbolicName: org.scala-lang.plugins.scala-continuations-library
+Bundle-SymbolicName: org.typelevel.plugins.scala-continuations-library
 ver: @CONTINUATIONS_LIBRARY_VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}

src/build/bnd/scala-continuations-plugin.bnd

@@ -1,5 +1,5 @@
 Bundle-Name: Scala Delimited Continuations Compiler Plugin
-Bundle-SymbolicName: org.scala-lang.plugins.scala-continuations-plugin
+Bundle-SymbolicName: org.typelevel.plugins.scala-continuations-plugin
 ver: @CONTINUATIONS_PLUGIN_VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}

src/build/bnd/scala-library.bnd

@@ -1,5 +1,5 @@
 Bundle-Name: Scala Standard Library
-Bundle-SymbolicName: org.scala-lang.scala-library
+Bundle-SymbolicName: org.typelevel.scala-library
 ver: @VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}

src/build/bnd/scala-reflect.bnd

@@ -1,5 +1,5 @@
 Bundle-Name: Scala Reflect
-Bundle-SymbolicName: org.scala-lang.scala-reflect
+Bundle-SymbolicName: org.typelevel.scala-reflect
 ver: @VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}

src/build/bnd/scala-typelevel.bnd

@@ -1,5 +1,5 @@
 Bundle-Name: Scala Typelevel Library
-Bundle-SymbolicName: org.scala-lang.scala-typelevel
+Bundle-SymbolicName: org.typelevel.scala-typelevel
 ver: @VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}

src/build/maven/scala-actors-pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.scala-lang</groupId>
+  <groupId>org.typelevel</groupId>
   <artifactId>scala-actors</artifactId>
   <packaging>jar</packaging>
   <version>@VERSION@</version>
@@ -33,7 +33,7 @@
   </properties>
   <dependencies>
     <dependency>
-      <groupId>org.scala-lang</groupId>
+      <groupId>org.typelevel</groupId>
       <artifactId>scala-library</artifactId>
       <version>@VERSION@</version>
     </dependency>

src/build/maven/scala-compiler-doc-pom.xml

@@ -30,7 +30,7 @@
   </issueManagement>
   <dependencies>
     <dependency>
-      <groupId>org.scala-lang</groupId>
+      <groupId>org.typelevel</groupId>
       <artifactId>scala-compiler</artifactId>
       <version>@VERSION@</version>
     </dependency>

src/build/maven/scala-compiler-interactive-pom.xml

@@ -30,7 +30,7 @@
   </issueManagement>
   <dependencies>
     <dependency>
-      <groupId>org.scala-lang</groupId>
+      <groupId>org.typelevel</groupId>
       <artifactId>scala-compiler</artifactId>
       <version>@VERSION@</version>
     </dependency>