separate lib from compiler

166 files changed, 43 insertions, 31 deletions

diff --git a/bin/common b/bin/common
index 8f4677330..0d7dc6150 100755
--- a/bin/common
+++ b/bin/common
@@ -74,6 +74,7 @@ function build_jar {
 function update_packages {
     echo "$INTERFACES_JAR" >  $DOTTY_ROOT/.packages
     echo "$MAIN_JAR"       >> $DOTTY_ROOT/.packages
+    echo "$DOTTY_LIB_JAR"  >> $DOTTY_ROOT/.packages
     echo "$TEST_JAR"       >> $DOTTY_ROOT/.packages
 }
 
@@ -84,10 +85,14 @@ function build_all {
     INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)
     printf "done\n"
 
-    printf "Building dotty..."
+    printf "Building dotty-compiler..."
     MAIN_JAR=$(build_jar package "target/scala-$SCALA_BINARY_VERSION")
     printf "done\n"
 
+    printf "Building dotty library..."
+    DOTTY_LIB_JAR=$(build_jar dotty-library/package "library/target/scala-$SCALA_BINARY_VERSION")
+    printf "done\n"
+
     printf "Building tests..."
     TEST_JAR=$(build_jar test:package "target/scala-$SCALA_BINARY_VERSION" '/dotty.*-tests\.jar/p')
     printf "done\n"
@@ -101,10 +106,11 @@ if  [ ! -f "$DOTTY_ROOT/.packages" ]; then
 else
     IFS=$'\r\n' GLOBIGNORE='*' command eval 'JARS=($(cat $DOTTY_ROOT/.packages))'
 
-    if [ "${#JARS[@]}" == "3" ]; then
+    if [ "${#JARS[@]}" == "4" ]; then
         INTERFACES_JAR="${JARS[0]}"
         MAIN_JAR="${JARS[1]}"
-        TEST_JAR="${JARS[2]}"
+        DOTTY_LIB_JAR="${JARS[2]}"
+        TEST_JAR="${JARS[3]}"
     else
         echo "Failed to parse .packages file"
         build_all
@@ -126,6 +132,7 @@ function check_jar {
 
 check_jar "dotty-interfaces" $INTERFACES_JAR "interfaces" 'INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)'
 check_jar "dotty"            $MAIN_JAR       "src"        'MAIN_JAR=$(build_jar package target/scala-$SCALA_BINARY_VERSION)'
+check_jar "dotty-library"    $DOTTY_LIB_JAR  "library"    'DOTTY_LIB_JAR=$(build_jar dotty-library/package library/target/scala-$SCALA_BINARY_VERSION)'
 check_jar "dotty-tests"      $TEST_JAR       "test"       'TEST_JAR=$(build_jar test:package target/scala-$SCALA_BINARY_VERSION /dotty.*-tests\.jar/p)'
 
 # Autodetecting the scala-library location, in case it wasn't provided by an environment variable
diff --git a/bin/dotc b/bin/dotc
index 3f529194c..57e97ba5c 100755
--- a/bin/dotc
+++ b/bin/dotc
@@ -115,12 +115,12 @@ trap onExit INT
 classpathArgs () {
   if [[ "true" == $bootstrapped ]]; then
     check_jar "dotty-bootstrapped" $DOTTY_JAR "target" 'build_jar "test:runMain dotc.build" target' &> /dev/null
-    toolchain="$DOTTY_JAR:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$SBT_INTERFACE_JAR"
+    toolchain="$DOTTY_JAR:$DOTTY_LIB_JAR:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$SBT_INTERFACE_JAR"
   else
-    toolchain="$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$SBT_INTERFACE_JAR"
+    toolchain="$SCALA_LIBRARY_JAR:$DOTTY_LIB_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$SBT_INTERFACE_JAR"
   fi
-  bcpJars="$INTERFACES_JAR:$MAIN_JAR"
-  cpJars="$INTERFACES_JAR:$MAIN_JAR:$TEST_JAR"
+  bcpJars="$INTERFACES_JAR:$MAIN_JAR:$DOTTY_LIB_JAR"
+  cpJars="$INTERFACES_JAR:$MAIN_JAR:$DOTTY_LIB_JAR:$TEST_JAR"
 
   if [[ -n "$cygwin" ]]; then
     if [[ "$OS" = "Windows_NT" ]] && cygpath -m .>/dev/null 2>/dev/null ; then
diff --git a/src/dotty/DottyPredef.scala b/library/src/dotty/DottyPredef.scala
index cd90c4882..cd90c4882 100644
--- a/src/dotty/DottyPredef.scala
+++ b/library/src/dotty/DottyPredef.scala
diff --git a/src/dotty/runtime/Arrays.scala b/library/src/dotty/runtime/Arrays.scala
index 9ec5512ad..9ec5512ad 100644
--- a/src/dotty/runtime/Arrays.scala
+++ b/library/src/dotty/runtime/Arrays.scala
diff --git a/src/dotty/runtime/LazyHolders.scala b/library/src/dotty/runtime/LazyHolders.scala
index 1e31cda66..1e31cda66 100644
--- a/src/dotty/runtime/LazyHolders.scala
+++ b/library/src/dotty/runtime/LazyHolders.scala
diff --git a/src/dotty/runtime/LazyVals.scala b/library/src/dotty/runtime/LazyVals.scala
index 4dea0d34d..4dea0d34d 100644
--- a/src/dotty/runtime/LazyVals.scala
+++ b/library/src/dotty/runtime/LazyVals.scala
diff --git a/src/dotty/runtime/LegacyApp.scala b/library/src/dotty/runtime/LegacyApp.scala
index 2c4b295d0..2c4b295d0 100644
--- a/src/dotty/runtime/LegacyApp.scala
+++ b/library/src/dotty/runtime/LegacyApp.scala
diff --git a/src/dotty/runtime/vc/VCPrototype.scala b/library/src/dotty/runtime/vc/VCPrototype.scala
index 212046ef8..212046ef8 100644
--- a/src/dotty/runtime/vc/VCPrototype.scala
+++ b/library/src/dotty/runtime/vc/VCPrototype.scala
diff --git a/src/scala/Eq.scala b/library/src/scala/Eq.scala
index d6d617cab..d6d617cab 100644
--- a/src/scala/Eq.scala
+++ b/library/src/scala/Eq.scala
diff --git a/src/scala/Function23.scala b/library/src/scala/Function23.scala
index 254772d53..254772d53 100644
--- a/src/scala/Function23.scala
+++ b/library/src/scala/Function23.scala
diff --git a/src/scala/Function24.scala b/library/src/scala/Function24.scala
index 8af8ed995..8af8ed995 100644
--- a/src/scala/Function24.scala
+++ b/library/src/scala/Function24.scala
diff --git a/src/scala/Function25.scala b/library/src/scala/Function25.scala
index 6df740b5b..6df740b5b 100644
--- a/src/scala/Function25.scala
+++ b/library/src/scala/Function25.scala
diff --git a/src/scala/Function26.scala b/library/src/scala/Function26.scala
index 5daccb6f0..5daccb6f0 100644
--- a/src/scala/Function26.scala
+++ b/library/src/scala/Function26.scala
diff --git a/src/scala/Function27.scala b/library/src/scala/Function27.scala
index daebd3ed4..daebd3ed4 100644
--- a/src/scala/Function27.scala
+++ b/library/src/scala/Function27.scala
diff --git a/src/scala/Function28.scala b/library/src/scala/Function28.scala
index 82912caea..82912caea 100644
--- a/src/scala/Function28.scala
+++ b/library/src/scala/Function28.scala
diff --git a/src/scala/Function29.scala b/library/src/scala/Function29.scala
index 6dabf2051..6dabf2051 100644
--- a/src/scala/Function29.scala
+++ b/library/src/scala/Function29.scala
diff --git a/src/scala/Function30.scala b/library/src/scala/Function30.scala
index 20fd970dd..20fd970dd 100644
--- a/src/scala/Function30.scala
+++ b/library/src/scala/Function30.scala
diff --git a/src/scala/Product0.scala b/library/src/scala/Product0.scala
index d50721d02..d50721d02 100644
--- a/src/scala/Product0.scala
+++ b/library/src/scala/Product0.scala
diff --git a/src/scala/annotation/internal/Alias.scala b/library/src/scala/annotation/internal/Alias.scala
index e3f56e70c..e3f56e70c 100644
--- a/src/scala/annotation/internal/Alias.scala
+++ b/library/src/scala/annotation/internal/Alias.scala
diff --git a/src/scala/annotation/internal/AnnotationDefault.scala b/library/src/scala/annotation/internal/AnnotationDefault.scala
index 5280d091c..5280d091c 100644
--- a/src/scala/annotation/internal/AnnotationDefault.scala
+++ b/library/src/scala/annotation/internal/AnnotationDefault.scala
diff --git a/src/scala/annotation/internal/Body.scala b/library/src/scala/annotation/internal/Body.scala
index b6aa0c0fb..b6aa0c0fb 100644
--- a/src/scala/annotation/internal/Body.scala
+++ b/library/src/scala/annotation/internal/Body.scala
diff --git a/src/scala/annotation/internal/Child.scala b/library/src/scala/annotation/internal/Child.scala
index c90871945..c90871945 100644
--- a/src/scala/annotation/internal/Child.scala
+++ b/library/src/scala/annotation/internal/Child.scala
diff --git a/src/scala/annotation/internal/InlineParam.scala b/library/src/scala/annotation/internal/InlineParam.scala
index 0b3649e89..0b3649e89 100644
--- a/src/scala/annotation/internal/InlineParam.scala
+++ b/library/src/scala/annotation/internal/InlineParam.scala
diff --git a/src/scala/annotation/internal/Repeated.scala b/library/src/scala/annotation/internal/Repeated.scala
index 75eb3bc25..75eb3bc25 100644
--- a/src/scala/annotation/internal/Repeated.scala
+++ b/library/src/scala/annotation/internal/Repeated.scala
diff --git a/src/scala/annotation/internal/SourceFile.scala b/library/src/scala/annotation/internal/SourceFile.scala
index b203869cf..b203869cf 100644
--- a/src/scala/annotation/internal/SourceFile.scala
+++ b/library/src/scala/annotation/internal/SourceFile.scala
diff --git a/src/scala/annotation/internal/TASTYLongSignature.java b/library/src/scala/annotation/internal/TASTYLongSignature.java
index 2278da258..2278da258 100644
--- a/src/scala/annotation/internal/TASTYLongSignature.java
+++ b/library/src/scala/annotation/internal/TASTYLongSignature.java
diff --git a/src/scala/annotation/internal/TASTYSignature.java b/library/src/scala/annotation/internal/TASTYSignature.java
index a6372f008..a6372f008 100644
--- a/src/scala/annotation/internal/TASTYSignature.java
+++ b/library/src/scala/annotation/internal/TASTYSignature.java
diff --git a/src/scala/annotation/internal/UnsafeNonvariant.scala b/library/src/scala/annotation/internal/UnsafeNonvariant.scala
index b33df65d6..b33df65d6 100644
--- a/src/scala/annotation/internal/UnsafeNonvariant.scala
+++ b/library/src/scala/annotation/internal/UnsafeNonvariant.scala
diff --git a/src/scala/annotation/static.scala b/library/src/scala/annotation/static.scala
index b00072b18..b00072b18 100644
--- a/src/scala/annotation/static.scala
+++ b/library/src/scala/annotation/static.scala
diff --git a/src/scala/compat/java8/JFunction.java b/library/src/scala/compat/java8/JFunction.java
index d68805d08..d68805d08 100644
--- a/src/scala/compat/java8/JFunction.java
+++ b/library/src/scala/compat/java8/JFunction.java
diff --git a/src/scala/compat/java8/JFunction0$mcB$sp.java b/library/src/scala/compat/java8/JFunction0$mcB$sp.java
index 354667b63..354667b63 100644
--- a/src/scala/compat/java8/JFunction0$mcB$sp.java
+++ b/library/src/scala/compat/java8/JFunction0$mcB$sp.java
diff --git a/src/scala/compat/java8/JFunction0$mcC$sp.java b/library/src/scala/compat/java8/JFunction0$mcC$sp.java
index 85c1d25e8..85c1d25e8 100644
--- a/src/scala/compat/java8/JFunction0$mcC$sp.java
+++ b/library/src/scala/compat/java8/JFunction0$mcC$sp.java
diff --git a/src/scala/compat/java8/JFunction0$mcD$sp.java b/library/src/scala/compat/java8/JFunction0$mcD$sp.java
index e430cddd7..e430cddd7 100644
--- a/src/scala/compat/java8/JFunction0$mcD$sp.java
+++ b/library/src/scala/compat/java8/JFunction0$mcD$sp.java
diff --git a/src/scala/compat/java8/JFunction0$mcF$sp.java b/library/src/scala/compat/java8/JFunction0$mcF$sp.java
index e839d1edf..e839d1edf 100644
--- a/src/scala/compat/java8/JFunction0$mcF$sp.java
+++ b/library/src/scala/compat/java8/JFunction0$mcF$sp.java
diff --git a/src/scala/compat/java8/JFunction0$mcI$sp.java b/library/src/scala/compat/java8/JFunction0$mcI$sp.java
index 6d592a41e..6d592a41e 100644
--- a/src/scala/compat/java8/JFunction0$mcI$sp.java
+++ b/library/src/scala/compat/java8/JFunction0$mcI$sp.java
diff --git a/src/scala/compat/java8/JFunction0$mcJ$sp.java b/library/src/scala/compat/java8/JFunction0$mcJ$sp.java
index 8347b0df1..8347b0df1 100644
--- a/src/scala/compat/java8/JFunction0$mcJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction0$mcJ$sp.java
diff --git a/src/scala/compat/java8/JFunction0$mcS$sp.java b/library/src/scala/compat/java8/JFunction0$mcS$sp.java
index dede12cf1..dede12cf1 100644
--- a/src/scala/compat/java8/JFunction0$mcS$sp.java
+++ b/library/src/scala/compat/java8/JFunction0$mcS$sp.java
diff --git a/src/scala/compat/java8/JFunction0$mcV$sp.java b/library/src/scala/compat/java8/JFunction0$mcV$sp.java
index 933c9a28a..933c9a28a 100644
--- a/src/scala/compat/java8/JFunction0$mcV$sp.java
+++ b/library/src/scala/compat/java8/JFunction0$mcV$sp.java
diff --git a/src/scala/compat/java8/JFunction0$mcZ$sp.java b/library/src/scala/compat/java8/JFunction0$mcZ$sp.java
index c51141b00..c51141b00 100644
--- a/src/scala/compat/java8/JFunction0$mcZ$sp.java
+++ b/library/src/scala/compat/java8/JFunction0$mcZ$sp.java
diff --git a/src/scala/compat/java8/JFunction0.java b/library/src/scala/compat/java8/JFunction0.java
index e1c6f364a..e1c6f364a 100644
--- a/src/scala/compat/java8/JFunction0.java
+++ b/library/src/scala/compat/java8/JFunction0.java
diff --git a/src/scala/compat/java8/JFunction1$mcDD$sp.java b/library/src/scala/compat/java8/JFunction1$mcDD$sp.java
index cccdd3a44..cccdd3a44 100644
--- a/src/scala/compat/java8/JFunction1$mcDD$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcDD$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcDF$sp.java b/library/src/scala/compat/java8/JFunction1$mcDF$sp.java
index 8c86f3585..8c86f3585 100644
--- a/src/scala/compat/java8/JFunction1$mcDF$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcDF$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcDI$sp.java b/library/src/scala/compat/java8/JFunction1$mcDI$sp.java
index 4b2cf185b..4b2cf185b 100644
--- a/src/scala/compat/java8/JFunction1$mcDI$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcDI$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcDJ$sp.java b/library/src/scala/compat/java8/JFunction1$mcDJ$sp.java
index 24deff2dc..24deff2dc 100644
--- a/src/scala/compat/java8/JFunction1$mcDJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcDJ$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcFD$sp.java b/library/src/scala/compat/java8/JFunction1$mcFD$sp.java
index 138120dbf..138120dbf 100644
--- a/src/scala/compat/java8/JFunction1$mcFD$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcFD$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcFF$sp.java b/library/src/scala/compat/java8/JFunction1$mcFF$sp.java
index ba6ef5e7e..ba6ef5e7e 100644
--- a/src/scala/compat/java8/JFunction1$mcFF$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcFF$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcFI$sp.java b/library/src/scala/compat/java8/JFunction1$mcFI$sp.java
index f37b26527..f37b26527 100644
--- a/src/scala/compat/java8/JFunction1$mcFI$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcFI$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcFJ$sp.java b/library/src/scala/compat/java8/JFunction1$mcFJ$sp.java
index fe697df45..fe697df45 100644
--- a/src/scala/compat/java8/JFunction1$mcFJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcFJ$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcID$sp.java b/library/src/scala/compat/java8/JFunction1$mcID$sp.java
index 4a8cae858..4a8cae858 100644
--- a/src/scala/compat/java8/JFunction1$mcID$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcID$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcIF$sp.java b/library/src/scala/compat/java8/JFunction1$mcIF$sp.java
index 38a262377..38a262377 100644
--- a/src/scala/compat/java8/JFunction1$mcIF$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcIF$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcII$sp.java b/library/src/scala/compat/java8/JFunction1$mcII$sp.java
index 14fce8afc..14fce8afc 100644
--- a/src/scala/compat/java8/JFunction1$mcII$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcII$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcIJ$sp.java b/library/src/scala/compat/java8/JFunction1$mcIJ$sp.java
index dd033736b..dd033736b 100644
--- a/src/scala/compat/java8/JFunction1$mcIJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcIJ$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcJD$sp.java b/library/src/scala/compat/java8/JFunction1$mcJD$sp.java
index 9a9e37fca..9a9e37fca 100644
--- a/src/scala/compat/java8/JFunction1$mcJD$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcJD$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcJF$sp.java b/library/src/scala/compat/java8/JFunction1$mcJF$sp.java
index 1dac4d5f2..1dac4d5f2 100644
--- a/src/scala/compat/java8/JFunction1$mcJF$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcJF$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcJI$sp.java b/library/src/scala/compat/java8/JFunction1$mcJI$sp.java
index a9dcc859d..a9dcc859d 100644
--- a/src/scala/compat/java8/JFunction1$mcJI$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcJI$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcJJ$sp.java b/library/src/scala/compat/java8/JFunction1$mcJJ$sp.java
index 8dfcdcd84..8dfcdcd84 100644
--- a/src/scala/compat/java8/JFunction1$mcJJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcJJ$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcVD$sp.java b/library/src/scala/compat/java8/JFunction1$mcVD$sp.java
index 9ebd8cb12..9ebd8cb12 100644
--- a/src/scala/compat/java8/JFunction1$mcVD$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcVD$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcVF$sp.java b/library/src/scala/compat/java8/JFunction1$mcVF$sp.java
index 663f16a10..663f16a10 100644
--- a/src/scala/compat/java8/JFunction1$mcVF$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcVF$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcVI$sp.java b/library/src/scala/compat/java8/JFunction1$mcVI$sp.java
index 657973eb1..657973eb1 100644
--- a/src/scala/compat/java8/JFunction1$mcVI$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcVI$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcVJ$sp.java b/library/src/scala/compat/java8/JFunction1$mcVJ$sp.java
index 123e8907f..123e8907f 100644
--- a/src/scala/compat/java8/JFunction1$mcVJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcVJ$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcZD$sp.java b/library/src/scala/compat/java8/JFunction1$mcZD$sp.java
index 6928c3742..6928c3742 100644
--- a/src/scala/compat/java8/JFunction1$mcZD$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcZD$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcZF$sp.java b/library/src/scala/compat/java8/JFunction1$mcZF$sp.java
index 2abc0a158..2abc0a158 100644
--- a/src/scala/compat/java8/JFunction1$mcZF$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcZF$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcZI$sp.java b/library/src/scala/compat/java8/JFunction1$mcZI$sp.java
index cdde336a4..cdde336a4 100644
--- a/src/scala/compat/java8/JFunction1$mcZI$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcZI$sp.java
diff --git a/src/scala/compat/java8/JFunction1$mcZJ$sp.java b/library/src/scala/compat/java8/JFunction1$mcZJ$sp.java
index ce784542e..ce784542e 100644
--- a/src/scala/compat/java8/JFunction1$mcZJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction1$mcZJ$sp.java
diff --git a/src/scala/compat/java8/JFunction1.java b/library/src/scala/compat/java8/JFunction1.java
index 69176cdea..69176cdea 100644
--- a/src/scala/compat/java8/JFunction1.java
+++ b/library/src/scala/compat/java8/JFunction1.java
diff --git a/src/scala/compat/java8/JFunction10.java b/library/src/scala/compat/java8/JFunction10.java
index 8519ac223..8519ac223 100644
--- a/src/scala/compat/java8/JFunction10.java
+++ b/library/src/scala/compat/java8/JFunction10.java
diff --git a/src/scala/compat/java8/JFunction11.java b/library/src/scala/compat/java8/JFunction11.java
index 032ee40af..032ee40af 100644
--- a/src/scala/compat/java8/JFunction11.java
+++ b/library/src/scala/compat/java8/JFunction11.java
diff --git a/src/scala/compat/java8/JFunction12.java b/library/src/scala/compat/java8/JFunction12.java
index 3f3eff492..3f3eff492 100644
--- a/src/scala/compat/java8/JFunction12.java
+++ b/library/src/scala/compat/java8/JFunction12.java
diff --git a/src/scala/compat/java8/JFunction13.java b/library/src/scala/compat/java8/JFunction13.java
index 2bed6ee97..2bed6ee97 100644
--- a/src/scala/compat/java8/JFunction13.java
+++ b/library/src/scala/compat/java8/JFunction13.java
diff --git a/src/scala/compat/java8/JFunction14.java b/library/src/scala/compat/java8/JFunction14.java
index 77fac237d..77fac237d 100644
--- a/src/scala/compat/java8/JFunction14.java
+++ b/library/src/scala/compat/java8/JFunction14.java
diff --git a/src/scala/compat/java8/JFunction15.java b/library/src/scala/compat/java8/JFunction15.java
index 25adc1679..25adc1679 100644
--- a/src/scala/compat/java8/JFunction15.java
+++ b/library/src/scala/compat/java8/JFunction15.java
diff --git a/src/scala/compat/java8/JFunction16.java b/library/src/scala/compat/java8/JFunction16.java
index fda1ea0c7..fda1ea0c7 100644
--- a/src/scala/compat/java8/JFunction16.java
+++ b/library/src/scala/compat/java8/JFunction16.java
diff --git a/src/scala/compat/java8/JFunction17.java b/library/src/scala/compat/java8/JFunction17.java
index 89cb1b312..89cb1b312 100644
--- a/src/scala/compat/java8/JFunction17.java
+++ b/library/src/scala/compat/java8/JFunction17.java
diff --git a/src/scala/compat/java8/JFunction18.java b/library/src/scala/compat/java8/JFunction18.java
index 428cee961..428cee961 100644
--- a/src/scala/compat/java8/JFunction18.java
+++ b/library/src/scala/compat/java8/JFunction18.java
diff --git a/src/scala/compat/java8/JFunction19.java b/library/src/scala/compat/java8/JFunction19.java
index 95e47df7e..95e47df7e 100644
--- a/src/scala/compat/java8/JFunction19.java
+++ b/library/src/scala/compat/java8/JFunction19.java
diff --git a/src/scala/compat/java8/JFunction2$mcDDD$sp.java b/library/src/scala/compat/java8/JFunction2$mcDDD$sp.java
index 2bb68e698..2bb68e698 100644
--- a/src/scala/compat/java8/JFunction2$mcDDD$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcDDD$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcDDI$sp.java b/library/src/scala/compat/java8/JFunction2$mcDDI$sp.java
index 61e4d1b17..61e4d1b17 100644
--- a/src/scala/compat/java8/JFunction2$mcDDI$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcDDI$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcDDJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcDDJ$sp.java
index aa8564960..aa8564960 100644
--- a/src/scala/compat/java8/JFunction2$mcDDJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcDDJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcDID$sp.java b/library/src/scala/compat/java8/JFunction2$mcDID$sp.java
index ba56c080c..ba56c080c 100644
--- a/src/scala/compat/java8/JFunction2$mcDID$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcDID$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcDII$sp.java b/library/src/scala/compat/java8/JFunction2$mcDII$sp.java
index ec7bc956b..ec7bc956b 100644
--- a/src/scala/compat/java8/JFunction2$mcDII$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcDII$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcDIJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcDIJ$sp.java
index 152e067e0..152e067e0 100644
--- a/src/scala/compat/java8/JFunction2$mcDIJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcDIJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcDJD$sp.java b/library/src/scala/compat/java8/JFunction2$mcDJD$sp.java
index 27b5b6567..27b5b6567 100644
--- a/src/scala/compat/java8/JFunction2$mcDJD$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcDJD$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcDJI$sp.java b/library/src/scala/compat/java8/JFunction2$mcDJI$sp.java
index c8130a78d..c8130a78d 100644
--- a/src/scala/compat/java8/JFunction2$mcDJI$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcDJI$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcDJJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcDJJ$sp.java
index 48705ca6f..48705ca6f 100644
--- a/src/scala/compat/java8/JFunction2$mcDJJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcDJJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcFDD$sp.java b/library/src/scala/compat/java8/JFunction2$mcFDD$sp.java
index b9d39f3cd..b9d39f3cd 100644
--- a/src/scala/compat/java8/JFunction2$mcFDD$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcFDD$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcFDI$sp.java b/library/src/scala/compat/java8/JFunction2$mcFDI$sp.java
index a1a887bfe..a1a887bfe 100644
--- a/src/scala/compat/java8/JFunction2$mcFDI$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcFDI$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcFDJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcFDJ$sp.java
index 2a864db0f..2a864db0f 100644
--- a/src/scala/compat/java8/JFunction2$mcFDJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcFDJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcFID$sp.java b/library/src/scala/compat/java8/JFunction2$mcFID$sp.java
index 502836254..502836254 100644
--- a/src/scala/compat/java8/JFunction2$mcFID$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcFID$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcFII$sp.java b/library/src/scala/compat/java8/JFunction2$mcFII$sp.java
index a9dded128..a9dded128 100644
--- a/src/scala/compat/java8/JFunction2$mcFII$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcFII$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcFIJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcFIJ$sp.java
index c3070f196..c3070f196 100644
--- a/src/scala/compat/java8/JFunction2$mcFIJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcFIJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcFJD$sp.java b/library/src/scala/compat/java8/JFunction2$mcFJD$sp.java
index 686b67468..686b67468 100644
--- a/src/scala/compat/java8/JFunction2$mcFJD$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcFJD$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcFJI$sp.java b/library/src/scala/compat/java8/JFunction2$mcFJI$sp.java
index bc8971fb1..bc8971fb1 100644
--- a/src/scala/compat/java8/JFunction2$mcFJI$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcFJI$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcFJJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcFJJ$sp.java
index 25d7057a6..25d7057a6 100644
--- a/src/scala/compat/java8/JFunction2$mcFJJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcFJJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcIDD$sp.java b/library/src/scala/compat/java8/JFunction2$mcIDD$sp.java
index 3fbec6839..3fbec6839 100644
--- a/src/scala/compat/java8/JFunction2$mcIDD$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcIDD$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcIDI$sp.java b/library/src/scala/compat/java8/JFunction2$mcIDI$sp.java
index 02ba78f56..02ba78f56 100644
--- a/src/scala/compat/java8/JFunction2$mcIDI$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcIDI$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcIDJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcIDJ$sp.java
index 1d954bb0b..1d954bb0b 100644
--- a/src/scala/compat/java8/JFunction2$mcIDJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcIDJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcIID$sp.java b/library/src/scala/compat/java8/JFunction2$mcIID$sp.java
index 473284a6b..473284a6b 100644
--- a/src/scala/compat/java8/JFunction2$mcIID$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcIID$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcIII$sp.java b/library/src/scala/compat/java8/JFunction2$mcIII$sp.java
index 61f5ac97a..61f5ac97a 100644
--- a/src/scala/compat/java8/JFunction2$mcIII$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcIII$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcIIJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcIIJ$sp.java
index 2091156ef..2091156ef 100644
--- a/src/scala/compat/java8/JFunction2$mcIIJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcIIJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcIJD$sp.java b/library/src/scala/compat/java8/JFunction2$mcIJD$sp.java
index 93473e694..93473e694 100644
--- a/src/scala/compat/java8/JFunction2$mcIJD$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcIJD$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcIJI$sp.java b/library/src/scala/compat/java8/JFunction2$mcIJI$sp.java
index 638dea436..638dea436 100644
--- a/src/scala/compat/java8/JFunction2$mcIJI$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcIJI$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcIJJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcIJJ$sp.java
index d90bbf8ed..d90bbf8ed 100644
--- a/src/scala/compat/java8/JFunction2$mcIJJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcIJJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcJDD$sp.java b/library/src/scala/compat/java8/JFunction2$mcJDD$sp.java
index 8116b017a..8116b017a 100644
--- a/src/scala/compat/java8/JFunction2$mcJDD$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcJDD$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcJDI$sp.java b/library/src/scala/compat/java8/JFunction2$mcJDI$sp.java
index bc72f4771..bc72f4771 100644
--- a/src/scala/compat/java8/JFunction2$mcJDI$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcJDI$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcJDJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcJDJ$sp.java
index 360ca0596..360ca0596 100644
--- a/src/scala/compat/java8/JFunction2$mcJDJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcJDJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcJID$sp.java b/library/src/scala/compat/java8/JFunction2$mcJID$sp.java
index d7257a43f..d7257a43f 100644
--- a/src/scala/compat/java8/JFunction2$mcJID$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcJID$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcJII$sp.java b/library/src/scala/compat/java8/JFunction2$mcJII$sp.java
index c7bce849f..c7bce849f 100644
--- a/src/scala/compat/java8/JFunction2$mcJII$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcJII$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcJIJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcJIJ$sp.java
index 083ea1f85..083ea1f85 100644
--- a/src/scala/compat/java8/JFunction2$mcJIJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcJIJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcJJD$sp.java b/library/src/scala/compat/java8/JFunction2$mcJJD$sp.java
index 06940bb25..06940bb25 100644
--- a/src/scala/compat/java8/JFunction2$mcJJD$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcJJD$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcJJI$sp.java b/library/src/scala/compat/java8/JFunction2$mcJJI$sp.java
index 8ecc1f4ef..8ecc1f4ef 100644
--- a/src/scala/compat/java8/JFunction2$mcJJI$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcJJI$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcJJJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcJJJ$sp.java
index 2046292c7..2046292c7 100644
--- a/src/scala/compat/java8/JFunction2$mcJJJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcJJJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcVDD$sp.java b/library/src/scala/compat/java8/JFunction2$mcVDD$sp.java
index 22bc2c1ce..22bc2c1ce 100644
--- a/src/scala/compat/java8/JFunction2$mcVDD$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcVDD$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcVDI$sp.java b/library/src/scala/compat/java8/JFunction2$mcVDI$sp.java
index 75b17c326..75b17c326 100644
--- a/src/scala/compat/java8/JFunction2$mcVDI$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcVDI$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcVDJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcVDJ$sp.java
index e649163f6..e649163f6 100644
--- a/src/scala/compat/java8/JFunction2$mcVDJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcVDJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcVID$sp.java b/library/src/scala/compat/java8/JFunction2$mcVID$sp.java
index 334f4aeed..334f4aeed 100644
--- a/src/scala/compat/java8/JFunction2$mcVID$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcVID$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcVII$sp.java b/library/src/scala/compat/java8/JFunction2$mcVII$sp.java
index 1d2d8ca94..1d2d8ca94 100644
--- a/src/scala/compat/java8/JFunction2$mcVII$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcVII$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcVIJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcVIJ$sp.java
index 0345e6df7..0345e6df7 100644
--- a/src/scala/compat/java8/JFunction2$mcVIJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcVIJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcVJD$sp.java b/library/src/scala/compat/java8/JFunction2$mcVJD$sp.java
index f277a8b24..f277a8b24 100644
--- a/src/scala/compat/java8/JFunction2$mcVJD$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcVJD$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcVJI$sp.java b/library/src/scala/compat/java8/JFunction2$mcVJI$sp.java
index 8209b82c0..8209b82c0 100644
--- a/src/scala/compat/java8/JFunction2$mcVJI$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcVJI$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcVJJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcVJJ$sp.java
index 9b7e7d68e..9b7e7d68e 100644
--- a/src/scala/compat/java8/JFunction2$mcVJJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcVJJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcZDD$sp.java b/library/src/scala/compat/java8/JFunction2$mcZDD$sp.java
index a921b50ec..a921b50ec 100644
--- a/src/scala/compat/java8/JFunction2$mcZDD$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcZDD$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcZDI$sp.java b/library/src/scala/compat/java8/JFunction2$mcZDI$sp.java
index 1c902b5e6..1c902b5e6 100644
--- a/src/scala/compat/java8/JFunction2$mcZDI$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcZDI$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcZDJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcZDJ$sp.java
index a210da17a..a210da17a 100644
--- a/src/scala/compat/java8/JFunction2$mcZDJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcZDJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcZID$sp.java b/library/src/scala/compat/java8/JFunction2$mcZID$sp.java
index ec2309c35..ec2309c35 100644
--- a/src/scala/compat/java8/JFunction2$mcZID$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcZID$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcZII$sp.java b/library/src/scala/compat/java8/JFunction2$mcZII$sp.java
index 91fe9c689..91fe9c689 100644
--- a/src/scala/compat/java8/JFunction2$mcZII$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcZII$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcZIJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcZIJ$sp.java
index 024522a20..024522a20 100644
--- a/src/scala/compat/java8/JFunction2$mcZIJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcZIJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcZJD$sp.java b/library/src/scala/compat/java8/JFunction2$mcZJD$sp.java
index e510eccda..e510eccda 100644
--- a/src/scala/compat/java8/JFunction2$mcZJD$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcZJD$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcZJI$sp.java b/library/src/scala/compat/java8/JFunction2$mcZJI$sp.java
index 0a251ba12..0a251ba12 100644
--- a/src/scala/compat/java8/JFunction2$mcZJI$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcZJI$sp.java
diff --git a/src/scala/compat/java8/JFunction2$mcZJJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcZJJ$sp.java
index 12e3a896a..12e3a896a 100644
--- a/src/scala/compat/java8/JFunction2$mcZJJ$sp.java
+++ b/library/src/scala/compat/java8/JFunction2$mcZJJ$sp.java
diff --git a/src/scala/compat/java8/JFunction2.java b/library/src/scala/compat/java8/JFunction2.java
index bad1493bb..bad1493bb 100644
--- a/src/scala/compat/java8/JFunction2.java
+++ b/library/src/scala/compat/java8/JFunction2.java
diff --git a/src/scala/compat/java8/JFunction20.java b/library/src/scala/compat/java8/JFunction20.java
index ed30b41ef..ed30b41ef 100644
--- a/src/scala/compat/java8/JFunction20.java
+++ b/library/src/scala/compat/java8/JFunction20.java
diff --git a/src/scala/compat/java8/JFunction21.java b/library/src/scala/compat/java8/JFunction21.java
index aa6da8084..aa6da8084 100644
--- a/src/scala/compat/java8/JFunction21.java
+++ b/library/src/scala/compat/java8/JFunction21.java
diff --git a/src/scala/compat/java8/JFunction22.java b/library/src/scala/compat/java8/JFunction22.java
index 532145157..532145157 100644
--- a/src/scala/compat/java8/JFunction22.java
+++ b/library/src/scala/compat/java8/JFunction22.java
diff --git a/src/scala/compat/java8/JFunction3.java b/library/src/scala/compat/java8/JFunction3.java
index 731608b2e..731608b2e 100644
--- a/src/scala/compat/java8/JFunction3.java
+++ b/library/src/scala/compat/java8/JFunction3.java
diff --git a/src/scala/compat/java8/JFunction4.java b/library/src/scala/compat/java8/JFunction4.java
index 9bff4c835..9bff4c835 100644
--- a/src/scala/compat/java8/JFunction4.java
+++ b/library/src/scala/compat/java8/JFunction4.java
diff --git a/src/scala/compat/java8/JFunction5.java b/library/src/scala/compat/java8/JFunction5.java
index a5566a5ba..a5566a5ba 100644
--- a/src/scala/compat/java8/JFunction5.java
+++ b/library/src/scala/compat/java8/JFunction5.java
diff --git a/src/scala/compat/java8/JFunction6.java b/library/src/scala/compat/java8/JFunction6.java
index b30fb5f47..b30fb5f47 100644
--- a/src/scala/compat/java8/JFunction6.java
+++ b/library/src/scala/compat/java8/JFunction6.java
diff --git a/src/scala/compat/java8/JFunction7.java b/library/src/scala/compat/java8/JFunction7.java
index 4a4a92cba..4a4a92cba 100644
--- a/src/scala/compat/java8/JFunction7.java
+++ b/library/src/scala/compat/java8/JFunction7.java
diff --git a/src/scala/compat/java8/JFunction8.java b/library/src/scala/compat/java8/JFunction8.java
index 825236e48..825236e48 100644
--- a/src/scala/compat/java8/JFunction8.java
+++ b/library/src/scala/compat/java8/JFunction8.java
diff --git a/src/scala/compat/java8/JFunction9.java b/library/src/scala/compat/java8/JFunction9.java
index d0e40c316..d0e40c316 100644
--- a/src/scala/compat/java8/JFunction9.java
+++ b/library/src/scala/compat/java8/JFunction9.java
diff --git a/src/scala/compat/java8/JProcedure0.java b/library/src/scala/compat/java8/JProcedure0.java
index 8361252c6..8361252c6 100644
--- a/src/scala/compat/java8/JProcedure0.java
+++ b/library/src/scala/compat/java8/JProcedure0.java
diff --git a/src/scala/compat/java8/JProcedure1.java b/library/src/scala/compat/java8/JProcedure1.java
index 189e451cd..189e451cd 100644
--- a/src/scala/compat/java8/JProcedure1.java
+++ b/library/src/scala/compat/java8/JProcedure1.java
diff --git a/src/scala/compat/java8/JProcedure10.java b/library/src/scala/compat/java8/JProcedure10.java
index 63a7543c5..63a7543c5 100644
--- a/src/scala/compat/java8/JProcedure10.java
+++ b/library/src/scala/compat/java8/JProcedure10.java
diff --git a/src/scala/compat/java8/JProcedure11.java b/library/src/scala/compat/java8/JProcedure11.java
index 1f530fba9..1f530fba9 100644
--- a/src/scala/compat/java8/JProcedure11.java
+++ b/library/src/scala/compat/java8/JProcedure11.java
diff --git a/src/scala/compat/java8/JProcedure12.java b/library/src/scala/compat/java8/JProcedure12.java
index 454868e66..454868e66 100644
--- a/src/scala/compat/java8/JProcedure12.java
+++ b/library/src/scala/compat/java8/JProcedure12.java
diff --git a/src/scala/compat/java8/JProcedure13.java b/library/src/scala/compat/java8/JProcedure13.java
index 4db2cd866..4db2cd866 100644
--- a/src/scala/compat/java8/JProcedure13.java
+++ b/library/src/scala/compat/java8/JProcedure13.java
diff --git a/src/scala/compat/java8/JProcedure14.java b/library/src/scala/compat/java8/JProcedure14.java
index 9d1c4b89f..9d1c4b89f 100644
--- a/src/scala/compat/java8/JProcedure14.java
+++ b/library/src/scala/compat/java8/JProcedure14.java
diff --git a/src/scala/compat/java8/JProcedure15.java b/library/src/scala/compat/java8/JProcedure15.java
index c49f042e7..c49f042e7 100644
--- a/src/scala/compat/java8/JProcedure15.java
+++ b/library/src/scala/compat/java8/JProcedure15.java
diff --git a/src/scala/compat/java8/JProcedure16.java b/library/src/scala/compat/java8/JProcedure16.java
index aad602dfa..aad602dfa 100644
--- a/src/scala/compat/java8/JProcedure16.java
+++ b/library/src/scala/compat/java8/JProcedure16.java
diff --git a/src/scala/compat/java8/JProcedure17.java b/library/src/scala/compat/java8/JProcedure17.java
index cdc30b9ee..cdc30b9ee 100644
--- a/src/scala/compat/java8/JProcedure17.java
+++ b/library/src/scala/compat/java8/JProcedure17.java
diff --git a/src/scala/compat/java8/JProcedure18.java b/library/src/scala/compat/java8/JProcedure18.java
index 2e03d8f80..2e03d8f80 100644
--- a/src/scala/compat/java8/JProcedure18.java
+++ b/library/src/scala/compat/java8/JProcedure18.java
diff --git a/src/scala/compat/java8/JProcedure19.java b/library/src/scala/compat/java8/JProcedure19.java
index 5e4fcb9aa..5e4fcb9aa 100644
--- a/src/scala/compat/java8/JProcedure19.java
+++ b/library/src/scala/compat/java8/JProcedure19.java
diff --git a/src/scala/compat/java8/JProcedure2.java b/library/src/scala/compat/java8/JProcedure2.java
index 36e84d8dd..36e84d8dd 100644
--- a/src/scala/compat/java8/JProcedure2.java
+++ b/library/src/scala/compat/java8/JProcedure2.java
diff --git a/src/scala/compat/java8/JProcedure20.java b/library/src/scala/compat/java8/JProcedure20.java
index d6598c312..d6598c312 100644
--- a/src/scala/compat/java8/JProcedure20.java
+++ b/library/src/scala/compat/java8/JProcedure20.java
diff --git a/src/scala/compat/java8/JProcedure21.java b/library/src/scala/compat/java8/JProcedure21.java
index c85cb540c..c85cb540c 100644
--- a/src/scala/compat/java8/JProcedure21.java
+++ b/library/src/scala/compat/java8/JProcedure21.java
diff --git a/src/scala/compat/java8/JProcedure22.java b/library/src/scala/compat/java8/JProcedure22.java
index a1653ae61..a1653ae61 100644
--- a/src/scala/compat/java8/JProcedure22.java
+++ b/library/src/scala/compat/java8/JProcedure22.java
diff --git a/src/scala/compat/java8/JProcedure3.java b/library/src/scala/compat/java8/JProcedure3.java
index f2b1e498a..f2b1e498a 100644
--- a/src/scala/compat/java8/JProcedure3.java
+++ b/library/src/scala/compat/java8/JProcedure3.java
diff --git a/src/scala/compat/java8/JProcedure4.java b/library/src/scala/compat/java8/JProcedure4.java
index 7a3457b57..7a3457b57 100644
--- a/src/scala/compat/java8/JProcedure4.java
+++ b/library/src/scala/compat/java8/JProcedure4.java
diff --git a/src/scala/compat/java8/JProcedure5.java b/library/src/scala/compat/java8/JProcedure5.java
index e9d25854a..e9d25854a 100644
--- a/src/scala/compat/java8/JProcedure5.java
+++ b/library/src/scala/compat/java8/JProcedure5.java
diff --git a/src/scala/compat/java8/JProcedure6.java b/library/src/scala/compat/java8/JProcedure6.java
index d1675bd24..d1675bd24 100644
--- a/src/scala/compat/java8/JProcedure6.java
+++ b/library/src/scala/compat/java8/JProcedure6.java
diff --git a/src/scala/compat/java8/JProcedure7.java b/library/src/scala/compat/java8/JProcedure7.java
index 1348e051b..1348e051b 100644
--- a/src/scala/compat/java8/JProcedure7.java
+++ b/library/src/scala/compat/java8/JProcedure7.java
diff --git a/src/scala/compat/java8/JProcedure8.java b/library/src/scala/compat/java8/JProcedure8.java
index df944ca6e..df944ca6e 100644
--- a/src/scala/compat/java8/JProcedure8.java
+++ b/library/src/scala/compat/java8/JProcedure8.java
diff --git a/src/scala/compat/java8/JProcedure9.java b/library/src/scala/compat/java8/JProcedure9.java
index 47ad5d234..47ad5d234 100644
--- a/src/scala/compat/java8/JProcedure9.java
+++ b/library/src/scala/compat/java8/JProcedure9.java
diff --git a/src/scala/runtime/ScalaRunTime.scala b/library/src/scala/runtime/ScalaRunTime.scala
index ed1eb82b1..ed1eb82b1 100644
--- a/src/scala/runtime/ScalaRunTime.scala
+++ b/library/src/scala/runtime/ScalaRunTime.scala
diff --git a/project/Build.scala b/project/Build.scala
index 799f8ef8f..fbbd20128 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -51,6 +51,15 @@ object DottyBuild extends Build {
   private val overrideScalaVersionSetting =
     ivyScala := ivyScala.value.map(_.copy(overrideScalaVersion = true))
 
+  // set sources to src/, tests to test/ and resources to resources/
+  lazy val sourceStructure = Seq(
+    scalaSource       in Compile := baseDirectory.value / "src",
+    scalaSource       in Test    := baseDirectory.value / "test",
+    javaSource        in Compile := baseDirectory.value / "src",
+    javaSource        in Test    := baseDirectory.value / "test",
+    resourceDirectory in Compile := baseDirectory.value / "resources"
+  )
+
   lazy val `dotty-interfaces` = project.in(file("interfaces")).
     settings(
       // Do not append Scala versions to the generated artifacts
@@ -62,17 +71,15 @@ object DottyBuild extends Build {
     ).
     settings(publishing)
 
-  lazy val dotty = project.in(file(".")).
+  lazy val `dotty-compiler` = project.in(file(".")).
     dependsOn(`dotty-interfaces`).
+    dependsOn(`dotty-library`).
+    settings(sourceStructure).
     settings(
       overrideScalaVersionSetting,
 
-      // set sources to src/, tests to test/ and resources to resources/
-      scalaSource in Compile := baseDirectory.value / "src",
-      javaSource in Compile := baseDirectory.value / "src",
-      scalaSource in Test := baseDirectory.value / "test",
-      javaSource in Test := baseDirectory.value / "test",
-      resourceDirectory in Compile := baseDirectory.value / "resources",
+      // necessary evil: dottydoc currently needs to be included in the dotty
+      // project, for sbt integration
       unmanagedSourceDirectories in Compile := Seq((scalaSource in Compile).value),
       unmanagedSourceDirectories in Compile += baseDirectory.value / "dottydoc" / "src",
       unmanagedSourceDirectories in Test := Seq((scalaSource in Test).value),
@@ -130,7 +137,7 @@ object DottyBuild extends Build {
         val args = Def.spaceDelimited("<arg>").parsed
         val jars = Seq((packageBin in Compile).value.getAbsolutePath) ++
             getJarPaths(partestDeps.value, ivyPaths.value.ivyHome)
-        val dottyJars  = "-dottyJars " + (jars.length + 1) + " dotty.jar" + " " + jars.mkString(" ")
+        val dottyJars  = "-dottyJars " + (jars.length + 2) + " dotty.jar dotty-lib.jar" + " " + jars.mkString(" ")
         // Provide the jars required on the classpath of run tests
         runTask(Test, "dotty.partest.DPConsoleRunner", dottyJars + " " + args.mkString(" "))
       },
@@ -211,17 +218,26 @@ object DottyBuild extends Build {
     ).
     settings(publishing)
 
+  lazy val `dotty-library` = project.in(file("library")).
+    settings(sourceStructure).
+    settings(
+      libraryDependencies ++= Seq(
+        "org.scala-lang" % "scala-reflect" % scalaVersion.value,
+        "org.scala-lang" % "scala-library" % scalaVersion.value
+      )
+    )
+
   // until sbt/sbt#2402 is fixed (https://github.com/sbt/sbt/issues/2402)
   lazy val cleanSbtBridge = TaskKey[Unit]("cleanSbtBridge", "delete dotty-sbt-bridge cache")
 
   lazy val `dotty-sbt-bridge` = project.in(file("sbt-bridge")).
-    dependsOn(dotty).
+    dependsOn(`dotty-compiler`).
     settings(
       overrideScalaVersionSetting,
 
       cleanSbtBridge := {
         val dottyBridgeVersion = version.value
-        val dottyVersion = (version in dotty).value
+        val dottyVersion = (version in `dotty-compiler`).value
         val classVersion = System.getProperty("java.class.version")
 
         val sbtV = sbtVersion.value
@@ -335,11 +351,11 @@ object DottyInjectedPlugin extends AutoPlugin {
     )))
 
   lazy val `dotty-bench` = project.in(file("bench")).
-    dependsOn(dotty % "compile->test").
+    dependsOn(`dotty-compiler` % "compile->test").
     settings(
       overrideScalaVersionSetting,
 
-      baseDirectory in (Test,run) := (baseDirectory in dotty).value,
+      baseDirectory in (Test,run) := (baseDirectory in `dotty-compiler`).value,
 
       libraryDependencies ++= Seq(
         scalaCompiler % Test,
@@ -474,7 +490,7 @@ object DottyInjectedPlugin extends AutoPlugin {
         def cpToString(cp: Seq[File]) =
           cp.map(_.getAbsolutePath).mkString(java.io.File.pathSeparator)
 
-        val compilerCp = Attributed.data((fullClasspath in (dotty, Compile)).value)
+        val compilerCp = Attributed.data((fullClasspath in (`dotty-compiler`, Compile)).value)
         val cpStr = cpToString(classpath ++ compilerCp)
 
         // List all my dependencies (recompile if any of these changes)
diff --git a/src/typedapply.scala b/src/typedapply.scala
deleted file mode 100644
index 8496d528b..000000000
--- a/src/typedapply.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-object typedapply {
-
-  def foo[X, Y](x: X, y: Y) = (x, y)
-
-  foo(1, "abc")
-
-  foo[Int, String](1, "abc")
-
-  foo[Int, String] _
-
-}