From e4a978d06b410700b2ee85696b9ad6f6aa7ff183 Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@gmail.com>
Date: Fri, 22 Jul 2016 14:19:19 +1000
Subject: SD-121 Remove now-unneeded J{Function,Proc}N functional interfaces

Non specialized functions can directly use `scala.FunctionN` as the
functional interface, now that mixin generates default methods in
the new trait encoding.

Unfortunately we can't do this for specialized functions as things
stand: specialization leaves the wrong method abstract. In principle,
we could/should amend the specialization transform to fix this. But
my earlier attempts at this weren't sucessful, so for now we have
to stick with the fallback plan of keeping some hand rolled functional
interfaces around.

This commit reduces the surface area of `scala.runtime.java8` to
the minimal requiremnt: one functional interface for each specialized
variant of `Function{0,1,2}`.
---
 .../scala/tools/nsc/transform/Delambdafy.scala     |   8 +-
 src/library/scala/runtime/java8/JFunction.java     | 146 ------
 .../scala/runtime/java8/JFunction0$mcB$sp.java     |   2 +-
 .../scala/runtime/java8/JFunction0$mcC$sp.java     |   2 +-
 .../scala/runtime/java8/JFunction0$mcD$sp.java     |   2 +-
 .../scala/runtime/java8/JFunction0$mcF$sp.java     |   2 +-
 .../scala/runtime/java8/JFunction0$mcI$sp.java     |   2 +-
 .../scala/runtime/java8/JFunction0$mcJ$sp.java     |   2 +-
 .../scala/runtime/java8/JFunction0$mcS$sp.java     |   2 +-
 .../scala/runtime/java8/JFunction0$mcV$sp.java     |   2 +-
 .../scala/runtime/java8/JFunction0$mcZ$sp.java     |   2 +-
 src/library/scala/runtime/java8/JFunction0.java    |  39 --
 .../scala/runtime/java8/JFunction1$mcDD$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcDF$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcDI$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcDJ$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcFD$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcFF$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcFI$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcFJ$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcID$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcIF$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcII$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcIJ$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcJD$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcJF$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcJI$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcJJ$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcVD$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcVF$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcVI$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcVJ$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcZD$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcZF$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcZI$sp.java    |   2 +-
 .../scala/runtime/java8/JFunction1$mcZJ$sp.java    |   2 +-
 src/library/scala/runtime/java8/JFunction1.java    | 228 ----------
 src/library/scala/runtime/java8/JFunction10.java   |  10 -
 src/library/scala/runtime/java8/JFunction11.java   |  10 -
 src/library/scala/runtime/java8/JFunction12.java   |  10 -
 src/library/scala/runtime/java8/JFunction13.java   |  10 -
 src/library/scala/runtime/java8/JFunction14.java   |  10 -
 src/library/scala/runtime/java8/JFunction15.java   |  10 -
 src/library/scala/runtime/java8/JFunction16.java   |  10 -
 src/library/scala/runtime/java8/JFunction17.java   |  10 -
 src/library/scala/runtime/java8/JFunction18.java   |  10 -
 src/library/scala/runtime/java8/JFunction19.java   |  10 -
 .../scala/runtime/java8/JFunction2$mcDDD$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcDDI$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcDDJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcDID$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcDII$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcDIJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcDJD$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcDJI$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcDJJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcFDD$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcFDI$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcFDJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcFID$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcFII$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcFIJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcFJD$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcFJI$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcFJJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcIDD$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcIDI$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcIDJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcIID$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcIII$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcIIJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcIJD$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcIJI$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcIJJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcJDD$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcJDI$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcJDJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcJID$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcJII$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcJIJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcJJD$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcJJI$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcJJJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcVDD$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcVDI$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcVDJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcVID$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcVII$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcVIJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcVJD$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcVJI$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcVJJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcZDD$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcZDI$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcZDJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcZID$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcZII$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcZIJ$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcZJD$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcZJI$sp.java   |   2 +-
 .../scala/runtime/java8/JFunction2$mcZJJ$sp.java   |   2 +-
 src/library/scala/runtime/java8/JFunction2.java    | 498 ---------------------
 src/library/scala/runtime/java8/JFunction20.java   |  10 -
 src/library/scala/runtime/java8/JFunction21.java   |  10 -
 src/library/scala/runtime/java8/JFunction22.java   |  10 -
 src/library/scala/runtime/java8/JFunction3.java    |  10 -
 src/library/scala/runtime/java8/JFunction4.java    |  10 -
 src/library/scala/runtime/java8/JFunction5.java    |  10 -
 src/library/scala/runtime/java8/JFunction6.java    |  10 -
 src/library/scala/runtime/java8/JFunction7.java    |  10 -
 src/library/scala/runtime/java8/JFunction8.java    |  10 -
 src/library/scala/runtime/java8/JFunction9.java    |  10 -
 src/library/scala/runtime/java8/JProcedure0.java   |  21 -
 src/library/scala/runtime/java8/JProcedure1.java   |  21 -
 src/library/scala/runtime/java8/JProcedure10.java  |  21 -
 src/library/scala/runtime/java8/JProcedure11.java  |  21 -
 src/library/scala/runtime/java8/JProcedure12.java  |  21 -
 src/library/scala/runtime/java8/JProcedure13.java  |  21 -
 src/library/scala/runtime/java8/JProcedure14.java  |  21 -
 src/library/scala/runtime/java8/JProcedure15.java  |  21 -
 src/library/scala/runtime/java8/JProcedure16.java  |  21 -
 src/library/scala/runtime/java8/JProcedure17.java  |  21 -
 src/library/scala/runtime/java8/JProcedure18.java  |  21 -
 src/library/scala/runtime/java8/JProcedure19.java  |  21 -
 src/library/scala/runtime/java8/JProcedure2.java   |  21 -
 src/library/scala/runtime/java8/JProcedure20.java  |  21 -
 src/library/scala/runtime/java8/JProcedure21.java  |  21 -
 src/library/scala/runtime/java8/JProcedure22.java  |  21 -
 src/library/scala/runtime/java8/JProcedure3.java   |  21 -
 src/library/scala/runtime/java8/JProcedure4.java   |  21 -
 src/library/scala/runtime/java8/JProcedure5.java   |  21 -
 src/library/scala/runtime/java8/JProcedure6.java   |  21 -
 src/library/scala/runtime/java8/JProcedure7.java   |  21 -
 src/library/scala/runtime/java8/JProcedure8.java   |  21 -
 src/library/scala/runtime/java8/JProcedure9.java   |  21 -
 135 files changed, 93 insertions(+), 1683 deletions(-)
 delete mode 100644 src/library/scala/runtime/java8/JFunction.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction0.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction1.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction10.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction11.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction12.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction13.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction14.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction15.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction16.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction17.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction18.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction19.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction2.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction20.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction21.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction22.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction3.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction4.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction5.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction6.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction7.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction8.java
 delete mode 100644 src/library/scala/runtime/java8/JFunction9.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure0.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure1.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure10.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure11.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure12.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure13.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure14.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure15.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure16.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure17.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure18.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure19.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure2.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure20.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure21.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure22.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure3.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure4.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure5.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure6.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure7.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure8.java
 delete mode 100644 src/library/scala/runtime/java8/JProcedure9.java

diff --git a/src/compiler/scala/tools/nsc/transform/Delambdafy.scala b/src/compiler/scala/tools/nsc/transform/Delambdafy.scala
index 804bcddb7b..88837842fa 100644
--- a/src/compiler/scala/tools/nsc/transform/Delambdafy.scala
+++ b/src/compiler/scala/tools/nsc/transform/Delambdafy.scala
@@ -241,8 +241,12 @@ abstract class Delambdafy extends Transform with TypingTransformers with ast.Tre
               exitingErasure(target.info.paramTypes).map(reboxValueClass) :+ reboxValueClass(exitingErasure(target.info.resultType))).toTypeName
 
           val isSpecialized = specializedName != funSym.name
-          val functionalInterface = // TODO: this is no longer needed, right? we can just use the regular function classes
-            if (isSpecialized) currentRun.runDefinitions.Scala_Java8_CompatPackage.info.decl(specializedName.prepend("J"))
+          val functionalInterface =
+            if (isSpecialized) {
+              // Unfortunately we still need to use custom functional interfaces for specialized functions so that the
+              // unboxed apply method is left abstract for us to implement.
+              currentRun.runDefinitions.Scala_Java8_CompatPackage.info.decl(specializedName.prepend("J"))
+            }
             else FunctionClass(originalFunction.vparams.length)
 
           (functionalInterface, isSpecialized)
diff --git a/src/library/scala/runtime/java8/JFunction.java b/src/library/scala/runtime/java8/JFunction.java
deleted file mode 100644
index 326aad3fec..0000000000
--- a/src/library/scala/runtime/java8/JFunction.java
+++ /dev/null
@@ -1,146 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-public final class JFunction {
-    private JFunction() {}
-    public static <R> scala.Function0<R> func(JFunction0<R> f) { return f; }
-    public static scala.Function0<BoxedUnit> proc(JProcedure0 p) { return p; }
-    public static scala.Function0<BoxedUnit> procSpecialized(JFunction0$mcV$sp f) { return f; }
-    public static scala.Function0<Byte> funcSpecialized(JFunction0$mcB$sp f) { return f; }
-    public static scala.Function0<Short> funcSpecialized(JFunction0$mcS$sp f) { return f; }
-    public static scala.Function0<Integer> funcSpecialized(JFunction0$mcI$sp f) { return f; }
-    public static scala.Function0<Long> funcSpecialized(JFunction0$mcJ$sp f) { return f; }
-    public static scala.Function0<Character> funcSpecialized(JFunction0$mcC$sp f) { return f; }
-    public static scala.Function0<Float> funcSpecialized(JFunction0$mcF$sp f) { return f; }
-    public static scala.Function0<Double> funcSpecialized(JFunction0$mcD$sp f) { return f; }
-    public static scala.Function0<Boolean> funcSpecialized(JFunction0$mcZ$sp f) { return f; }
-    public static <T1, R> scala.Function1<T1, R> func(JFunction1<T1, R> f) { return f; }
-    public static <T1> scala.Function1<T1, BoxedUnit> proc(JProcedure1<T1> p) { return p; }
-    public static scala.Function1<Integer, BoxedUnit> procSpecialized(JFunction1$mcVI$sp f) { return f; }
-    public static scala.Function1<Integer, Boolean> funcSpecialized(JFunction1$mcZI$sp f) { return f; }
-    public static scala.Function1<Integer, Integer> funcSpecialized(JFunction1$mcII$sp f) { return f; }
-    public static scala.Function1<Integer, Float> funcSpecialized(JFunction1$mcFI$sp f) { return f; }
-    public static scala.Function1<Integer, Long> funcSpecialized(JFunction1$mcJI$sp f) { return f; }
-    public static scala.Function1<Integer, Double> funcSpecialized(JFunction1$mcDI$sp f) { return f; }
-    public static scala.Function1<Long, BoxedUnit> procSpecialized(JFunction1$mcVJ$sp f) { return f; }
-    public static scala.Function1<Long, Boolean> funcSpecialized(JFunction1$mcZJ$sp f) { return f; }
-    public static scala.Function1<Long, Integer> funcSpecialized(JFunction1$mcIJ$sp f) { return f; }
-    public static scala.Function1<Long, Float> funcSpecialized(JFunction1$mcFJ$sp f) { return f; }
-    public static scala.Function1<Long, Long> funcSpecialized(JFunction1$mcJJ$sp f) { return f; }
-    public static scala.Function1<Long, Double> funcSpecialized(JFunction1$mcDJ$sp f) { return f; }
-    public static scala.Function1<Float, BoxedUnit> procSpecialized(JFunction1$mcVF$sp f) { return f; }
-    public static scala.Function1<Float, Boolean> funcSpecialized(JFunction1$mcZF$sp f) { return f; }
-    public static scala.Function1<Float, Integer> funcSpecialized(JFunction1$mcIF$sp f) { return f; }
-    public static scala.Function1<Float, Float> funcSpecialized(JFunction1$mcFF$sp f) { return f; }
-    public static scala.Function1<Float, Long> funcSpecialized(JFunction1$mcJF$sp f) { return f; }
-    public static scala.Function1<Float, Double> funcSpecialized(JFunction1$mcDF$sp f) { return f; }
-    public static scala.Function1<Double, BoxedUnit> procSpecialized(JFunction1$mcVD$sp f) { return f; }
-    public static scala.Function1<Double, Boolean> funcSpecialized(JFunction1$mcZD$sp f) { return f; }
-    public static scala.Function1<Double, Integer> funcSpecialized(JFunction1$mcID$sp f) { return f; }
-    public static scala.Function1<Double, Float> funcSpecialized(JFunction1$mcFD$sp f) { return f; }
-    public static scala.Function1<Double, Long> funcSpecialized(JFunction1$mcJD$sp f) { return f; }
-    public static scala.Function1<Double, Double> funcSpecialized(JFunction1$mcDD$sp f) { return f; }
-    public static <T1, T2, R> scala.Function2<T1, T2, R> func(JFunction2<T1, T2, R> f) { return f; }
-    public static <T1, T2> scala.Function2<T1, T2, BoxedUnit> proc(JProcedure2<T1, T2> p) { return p; }
-    public static scala.Function2<Integer, Integer, BoxedUnit> procSpecialized(JFunction2$mcVII$sp f) { return f; }
-    public static scala.Function2<Integer, Integer, Boolean> funcSpecialized(JFunction2$mcZII$sp f) { return f; }
-    public static scala.Function2<Integer, Integer, Integer> funcSpecialized(JFunction2$mcIII$sp f) { return f; }
-    public static scala.Function2<Integer, Integer, Float> funcSpecialized(JFunction2$mcFII$sp f) { return f; }
-    public static scala.Function2<Integer, Integer, Long> funcSpecialized(JFunction2$mcJII$sp f) { return f; }
-    public static scala.Function2<Integer, Integer, Double> funcSpecialized(JFunction2$mcDII$sp f) { return f; }
-    public static scala.Function2<Integer, Long, BoxedUnit> procSpecialized(JFunction2$mcVIJ$sp f) { return f; }
-    public static scala.Function2<Integer, Long, Boolean> funcSpecialized(JFunction2$mcZIJ$sp f) { return f; }
-    public static scala.Function2<Integer, Long, Integer> funcSpecialized(JFunction2$mcIIJ$sp f) { return f; }
-    public static scala.Function2<Integer, Long, Float> funcSpecialized(JFunction2$mcFIJ$sp f) { return f; }
-    public static scala.Function2<Integer, Long, Long> funcSpecialized(JFunction2$mcJIJ$sp f) { return f; }
-    public static scala.Function2<Integer, Long, Double> funcSpecialized(JFunction2$mcDIJ$sp f) { return f; }
-    public static scala.Function2<Integer, Double, BoxedUnit> procSpecialized(JFunction2$mcVID$sp f) { return f; }
-    public static scala.Function2<Integer, Double, Boolean> funcSpecialized(JFunction2$mcZID$sp f) { return f; }
-    public static scala.Function2<Integer, Double, Integer> funcSpecialized(JFunction2$mcIID$sp f) { return f; }
-    public static scala.Function2<Integer, Double, Float> funcSpecialized(JFunction2$mcFID$sp f) { return f; }
-    public static scala.Function2<Integer, Double, Long> funcSpecialized(JFunction2$mcJID$sp f) { return f; }
-    public static scala.Function2<Integer, Double, Double> funcSpecialized(JFunction2$mcDID$sp f) { return f; }
-    public static scala.Function2<Long, Integer, BoxedUnit> procSpecialized(JFunction2$mcVJI$sp f) { return f; }
-    public static scala.Function2<Long, Integer, Boolean> funcSpecialized(JFunction2$mcZJI$sp f) { return f; }
-    public static scala.Function2<Long, Integer, Integer> funcSpecialized(JFunction2$mcIJI$sp f) { return f; }
-    public static scala.Function2<Long, Integer, Float> funcSpecialized(JFunction2$mcFJI$sp f) { return f; }
-    public static scala.Function2<Long, Integer, Long> funcSpecialized(JFunction2$mcJJI$sp f) { return f; }
-    public static scala.Function2<Long, Integer, Double> funcSpecialized(JFunction2$mcDJI$sp f) { return f; }
-    public static scala.Function2<Long, Long, BoxedUnit> procSpecialized(JFunction2$mcVJJ$sp f) { return f; }
-    public static scala.Function2<Long, Long, Boolean> funcSpecialized(JFunction2$mcZJJ$sp f) { return f; }
-    public static scala.Function2<Long, Long, Integer> funcSpecialized(JFunction2$mcIJJ$sp f) { return f; }
-    public static scala.Function2<Long, Long, Float> funcSpecialized(JFunction2$mcFJJ$sp f) { return f; }
-    public static scala.Function2<Long, Long, Long> funcSpecialized(JFunction2$mcJJJ$sp f) { return f; }
-    public static scala.Function2<Long, Long, Double> funcSpecialized(JFunction2$mcDJJ$sp f) { return f; }
-    public static scala.Function2<Long, Double, BoxedUnit> procSpecialized(JFunction2$mcVJD$sp f) { return f; }
-    public static scala.Function2<Long, Double, Boolean> funcSpecialized(JFunction2$mcZJD$sp f) { return f; }
-    public static scala.Function2<Long, Double, Integer> funcSpecialized(JFunction2$mcIJD$sp f) { return f; }
-    public static scala.Function2<Long, Double, Float> funcSpecialized(JFunction2$mcFJD$sp f) { return f; }
-    public static scala.Function2<Long, Double, Long> funcSpecialized(JFunction2$mcJJD$sp f) { return f; }
-    public static scala.Function2<Long, Double, Double> funcSpecialized(JFunction2$mcDJD$sp f) { return f; }
-    public static scala.Function2<Double, Integer, BoxedUnit> procSpecialized(JFunction2$mcVDI$sp f) { return f; }
-    public static scala.Function2<Double, Integer, Boolean> funcSpecialized(JFunction2$mcZDI$sp f) { return f; }
-    public static scala.Function2<Double, Integer, Integer> funcSpecialized(JFunction2$mcIDI$sp f) { return f; }
-    public static scala.Function2<Double, Integer, Float> funcSpecialized(JFunction2$mcFDI$sp f) { return f; }
-    public static scala.Function2<Double, Integer, Long> funcSpecialized(JFunction2$mcJDI$sp f) { return f; }
-    public static scala.Function2<Double, Integer, Double> funcSpecialized(JFunction2$mcDDI$sp f) { return f; }
-    public static scala.Function2<Double, Long, BoxedUnit> procSpecialized(JFunction2$mcVDJ$sp f) { return f; }
-    public static scala.Function2<Double, Long, Boolean> funcSpecialized(JFunction2$mcZDJ$sp f) { return f; }
-    public static scala.Function2<Double, Long, Integer> funcSpecialized(JFunction2$mcIDJ$sp f) { return f; }
-    public static scala.Function2<Double, Long, Float> funcSpecialized(JFunction2$mcFDJ$sp f) { return f; }
-    public static scala.Function2<Double, Long, Long> funcSpecialized(JFunction2$mcJDJ$sp f) { return f; }
-    public static scala.Function2<Double, Long, Double> funcSpecialized(JFunction2$mcDDJ$sp f) { return f; }
-    public static scala.Function2<Double, Double, BoxedUnit> procSpecialized(JFunction2$mcVDD$sp f) { return f; }
-    public static scala.Function2<Double, Double, Boolean> funcSpecialized(JFunction2$mcZDD$sp f) { return f; }
-    public static scala.Function2<Double, Double, Integer> funcSpecialized(JFunction2$mcIDD$sp f) { return f; }
-    public static scala.Function2<Double, Double, Float> funcSpecialized(JFunction2$mcFDD$sp f) { return f; }
-    public static scala.Function2<Double, Double, Long> funcSpecialized(JFunction2$mcJDD$sp f) { return f; }
-    public static scala.Function2<Double, Double, Double> funcSpecialized(JFunction2$mcDDD$sp f) { return f; }
-    public static <T1, T2, T3, R> scala.Function3<T1, T2, T3, R> func(JFunction3<T1, T2, T3, R> f) { return f; }
-    public static <T1, T2, T3> scala.Function3<T1, T2, T3, BoxedUnit> proc(JProcedure3<T1, T2, T3> p) { return p; }
-    public static <T1, T2, T3, T4, R> scala.Function4<T1, T2, T3, T4, R> func(JFunction4<T1, T2, T3, T4, R> f) { return f; }
-    public static <T1, T2, T3, T4> scala.Function4<T1, T2, T3, T4, BoxedUnit> proc(JProcedure4<T1, T2, T3, T4> p) { return p; }
-    public static <T1, T2, T3, T4, T5, R> scala.Function5<T1, T2, T3, T4, T5, R> func(JFunction5<T1, T2, T3, T4, T5, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5> scala.Function5<T1, T2, T3, T4, T5, BoxedUnit> proc(JProcedure5<T1, T2, T3, T4, T5> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, R> scala.Function6<T1, T2, T3, T4, T5, T6, R> func(JFunction6<T1, T2, T3, T4, T5, T6, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6> scala.Function6<T1, T2, T3, T4, T5, T6, BoxedUnit> proc(JProcedure6<T1, T2, T3, T4, T5, T6> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, R> scala.Function7<T1, T2, T3, T4, T5, T6, T7, R> func(JFunction7<T1, T2, T3, T4, T5, T6, T7, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7> scala.Function7<T1, T2, T3, T4, T5, T6, T7, BoxedUnit> proc(JProcedure7<T1, T2, T3, T4, T5, T6, T7> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, R> scala.Function8<T1, T2, T3, T4, T5, T6, T7, T8, R> func(JFunction8<T1, T2, T3, T4, T5, T6, T7, T8, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8> scala.Function8<T1, T2, T3, T4, T5, T6, T7, T8, BoxedUnit> proc(JProcedure8<T1, T2, T3, T4, T5, T6, T7, T8> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> scala.Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> func(JFunction9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9> scala.Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, BoxedUnit> proc(JProcedure9<T1, T2, T3, T4, T5, T6, T7, T8, T9> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> scala.Function10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> func(JFunction10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> scala.Function10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, BoxedUnit> proc(JProcedure10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> scala.Function11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> func(JFunction11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> scala.Function11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, BoxedUnit> proc(JProcedure11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> scala.Function12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> func(JFunction12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> scala.Function12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, BoxedUnit> proc(JProcedure12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R> scala.Function13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R> func(JFunction13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> scala.Function13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, BoxedUnit> proc(JProcedure13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R> scala.Function14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R> func(JFunction14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> scala.Function14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, BoxedUnit> proc(JProcedure14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R> scala.Function15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R> func(JFunction15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> scala.Function15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, BoxedUnit> proc(JProcedure15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R> scala.Function16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R> func(JFunction16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> scala.Function16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, BoxedUnit> proc(JProcedure16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R> scala.Function17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R> func(JFunction17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> scala.Function17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, BoxedUnit> proc(JProcedure17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R> scala.Function18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R> func(JFunction18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> scala.Function18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, BoxedUnit> proc(JProcedure18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R> scala.Function19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R> func(JFunction19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> scala.Function19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, BoxedUnit> proc(JProcedure19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R> scala.Function20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R> func(JFunction20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> scala.Function20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, BoxedUnit> proc(JProcedure20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R> scala.Function21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R> func(JFunction21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> scala.Function21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, BoxedUnit> proc(JProcedure21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> p) { return p; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R> scala.Function22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R> func(JFunction22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R> f) { return f; }
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> scala.Function22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, BoxedUnit> proc(JProcedure22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> p) { return p; }
-}
-
diff --git a/src/library/scala/runtime/java8/JFunction0$mcB$sp.java b/src/library/scala/runtime/java8/JFunction0$mcB$sp.java
index c882757630..622dbabcf1 100644
--- a/src/library/scala/runtime/java8/JFunction0$mcB$sp.java
+++ b/src/library/scala/runtime/java8/JFunction0$mcB$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction0$mcB$sp extends JFunction0 {
+public interface JFunction0$mcB$sp extends scala.Function0, java.io.Serializable {
     byte apply$mcB$sp();
 
     default Object apply() { return scala.runtime.BoxesRunTime.boxToByte(apply$mcB$sp()); }
diff --git a/src/library/scala/runtime/java8/JFunction0$mcC$sp.java b/src/library/scala/runtime/java8/JFunction0$mcC$sp.java
index c804529f71..ad9a14ffa8 100644
--- a/src/library/scala/runtime/java8/JFunction0$mcC$sp.java
+++ b/src/library/scala/runtime/java8/JFunction0$mcC$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction0$mcC$sp extends JFunction0 {
+public interface JFunction0$mcC$sp extends scala.Function0, java.io.Serializable {
     char apply$mcC$sp();
 
     default Object apply() { return scala.runtime.BoxesRunTime.boxToCharacter(apply$mcC$sp()); }
diff --git a/src/library/scala/runtime/java8/JFunction0$mcD$sp.java b/src/library/scala/runtime/java8/JFunction0$mcD$sp.java
index dacf50237c..291b50db4b 100644
--- a/src/library/scala/runtime/java8/JFunction0$mcD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction0$mcD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction0$mcD$sp extends JFunction0 {
+public interface JFunction0$mcD$sp extends scala.Function0, java.io.Serializable {
     double apply$mcD$sp();
 
     default Object apply() { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcD$sp()); }
diff --git a/src/library/scala/runtime/java8/JFunction0$mcF$sp.java b/src/library/scala/runtime/java8/JFunction0$mcF$sp.java
index 2a9f824924..73b31dea0f 100644
--- a/src/library/scala/runtime/java8/JFunction0$mcF$sp.java
+++ b/src/library/scala/runtime/java8/JFunction0$mcF$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction0$mcF$sp extends JFunction0 {
+public interface JFunction0$mcF$sp extends scala.Function0, java.io.Serializable {
     float apply$mcF$sp();
 
     default Object apply() { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcF$sp()); }
diff --git a/src/library/scala/runtime/java8/JFunction0$mcI$sp.java b/src/library/scala/runtime/java8/JFunction0$mcI$sp.java
index 75c612f916..f9b2d659ad 100644
--- a/src/library/scala/runtime/java8/JFunction0$mcI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction0$mcI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction0$mcI$sp extends JFunction0 {
+public interface JFunction0$mcI$sp extends scala.Function0, java.io.Serializable {
     int apply$mcI$sp();
 
     default Object apply() { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcI$sp()); }
diff --git a/src/library/scala/runtime/java8/JFunction0$mcJ$sp.java b/src/library/scala/runtime/java8/JFunction0$mcJ$sp.java
index d08984c794..73c41976b7 100644
--- a/src/library/scala/runtime/java8/JFunction0$mcJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction0$mcJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction0$mcJ$sp extends JFunction0 {
+public interface JFunction0$mcJ$sp extends scala.Function0, java.io.Serializable {
     long apply$mcJ$sp();
 
     default Object apply() { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJ$sp()); }
diff --git a/src/library/scala/runtime/java8/JFunction0$mcS$sp.java b/src/library/scala/runtime/java8/JFunction0$mcS$sp.java
index d9e36a39f0..5fbabb2358 100644
--- a/src/library/scala/runtime/java8/JFunction0$mcS$sp.java
+++ b/src/library/scala/runtime/java8/JFunction0$mcS$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction0$mcS$sp extends JFunction0 {
+public interface JFunction0$mcS$sp extends scala.Function0, java.io.Serializable {
     short apply$mcS$sp();
 
     default Object apply() { return scala.runtime.BoxesRunTime.boxToShort(apply$mcS$sp()); }
diff --git a/src/library/scala/runtime/java8/JFunction0$mcV$sp.java b/src/library/scala/runtime/java8/JFunction0$mcV$sp.java
index abd5e6ebbe..735843796c 100644
--- a/src/library/scala/runtime/java8/JFunction0$mcV$sp.java
+++ b/src/library/scala/runtime/java8/JFunction0$mcV$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction0$mcV$sp extends JFunction0 {
+public interface JFunction0$mcV$sp extends scala.Function0, java.io.Serializable {
     void apply$mcV$sp();
 
     default Object apply() { apply$mcV$sp(); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction0$mcZ$sp.java b/src/library/scala/runtime/java8/JFunction0$mcZ$sp.java
index e1cd62a913..01234c1728 100644
--- a/src/library/scala/runtime/java8/JFunction0$mcZ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction0$mcZ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction0$mcZ$sp extends JFunction0 {
+public interface JFunction0$mcZ$sp extends scala.Function0, java.io.Serializable {
     boolean apply$mcZ$sp();
 
     default Object apply() { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZ$sp()); }
diff --git a/src/library/scala/runtime/java8/JFunction0.java b/src/library/scala/runtime/java8/JFunction0.java
deleted file mode 100644
index 13426cc8af..0000000000
--- a/src/library/scala/runtime/java8/JFunction0.java
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction0<R> extends scala.Function0<R>, java.io.Serializable {
-    default void $init$() {
-    };
-    default void apply$mcV$sp() {
-        apply();
-    }
-    default byte apply$mcB$sp() {
-        return scala.runtime.BoxesRunTime.unboxToByte(apply());
-    }
-    default short apply$mcS$sp() {
-        return scala.runtime.BoxesRunTime.unboxToShort(apply());
-    }
-    default int apply$mcI$sp() {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply());
-    }
-    default long apply$mcJ$sp() {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply());
-    }
-    default char apply$mcC$sp() {
-        return scala.runtime.BoxesRunTime.unboxToChar(apply());
-    }
-    default float apply$mcF$sp() {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply());
-    }
-    default double apply$mcD$sp() {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply());
-    }
-    default boolean apply$mcZ$sp() {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply());
-    }
-}
diff --git a/src/library/scala/runtime/java8/JFunction1$mcDD$sp.java b/src/library/scala/runtime/java8/JFunction1$mcDD$sp.java
index 4fbb370b8b..07b85eed59 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcDD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcDD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcDD$sp extends JFunction1 {
+public interface JFunction1$mcDD$sp extends scala.Function1, java.io.Serializable {
     double apply$mcDD$sp(double v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDD$sp(scala.runtime.BoxesRunTime.unboxToDouble(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcDF$sp.java b/src/library/scala/runtime/java8/JFunction1$mcDF$sp.java
index ce45666dd1..f09edd2ce2 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcDF$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcDF$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcDF$sp extends JFunction1 {
+public interface JFunction1$mcDF$sp extends scala.Function1, java.io.Serializable {
     double apply$mcDF$sp(float v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcDI$sp.java b/src/library/scala/runtime/java8/JFunction1$mcDI$sp.java
index 09cac947c9..3cf40cb749 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcDI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcDI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcDI$sp extends JFunction1 {
+public interface JFunction1$mcDI$sp extends scala.Function1, java.io.Serializable {
     double apply$mcDI$sp(int v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDI$sp(scala.runtime.BoxesRunTime.unboxToInt(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcDJ$sp.java b/src/library/scala/runtime/java8/JFunction1$mcDJ$sp.java
index f5154c3854..4023f30bc0 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcDJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcDJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcDJ$sp extends JFunction1 {
+public interface JFunction1$mcDJ$sp extends scala.Function1, java.io.Serializable {
     double apply$mcDJ$sp(long v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcFD$sp.java b/src/library/scala/runtime/java8/JFunction1$mcFD$sp.java
index 758b432d99..d460895838 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcFD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcFD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcFD$sp extends JFunction1 {
+public interface JFunction1$mcFD$sp extends scala.Function1, java.io.Serializable {
     float apply$mcFD$sp(double v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFD$sp(scala.runtime.BoxesRunTime.unboxToDouble(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcFF$sp.java b/src/library/scala/runtime/java8/JFunction1$mcFF$sp.java
index 7e13e287a5..6c591800ca 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcFF$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcFF$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcFF$sp extends JFunction1 {
+public interface JFunction1$mcFF$sp extends scala.Function1, java.io.Serializable {
     float apply$mcFF$sp(float v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcFI$sp.java b/src/library/scala/runtime/java8/JFunction1$mcFI$sp.java
index e3c4a203c7..6669195914 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcFI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcFI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcFI$sp extends JFunction1 {
+public interface JFunction1$mcFI$sp extends scala.Function1, java.io.Serializable {
     float apply$mcFI$sp(int v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFI$sp(scala.runtime.BoxesRunTime.unboxToInt(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcFJ$sp.java b/src/library/scala/runtime/java8/JFunction1$mcFJ$sp.java
index d989fa1ea8..cd953677ae 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcFJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcFJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcFJ$sp extends JFunction1 {
+public interface JFunction1$mcFJ$sp extends scala.Function1, java.io.Serializable {
     float apply$mcFJ$sp(long v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcID$sp.java b/src/library/scala/runtime/java8/JFunction1$mcID$sp.java
index bde5d88d46..37f6864936 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcID$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcID$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcID$sp extends JFunction1 {
+public interface JFunction1$mcID$sp extends scala.Function1, java.io.Serializable {
     int apply$mcID$sp(double v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcID$sp(scala.runtime.BoxesRunTime.unboxToDouble(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcIF$sp.java b/src/library/scala/runtime/java8/JFunction1$mcIF$sp.java
index d1d235aef1..8a7656a286 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcIF$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcIF$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcIF$sp extends JFunction1 {
+public interface JFunction1$mcIF$sp extends scala.Function1, java.io.Serializable {
     int apply$mcIF$sp(float v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcIF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcII$sp.java b/src/library/scala/runtime/java8/JFunction1$mcII$sp.java
index ef44b3830c..792627b400 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcII$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcII$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcII$sp extends JFunction1 {
+public interface JFunction1$mcII$sp extends scala.Function1, java.io.Serializable {
     int apply$mcII$sp(int v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcII$sp(scala.runtime.BoxesRunTime.unboxToInt(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcIJ$sp.java b/src/library/scala/runtime/java8/JFunction1$mcIJ$sp.java
index 373d13cd46..01c47a67da 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcIJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcIJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcIJ$sp extends JFunction1 {
+public interface JFunction1$mcIJ$sp extends scala.Function1, java.io.Serializable {
     int apply$mcIJ$sp(long v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcIJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcJD$sp.java b/src/library/scala/runtime/java8/JFunction1$mcJD$sp.java
index 86fd7b7779..d8d5274ca1 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcJD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcJD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcJD$sp extends JFunction1 {
+public interface JFunction1$mcJD$sp extends scala.Function1, java.io.Serializable {
     long apply$mcJD$sp(double v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJD$sp(scala.runtime.BoxesRunTime.unboxToDouble(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcJF$sp.java b/src/library/scala/runtime/java8/JFunction1$mcJF$sp.java
index 3bcf264034..cc1fad36d0 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcJF$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcJF$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcJF$sp extends JFunction1 {
+public interface JFunction1$mcJF$sp extends scala.Function1, java.io.Serializable {
     long apply$mcJF$sp(float v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcJI$sp.java b/src/library/scala/runtime/java8/JFunction1$mcJI$sp.java
index 11bc15ef6e..fe941dd61a 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcJI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcJI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcJI$sp extends JFunction1 {
+public interface JFunction1$mcJI$sp extends scala.Function1, java.io.Serializable {
     long apply$mcJI$sp(int v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJI$sp(scala.runtime.BoxesRunTime.unboxToInt(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcJJ$sp.java b/src/library/scala/runtime/java8/JFunction1$mcJJ$sp.java
index 2e1ad7878f..7034115bad 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcJJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcJJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcJJ$sp extends JFunction1 {
+public interface JFunction1$mcJJ$sp extends scala.Function1, java.io.Serializable {
     long apply$mcJJ$sp(long v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcVD$sp.java b/src/library/scala/runtime/java8/JFunction1$mcVD$sp.java
index c8077e1268..dde9f55722 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcVD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcVD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcVD$sp extends JFunction1 {
+public interface JFunction1$mcVD$sp extends scala.Function1, java.io.Serializable {
     void apply$mcVD$sp(double v1);
 
     default Object apply(Object t) { apply$mcVD$sp(scala.runtime.BoxesRunTime.unboxToDouble(t)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcVF$sp.java b/src/library/scala/runtime/java8/JFunction1$mcVF$sp.java
index e7be77f8e3..0ffd80621f 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcVF$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcVF$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcVF$sp extends JFunction1 {
+public interface JFunction1$mcVF$sp extends scala.Function1, java.io.Serializable {
     void apply$mcVF$sp(float v1);
 
     default Object apply(Object t) { apply$mcVF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcVI$sp.java b/src/library/scala/runtime/java8/JFunction1$mcVI$sp.java
index 7597ca5294..2543d23e31 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcVI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcVI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcVI$sp extends JFunction1 {
+public interface JFunction1$mcVI$sp extends scala.Function1, java.io.Serializable {
     void apply$mcVI$sp(int v1);
 
     default Object apply(Object t) { apply$mcVI$sp(scala.runtime.BoxesRunTime.unboxToInt(t)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcVJ$sp.java b/src/library/scala/runtime/java8/JFunction1$mcVJ$sp.java
index 55c6c3997f..7564175402 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcVJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcVJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcVJ$sp extends JFunction1 {
+public interface JFunction1$mcVJ$sp extends scala.Function1, java.io.Serializable {
     void apply$mcVJ$sp(long v1);
 
     default Object apply(Object t) { apply$mcVJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcZD$sp.java b/src/library/scala/runtime/java8/JFunction1$mcZD$sp.java
index 883a0e84fa..ce5bd30029 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcZD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcZD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcZD$sp extends JFunction1 {
+public interface JFunction1$mcZD$sp extends scala.Function1, java.io.Serializable {
     boolean apply$mcZD$sp(double v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZD$sp(scala.runtime.BoxesRunTime.unboxToDouble(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcZF$sp.java b/src/library/scala/runtime/java8/JFunction1$mcZF$sp.java
index 884832ca37..baa691e548 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcZF$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcZF$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcZF$sp extends JFunction1 {
+public interface JFunction1$mcZF$sp extends scala.Function1, java.io.Serializable {
     boolean apply$mcZF$sp(float v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcZI$sp.java b/src/library/scala/runtime/java8/JFunction1$mcZI$sp.java
index 8a51aa99a2..bf04b5922b 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcZI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcZI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcZI$sp extends JFunction1 {
+public interface JFunction1$mcZI$sp extends scala.Function1, java.io.Serializable {
     boolean apply$mcZI$sp(int v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZI$sp(scala.runtime.BoxesRunTime.unboxToInt(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1$mcZJ$sp.java b/src/library/scala/runtime/java8/JFunction1$mcZJ$sp.java
index dc619666dc..808eea87b8 100644
--- a/src/library/scala/runtime/java8/JFunction1$mcZJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction1$mcZJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction1$mcZJ$sp extends JFunction1 {
+public interface JFunction1$mcZJ$sp extends scala.Function1, java.io.Serializable {
     boolean apply$mcZJ$sp(long v1);
 
     default Object apply(Object t) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t))); }
diff --git a/src/library/scala/runtime/java8/JFunction1.java b/src/library/scala/runtime/java8/JFunction1.java
deleted file mode 100644
index e1f886dad7..0000000000
--- a/src/library/scala/runtime/java8/JFunction1.java
+++ /dev/null
@@ -1,228 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction1<T1, R> extends scala.Function1<T1, R>, java.io.Serializable {
-    default void apply$mcVI$sp(int v1) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1));
-    }
-    default boolean apply$mcZI$sp(int v1) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1)));
-    }
-    default int apply$mcII$sp(int v1) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1)));
-    }
-    default float apply$mcFI$sp(int v1) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1)));
-    }
-    default long apply$mcJI$sp(int v1) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1)));
-    }
-    default double apply$mcDI$sp(int v1) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1)));
-    }
-    default void apply$mcVJ$sp(long v1) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1));
-    }
-    default boolean apply$mcZJ$sp(long v1) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1)));
-    }
-    default int apply$mcIJ$sp(long v1) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1)));
-    }
-    default float apply$mcFJ$sp(long v1) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1)));
-    }
-    default long apply$mcJJ$sp(long v1) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1)));
-    }
-    default double apply$mcDJ$sp(long v1) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1)));
-    }
-    default void apply$mcVF$sp(float v1) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToFloat(v1));
-    }
-    default boolean apply$mcZF$sp(float v1) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToFloat(v1)));
-    }
-    default int apply$mcIF$sp(float v1) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToFloat(v1)));
-    }
-    default float apply$mcFF$sp(float v1) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToFloat(v1)));
-    }
-    default long apply$mcJF$sp(float v1) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToFloat(v1)));
-    }
-    default double apply$mcDF$sp(float v1) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToFloat(v1)));
-    }
-    default void apply$mcVD$sp(double v1) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1));
-    }
-    default boolean apply$mcZD$sp(double v1) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1)));
-    }
-    default int apply$mcID$sp(double v1) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1)));
-    }
-    default float apply$mcFD$sp(double v1) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1)));
-    }
-    default long apply$mcJD$sp(double v1) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1)));
-    }
-    default double apply$mcDD$sp(double v1) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1)));
-    }
-    
-    default scala.Function1 compose$mcVI$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcZI$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcII$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcFI$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcJI$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcDI$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcVJ$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcZJ$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcIJ$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcFJ$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcJJ$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcDJ$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcVF$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcZF$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcIF$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcFF$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcJF$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcDF$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcVD$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcZD$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcID$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcFD$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcJD$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    default scala.Function1 compose$mcDD$sp(scala.Function1 g) {
-        return compose(g);
-    }
-    
-    default scala.Function1 andThen$mcVI$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcZI$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcII$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcFI$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcJI$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcDI$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcVJ$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcZJ$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcIJ$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcFJ$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcJJ$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcDJ$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcVF$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcZF$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcIF$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcFF$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcJF$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcDF$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcVD$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcZD$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcID$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcFD$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcJD$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-    default scala.Function1 andThen$mcDD$sp(scala.Function1 g) {
-        return andThen(g);
-    }
-}
diff --git a/src/library/scala/runtime/java8/JFunction10.java b/src/library/scala/runtime/java8/JFunction10.java
deleted file mode 100644
index f7a25c0df2..0000000000
--- a/src/library/scala/runtime/java8/JFunction10.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> extends scala.Function10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction11.java b/src/library/scala/runtime/java8/JFunction11.java
deleted file mode 100644
index 9a548b8fc9..0000000000
--- a/src/library/scala/runtime/java8/JFunction11.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> extends scala.Function11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction12.java b/src/library/scala/runtime/java8/JFunction12.java
deleted file mode 100644
index 12fb73faaf..0000000000
--- a/src/library/scala/runtime/java8/JFunction12.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> extends scala.Function12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction13.java b/src/library/scala/runtime/java8/JFunction13.java
deleted file mode 100644
index c85c63448a..0000000000
--- a/src/library/scala/runtime/java8/JFunction13.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R> extends scala.Function13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction14.java b/src/library/scala/runtime/java8/JFunction14.java
deleted file mode 100644
index 9a578833aa..0000000000
--- a/src/library/scala/runtime/java8/JFunction14.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R> extends scala.Function14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction15.java b/src/library/scala/runtime/java8/JFunction15.java
deleted file mode 100644
index e993643953..0000000000
--- a/src/library/scala/runtime/java8/JFunction15.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R> extends scala.Function15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction16.java b/src/library/scala/runtime/java8/JFunction16.java
deleted file mode 100644
index a252cb5303..0000000000
--- a/src/library/scala/runtime/java8/JFunction16.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R> extends scala.Function16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction17.java b/src/library/scala/runtime/java8/JFunction17.java
deleted file mode 100644
index 045aa7196f..0000000000
--- a/src/library/scala/runtime/java8/JFunction17.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R> extends scala.Function17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction18.java b/src/library/scala/runtime/java8/JFunction18.java
deleted file mode 100644
index ba2bf31206..0000000000
--- a/src/library/scala/runtime/java8/JFunction18.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R> extends scala.Function18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction19.java b/src/library/scala/runtime/java8/JFunction19.java
deleted file mode 100644
index dde4824293..0000000000
--- a/src/library/scala/runtime/java8/JFunction19.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R> extends scala.Function19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction2$mcDDD$sp.java b/src/library/scala/runtime/java8/JFunction2$mcDDD$sp.java
index 1c11fb5252..80ab5203d9 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcDDD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcDDD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcDDD$sp extends JFunction2 {
+public interface JFunction2$mcDDD$sp extends scala.Function2, java.io.Serializable {
     double apply$mcDDD$sp(double v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDDD$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcDDI$sp.java b/src/library/scala/runtime/java8/JFunction2$mcDDI$sp.java
index e080bc87fa..8e92338b82 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcDDI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcDDI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcDDI$sp extends JFunction2 {
+public interface JFunction2$mcDDI$sp extends scala.Function2, java.io.Serializable {
     double apply$mcDDI$sp(double v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDDI$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcDDJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcDDJ$sp.java
index f96b19dff7..3d4f4a7cde 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcDDJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcDDJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcDDJ$sp extends JFunction2 {
+public interface JFunction2$mcDDJ$sp extends scala.Function2, java.io.Serializable {
     double apply$mcDDJ$sp(double v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDDJ$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcDID$sp.java b/src/library/scala/runtime/java8/JFunction2$mcDID$sp.java
index 944f469a6d..bd6652e51a 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcDID$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcDID$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcDID$sp extends JFunction2 {
+public interface JFunction2$mcDID$sp extends scala.Function2, java.io.Serializable {
     double apply$mcDID$sp(int v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDID$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcDII$sp.java b/src/library/scala/runtime/java8/JFunction2$mcDII$sp.java
index a04f616b5a..d06a246d33 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcDII$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcDII$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcDII$sp extends JFunction2 {
+public interface JFunction2$mcDII$sp extends scala.Function2, java.io.Serializable {
     double apply$mcDII$sp(int v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDII$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcDIJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcDIJ$sp.java
index 3a7d33d4a5..cda23c4dcd 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcDIJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcDIJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcDIJ$sp extends JFunction2 {
+public interface JFunction2$mcDIJ$sp extends scala.Function2, java.io.Serializable {
     double apply$mcDIJ$sp(int v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDIJ$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcDJD$sp.java b/src/library/scala/runtime/java8/JFunction2$mcDJD$sp.java
index 86b48486e6..723efd8451 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcDJD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcDJD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcDJD$sp extends JFunction2 {
+public interface JFunction2$mcDJD$sp extends scala.Function2, java.io.Serializable {
     double apply$mcDJD$sp(long v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDJD$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcDJI$sp.java b/src/library/scala/runtime/java8/JFunction2$mcDJI$sp.java
index b9375c7870..c90352ef30 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcDJI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcDJI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcDJI$sp extends JFunction2 {
+public interface JFunction2$mcDJI$sp extends scala.Function2, java.io.Serializable {
     double apply$mcDJI$sp(long v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDJI$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcDJJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcDJJ$sp.java
index 4adbd17e14..3361219787 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcDJJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcDJJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcDJJ$sp extends JFunction2 {
+public interface JFunction2$mcDJJ$sp extends scala.Function2, java.io.Serializable {
     double apply$mcDJJ$sp(long v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToDouble(apply$mcDJJ$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcFDD$sp.java b/src/library/scala/runtime/java8/JFunction2$mcFDD$sp.java
index 7e53d117c7..2b9236b5d1 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcFDD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcFDD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcFDD$sp extends JFunction2 {
+public interface JFunction2$mcFDD$sp extends scala.Function2, java.io.Serializable {
     float apply$mcFDD$sp(double v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFDD$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcFDI$sp.java b/src/library/scala/runtime/java8/JFunction2$mcFDI$sp.java
index 64c4b2f133..2c564962a7 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcFDI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcFDI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcFDI$sp extends JFunction2 {
+public interface JFunction2$mcFDI$sp extends scala.Function2, java.io.Serializable {
     float apply$mcFDI$sp(double v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFDI$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcFDJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcFDJ$sp.java
index c7ffcbc66a..a0785f4cd2 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcFDJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcFDJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcFDJ$sp extends JFunction2 {
+public interface JFunction2$mcFDJ$sp extends scala.Function2, java.io.Serializable {
     float apply$mcFDJ$sp(double v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFDJ$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcFID$sp.java b/src/library/scala/runtime/java8/JFunction2$mcFID$sp.java
index 43944751e6..ba67ddb593 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcFID$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcFID$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcFID$sp extends JFunction2 {
+public interface JFunction2$mcFID$sp extends scala.Function2, java.io.Serializable {
     float apply$mcFID$sp(int v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFID$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcFII$sp.java b/src/library/scala/runtime/java8/JFunction2$mcFII$sp.java
index a9a4540ca3..d58284b752 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcFII$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcFII$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcFII$sp extends JFunction2 {
+public interface JFunction2$mcFII$sp extends scala.Function2, java.io.Serializable {
     float apply$mcFII$sp(int v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFII$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcFIJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcFIJ$sp.java
index 217615c7a3..4bc6eeb908 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcFIJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcFIJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcFIJ$sp extends JFunction2 {
+public interface JFunction2$mcFIJ$sp extends scala.Function2, java.io.Serializable {
     float apply$mcFIJ$sp(int v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFIJ$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcFJD$sp.java b/src/library/scala/runtime/java8/JFunction2$mcFJD$sp.java
index 8400e47876..f2435e23f7 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcFJD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcFJD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcFJD$sp extends JFunction2 {
+public interface JFunction2$mcFJD$sp extends scala.Function2, java.io.Serializable {
     float apply$mcFJD$sp(long v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFJD$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcFJI$sp.java b/src/library/scala/runtime/java8/JFunction2$mcFJI$sp.java
index e6b6259f96..1362d00e94 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcFJI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcFJI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcFJI$sp extends JFunction2 {
+public interface JFunction2$mcFJI$sp extends scala.Function2, java.io.Serializable {
     float apply$mcFJI$sp(long v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFJI$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcFJJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcFJJ$sp.java
index 68a4c8ecc0..c9bcf515b7 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcFJJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcFJJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcFJJ$sp extends JFunction2 {
+public interface JFunction2$mcFJJ$sp extends scala.Function2, java.io.Serializable {
     float apply$mcFJJ$sp(long v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToFloat(apply$mcFJJ$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcIDD$sp.java b/src/library/scala/runtime/java8/JFunction2$mcIDD$sp.java
index 76fe0b6ead..28693910a5 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcIDD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcIDD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcIDD$sp extends JFunction2 {
+public interface JFunction2$mcIDD$sp extends scala.Function2, java.io.Serializable {
     int apply$mcIDD$sp(double v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcIDD$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcIDI$sp.java b/src/library/scala/runtime/java8/JFunction2$mcIDI$sp.java
index 908078f735..50c775fbd9 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcIDI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcIDI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcIDI$sp extends JFunction2 {
+public interface JFunction2$mcIDI$sp extends scala.Function2, java.io.Serializable {
     int apply$mcIDI$sp(double v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcIDI$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcIDJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcIDJ$sp.java
index 35c943e324..3231aa7a88 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcIDJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcIDJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcIDJ$sp extends JFunction2 {
+public interface JFunction2$mcIDJ$sp extends scala.Function2, java.io.Serializable {
     int apply$mcIDJ$sp(double v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcIDJ$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcIID$sp.java b/src/library/scala/runtime/java8/JFunction2$mcIID$sp.java
index f245ec8788..01568b2fd6 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcIID$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcIID$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcIID$sp extends JFunction2 {
+public interface JFunction2$mcIID$sp extends scala.Function2, java.io.Serializable {
     int apply$mcIID$sp(int v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcIID$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcIII$sp.java b/src/library/scala/runtime/java8/JFunction2$mcIII$sp.java
index f3a7a56dff..e0fba76675 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcIII$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcIII$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcIII$sp extends JFunction2 {
+public interface JFunction2$mcIII$sp extends scala.Function2, java.io.Serializable {
     int apply$mcIII$sp(int v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcIII$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcIIJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcIIJ$sp.java
index 9736196b9e..7155548e9f 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcIIJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcIIJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcIIJ$sp extends JFunction2 {
+public interface JFunction2$mcIIJ$sp extends scala.Function2, java.io.Serializable {
     int apply$mcIIJ$sp(int v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcIIJ$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcIJD$sp.java b/src/library/scala/runtime/java8/JFunction2$mcIJD$sp.java
index 3211432ccb..f541cfdef4 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcIJD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcIJD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcIJD$sp extends JFunction2 {
+public interface JFunction2$mcIJD$sp extends scala.Function2, java.io.Serializable {
     int apply$mcIJD$sp(long v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcIJD$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcIJI$sp.java b/src/library/scala/runtime/java8/JFunction2$mcIJI$sp.java
index 74f76404e0..e484efe427 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcIJI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcIJI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcIJI$sp extends JFunction2 {
+public interface JFunction2$mcIJI$sp extends scala.Function2, java.io.Serializable {
     int apply$mcIJI$sp(long v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcIJI$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcIJJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcIJJ$sp.java
index 7b9060bcb8..ec3538779c 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcIJJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcIJJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcIJJ$sp extends JFunction2 {
+public interface JFunction2$mcIJJ$sp extends scala.Function2, java.io.Serializable {
     int apply$mcIJJ$sp(long v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToInteger(apply$mcIJJ$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcJDD$sp.java b/src/library/scala/runtime/java8/JFunction2$mcJDD$sp.java
index b4595cdf6a..b13502de5b 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcJDD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcJDD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcJDD$sp extends JFunction2 {
+public interface JFunction2$mcJDD$sp extends scala.Function2, java.io.Serializable {
     long apply$mcJDD$sp(double v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJDD$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcJDI$sp.java b/src/library/scala/runtime/java8/JFunction2$mcJDI$sp.java
index 59aad669e7..9ec9adda60 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcJDI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcJDI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcJDI$sp extends JFunction2 {
+public interface JFunction2$mcJDI$sp extends scala.Function2, java.io.Serializable {
     long apply$mcJDI$sp(double v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJDI$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcJDJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcJDJ$sp.java
index 8111e03617..68ef9ead14 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcJDJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcJDJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcJDJ$sp extends JFunction2 {
+public interface JFunction2$mcJDJ$sp extends scala.Function2, java.io.Serializable {
     long apply$mcJDJ$sp(double v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJDJ$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcJID$sp.java b/src/library/scala/runtime/java8/JFunction2$mcJID$sp.java
index 8a06a40a4a..29c9c5e3d3 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcJID$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcJID$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcJID$sp extends JFunction2 {
+public interface JFunction2$mcJID$sp extends scala.Function2, java.io.Serializable {
     long apply$mcJID$sp(int v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJID$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcJII$sp.java b/src/library/scala/runtime/java8/JFunction2$mcJII$sp.java
index 3d2e03ddbc..bb23086125 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcJII$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcJII$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcJII$sp extends JFunction2 {
+public interface JFunction2$mcJII$sp extends scala.Function2, java.io.Serializable {
     long apply$mcJII$sp(int v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJII$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcJIJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcJIJ$sp.java
index 32408269c8..649fe24325 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcJIJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcJIJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcJIJ$sp extends JFunction2 {
+public interface JFunction2$mcJIJ$sp extends scala.Function2, java.io.Serializable {
     long apply$mcJIJ$sp(int v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJIJ$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcJJD$sp.java b/src/library/scala/runtime/java8/JFunction2$mcJJD$sp.java
index cf75bc5c19..8e6071d448 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcJJD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcJJD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcJJD$sp extends JFunction2 {
+public interface JFunction2$mcJJD$sp extends scala.Function2, java.io.Serializable {
     long apply$mcJJD$sp(long v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJJD$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcJJI$sp.java b/src/library/scala/runtime/java8/JFunction2$mcJJI$sp.java
index eddcea671d..61366ac26d 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcJJI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcJJI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcJJI$sp extends JFunction2 {
+public interface JFunction2$mcJJI$sp extends scala.Function2, java.io.Serializable {
     long apply$mcJJI$sp(long v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJJI$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcJJJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcJJJ$sp.java
index 4f5626a3e6..a44e97318e 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcJJJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcJJJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcJJJ$sp extends JFunction2 {
+public interface JFunction2$mcJJJ$sp extends scala.Function2, java.io.Serializable {
     long apply$mcJJJ$sp(long v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToLong(apply$mcJJJ$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcVDD$sp.java b/src/library/scala/runtime/java8/JFunction2$mcVDD$sp.java
index 45b9739c91..8e7cbd7d1b 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcVDD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcVDD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcVDD$sp extends JFunction2 {
+public interface JFunction2$mcVDD$sp extends scala.Function2, java.io.Serializable {
     void apply$mcVDD$sp(double v1, double v2);
 
     default Object apply(Object v1, Object v2) { apply$mcVDD$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcVDI$sp.java b/src/library/scala/runtime/java8/JFunction2$mcVDI$sp.java
index c344ea5017..1dee353d6b 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcVDI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcVDI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcVDI$sp extends JFunction2 {
+public interface JFunction2$mcVDI$sp extends scala.Function2, java.io.Serializable {
     void apply$mcVDI$sp(double v1, int v2);
 
     default Object apply(Object v1, Object v2) { apply$mcVDI$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToInt(v2)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcVDJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcVDJ$sp.java
index 94b01d59d5..0b95608684 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcVDJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcVDJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcVDJ$sp extends JFunction2 {
+public interface JFunction2$mcVDJ$sp extends scala.Function2, java.io.Serializable {
     void apply$mcVDJ$sp(double v1, long v2);
 
     default Object apply(Object v1, Object v2) { apply$mcVDJ$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToLong(v2)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcVID$sp.java b/src/library/scala/runtime/java8/JFunction2$mcVID$sp.java
index 47c29525a7..f0ed7e7e97 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcVID$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcVID$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcVID$sp extends JFunction2 {
+public interface JFunction2$mcVID$sp extends scala.Function2, java.io.Serializable {
     void apply$mcVID$sp(int v1, double v2);
 
     default Object apply(Object v1, Object v2) { apply$mcVID$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcVII$sp.java b/src/library/scala/runtime/java8/JFunction2$mcVII$sp.java
index 546a994cb9..52d7922cc1 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcVII$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcVII$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcVII$sp extends JFunction2 {
+public interface JFunction2$mcVII$sp extends scala.Function2, java.io.Serializable {
     void apply$mcVII$sp(int v1, int v2);
 
     default Object apply(Object v1, Object v2) { apply$mcVII$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToInt(v2)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcVIJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcVIJ$sp.java
index d9871efee3..ac256bf163 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcVIJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcVIJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcVIJ$sp extends JFunction2 {
+public interface JFunction2$mcVIJ$sp extends scala.Function2, java.io.Serializable {
     void apply$mcVIJ$sp(int v1, long v2);
 
     default Object apply(Object v1, Object v2) { apply$mcVIJ$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToLong(v2)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcVJD$sp.java b/src/library/scala/runtime/java8/JFunction2$mcVJD$sp.java
index 525c8ee059..6e2dea3fbf 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcVJD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcVJD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcVJD$sp extends JFunction2 {
+public interface JFunction2$mcVJD$sp extends scala.Function2, java.io.Serializable {
     void apply$mcVJD$sp(long v1, double v2);
 
     default Object apply(Object v1, Object v2) { apply$mcVJD$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcVJI$sp.java b/src/library/scala/runtime/java8/JFunction2$mcVJI$sp.java
index 98f33bf942..d1cba439e6 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcVJI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcVJI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcVJI$sp extends JFunction2 {
+public interface JFunction2$mcVJI$sp extends scala.Function2, java.io.Serializable {
     void apply$mcVJI$sp(long v1, int v2);
 
     default Object apply(Object v1, Object v2) { apply$mcVJI$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToInt(v2)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcVJJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcVJJ$sp.java
index adb8934b57..67f848a60e 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcVJJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcVJJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcVJJ$sp extends JFunction2 {
+public interface JFunction2$mcVJJ$sp extends scala.Function2, java.io.Serializable {
     void apply$mcVJJ$sp(long v1, long v2);
 
     default Object apply(Object v1, Object v2) { apply$mcVJJ$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToLong(v2)); return scala.runtime.BoxedUnit.UNIT; }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcZDD$sp.java b/src/library/scala/runtime/java8/JFunction2$mcZDD$sp.java
index 9272e025a6..b430c5f134 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcZDD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcZDD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcZDD$sp extends JFunction2 {
+public interface JFunction2$mcZDD$sp extends scala.Function2, java.io.Serializable {
     boolean apply$mcZDD$sp(double v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZDD$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcZDI$sp.java b/src/library/scala/runtime/java8/JFunction2$mcZDI$sp.java
index 4406e00abd..01fb8ba003 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcZDI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcZDI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcZDI$sp extends JFunction2 {
+public interface JFunction2$mcZDI$sp extends scala.Function2, java.io.Serializable {
     boolean apply$mcZDI$sp(double v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZDI$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcZDJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcZDJ$sp.java
index 1f92dddfaf..a7d28e3cfc 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcZDJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcZDJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcZDJ$sp extends JFunction2 {
+public interface JFunction2$mcZDJ$sp extends scala.Function2, java.io.Serializable {
     boolean apply$mcZDJ$sp(double v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZDJ$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcZID$sp.java b/src/library/scala/runtime/java8/JFunction2$mcZID$sp.java
index 06b73f9897..e77719bf75 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcZID$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcZID$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcZID$sp extends JFunction2 {
+public interface JFunction2$mcZID$sp extends scala.Function2, java.io.Serializable {
     boolean apply$mcZID$sp(int v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZID$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcZII$sp.java b/src/library/scala/runtime/java8/JFunction2$mcZII$sp.java
index 729f86063f..5f1f83aaf8 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcZII$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcZII$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcZII$sp extends JFunction2 {
+public interface JFunction2$mcZII$sp extends scala.Function2, java.io.Serializable {
     boolean apply$mcZII$sp(int v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZII$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcZIJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcZIJ$sp.java
index 38da681cd1..38fabd6f69 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcZIJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcZIJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcZIJ$sp extends JFunction2 {
+public interface JFunction2$mcZIJ$sp extends scala.Function2, java.io.Serializable {
     boolean apply$mcZIJ$sp(int v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZIJ$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcZJD$sp.java b/src/library/scala/runtime/java8/JFunction2$mcZJD$sp.java
index 6dc9534811..59c82cb01e 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcZJD$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcZJD$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcZJD$sp extends JFunction2 {
+public interface JFunction2$mcZJD$sp extends scala.Function2, java.io.Serializable {
     boolean apply$mcZJD$sp(long v1, double v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZJD$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcZJI$sp.java b/src/library/scala/runtime/java8/JFunction2$mcZJI$sp.java
index a86f63be36..3e73b8a794 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcZJI$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcZJI$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcZJI$sp extends JFunction2 {
+public interface JFunction2$mcZJI$sp extends scala.Function2, java.io.Serializable {
     boolean apply$mcZJI$sp(long v1, int v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZJI$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToInt(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2$mcZJJ$sp.java b/src/library/scala/runtime/java8/JFunction2$mcZJJ$sp.java
index 728a781e8e..96a14e98a5 100644
--- a/src/library/scala/runtime/java8/JFunction2$mcZJJ$sp.java
+++ b/src/library/scala/runtime/java8/JFunction2$mcZJJ$sp.java
@@ -6,7 +6,7 @@
 package scala.runtime.java8;
 
 @FunctionalInterface
-public interface JFunction2$mcZJJ$sp extends JFunction2 {
+public interface JFunction2$mcZJJ$sp extends scala.Function2, java.io.Serializable {
     boolean apply$mcZJJ$sp(long v1, long v2);
 
     default Object apply(Object v1, Object v2) { return scala.runtime.BoxesRunTime.boxToBoolean(apply$mcZJJ$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToLong(v2))); }
diff --git a/src/library/scala/runtime/java8/JFunction2.java b/src/library/scala/runtime/java8/JFunction2.java
deleted file mode 100644
index 548ff60cf6..0000000000
--- a/src/library/scala/runtime/java8/JFunction2.java
+++ /dev/null
@@ -1,498 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction2<T1, T2, R> extends scala.Function2<T1, T2, R>, java.io.Serializable {
-    default void apply$mcVII$sp(int v1, int v2) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2));
-    }
-    default boolean apply$mcZII$sp(int v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default int apply$mcIII$sp(int v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default float apply$mcFII$sp(int v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default long apply$mcJII$sp(int v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default double apply$mcDII$sp(int v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default void apply$mcVIJ$sp(int v1, long v2) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2));
-    }
-    default boolean apply$mcZIJ$sp(int v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default int apply$mcIIJ$sp(int v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default float apply$mcFIJ$sp(int v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default long apply$mcJIJ$sp(int v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default double apply$mcDIJ$sp(int v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default void apply$mcVID$sp(int v1, double v2) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2));
-    }
-    default boolean apply$mcZID$sp(int v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default int apply$mcIID$sp(int v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default float apply$mcFID$sp(int v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default long apply$mcJID$sp(int v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default double apply$mcDID$sp(int v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default void apply$mcVJI$sp(long v1, int v2) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2));
-    }
-    default boolean apply$mcZJI$sp(long v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default int apply$mcIJI$sp(long v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default float apply$mcFJI$sp(long v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default long apply$mcJJI$sp(long v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default double apply$mcDJI$sp(long v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default void apply$mcVJJ$sp(long v1, long v2) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2));
-    }
-    default boolean apply$mcZJJ$sp(long v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default int apply$mcIJJ$sp(long v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default float apply$mcFJJ$sp(long v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default long apply$mcJJJ$sp(long v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default double apply$mcDJJ$sp(long v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default void apply$mcVJD$sp(long v1, double v2) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2));
-    }
-    default boolean apply$mcZJD$sp(long v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default int apply$mcIJD$sp(long v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default float apply$mcFJD$sp(long v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default long apply$mcJJD$sp(long v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default double apply$mcDJD$sp(long v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToLong(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default void apply$mcVDI$sp(double v1, int v2) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2));
-    }
-    default boolean apply$mcZDI$sp(double v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default int apply$mcIDI$sp(double v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default float apply$mcFDI$sp(double v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default long apply$mcJDI$sp(double v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default double apply$mcDDI$sp(double v1, int v2) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2)));
-    }
-    default void apply$mcVDJ$sp(double v1, long v2) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2));
-    }
-    default boolean apply$mcZDJ$sp(double v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default int apply$mcIDJ$sp(double v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default float apply$mcFDJ$sp(double v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default long apply$mcJDJ$sp(double v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default double apply$mcDDJ$sp(double v1, long v2) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToLong(v2)));
-    }
-    default void apply$mcVDD$sp(double v1, double v2) {
-        apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2));
-    }
-    default boolean apply$mcZDD$sp(double v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default int apply$mcIDD$sp(double v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default float apply$mcFDD$sp(double v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default long apply$mcJDD$sp(double v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    default double apply$mcDDD$sp(double v1, double v2) {
-        return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) scala.runtime.BoxesRunTime.boxToDouble(v1), (T2) scala.runtime.BoxesRunTime.boxToDouble(v2)));
-    }
-    
-    default scala.Function1 curried$mcVII$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcZII$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcIII$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcFII$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcJII$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcDII$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcVIJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcZIJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcIIJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcFIJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcJIJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcDIJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcVID$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcZID$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcIID$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcFID$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcJID$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcDID$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcVJI$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcZJI$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcIJI$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcFJI$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcJJI$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcDJI$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcVJJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcZJJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcIJJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcFJJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcJJJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcDJJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcVJD$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcZJD$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcIJD$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcFJD$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcJJD$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcDJD$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcVDI$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcZDI$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcIDI$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcFDI$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcJDI$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcDDI$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcVDJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcZDJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcIDJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcFDJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcJDJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcDDJ$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcVDD$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcZDD$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcIDD$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcFDD$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcJDD$sp() {
-        return curried();
-    }
-    default scala.Function1 curried$mcDDD$sp() {
-        return curried();
-    }
-    
-    default scala.Function1 tupled$mcVII$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcZII$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcIII$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcFII$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcJII$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcDII$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcVIJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcZIJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcIIJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcFIJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcJIJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcDIJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcVID$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcZID$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcIID$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcFID$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcJID$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcDID$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcVJI$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcZJI$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcIJI$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcFJI$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcJJI$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcDJI$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcVJJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcZJJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcIJJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcFJJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcJJJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcDJJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcVJD$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcZJD$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcIJD$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcFJD$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcJJD$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcDJD$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcVDI$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcZDI$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcIDI$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcFDI$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcJDI$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcDDI$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcVDJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcZDJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcIDJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcFDJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcJDJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcDDJ$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcVDD$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcZDD$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcIDD$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcFDD$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcJDD$sp() {
-        return tupled();
-    }
-    default scala.Function1 tupled$mcDDD$sp() {
-        return tupled();
-    }
-}
diff --git a/src/library/scala/runtime/java8/JFunction20.java b/src/library/scala/runtime/java8/JFunction20.java
deleted file mode 100644
index 5505743c20..0000000000
--- a/src/library/scala/runtime/java8/JFunction20.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R> extends scala.Function20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction21.java b/src/library/scala/runtime/java8/JFunction21.java
deleted file mode 100644
index 80e96d3715..0000000000
--- a/src/library/scala/runtime/java8/JFunction21.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R> extends scala.Function21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction22.java b/src/library/scala/runtime/java8/JFunction22.java
deleted file mode 100644
index 45e689458b..0000000000
--- a/src/library/scala/runtime/java8/JFunction22.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R> extends scala.Function22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction3.java b/src/library/scala/runtime/java8/JFunction3.java
deleted file mode 100644
index 6d81bb3a18..0000000000
--- a/src/library/scala/runtime/java8/JFunction3.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction3<T1, T2, T3, R> extends scala.Function3<T1, T2, T3, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction4.java b/src/library/scala/runtime/java8/JFunction4.java
deleted file mode 100644
index 6c5cd3b61d..0000000000
--- a/src/library/scala/runtime/java8/JFunction4.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction4<T1, T2, T3, T4, R> extends scala.Function4<T1, T2, T3, T4, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction5.java b/src/library/scala/runtime/java8/JFunction5.java
deleted file mode 100644
index eca1a406a6..0000000000
--- a/src/library/scala/runtime/java8/JFunction5.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction5<T1, T2, T3, T4, T5, R> extends scala.Function5<T1, T2, T3, T4, T5, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction6.java b/src/library/scala/runtime/java8/JFunction6.java
deleted file mode 100644
index 1c9daed5aa..0000000000
--- a/src/library/scala/runtime/java8/JFunction6.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction6<T1, T2, T3, T4, T5, T6, R> extends scala.Function6<T1, T2, T3, T4, T5, T6, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction7.java b/src/library/scala/runtime/java8/JFunction7.java
deleted file mode 100644
index c1aa130ba1..0000000000
--- a/src/library/scala/runtime/java8/JFunction7.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction7<T1, T2, T3, T4, T5, T6, T7, R> extends scala.Function7<T1, T2, T3, T4, T5, T6, T7, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction8.java b/src/library/scala/runtime/java8/JFunction8.java
deleted file mode 100644
index 425e694df8..0000000000
--- a/src/library/scala/runtime/java8/JFunction8.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction8<T1, T2, T3, T4, T5, T6, T7, T8, R> extends scala.Function8<T1, T2, T3, T4, T5, T6, T7, T8, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JFunction9.java b/src/library/scala/runtime/java8/JFunction9.java
deleted file mode 100644
index 21c3c8c6e3..0000000000
--- a/src/library/scala/runtime/java8/JFunction9.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-@FunctionalInterface
-public interface JFunction9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> extends scala.Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R>, java.io.Serializable {
-}
diff --git a/src/library/scala/runtime/java8/JProcedure0.java b/src/library/scala/runtime/java8/JProcedure0.java
deleted file mode 100644
index 6004364d03..0000000000
--- a/src/library/scala/runtime/java8/JProcedure0.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure0 extends JFunction0<BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid();
-
-    default BoxedUnit apply() {
-        applyVoid();
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure1.java b/src/library/scala/runtime/java8/JProcedure1.java
deleted file mode 100644
index 184d943042..0000000000
--- a/src/library/scala/runtime/java8/JProcedure1.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure1<T1> extends JFunction1<T1, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1);
-
-    default BoxedUnit apply(T1 t1) {
-        applyVoid(t1);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure10.java b/src/library/scala/runtime/java8/JProcedure10.java
deleted file mode 100644
index 2aadd7d215..0000000000
--- a/src/library/scala/runtime/java8/JProcedure10.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends JFunction10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure11.java b/src/library/scala/runtime/java8/JProcedure11.java
deleted file mode 100644
index c29853be1f..0000000000
--- a/src/library/scala/runtime/java8/JProcedure11.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends JFunction11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure12.java b/src/library/scala/runtime/java8/JProcedure12.java
deleted file mode 100644
index 0607600c33..0000000000
--- a/src/library/scala/runtime/java8/JProcedure12.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends JFunction12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure13.java b/src/library/scala/runtime/java8/JProcedure13.java
deleted file mode 100644
index c390fed2a5..0000000000
--- a/src/library/scala/runtime/java8/JProcedure13.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> extends JFunction13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure14.java b/src/library/scala/runtime/java8/JProcedure14.java
deleted file mode 100644
index d67cff1b5a..0000000000
--- a/src/library/scala/runtime/java8/JProcedure14.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> extends JFunction14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure15.java b/src/library/scala/runtime/java8/JProcedure15.java
deleted file mode 100644
index 81e0f524f5..0000000000
--- a/src/library/scala/runtime/java8/JProcedure15.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> extends JFunction15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure16.java b/src/library/scala/runtime/java8/JProcedure16.java
deleted file mode 100644
index 3d29ae25c5..0000000000
--- a/src/library/scala/runtime/java8/JProcedure16.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> extends JFunction16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure17.java b/src/library/scala/runtime/java8/JProcedure17.java
deleted file mode 100644
index 85f40b2cd5..0000000000
--- a/src/library/scala/runtime/java8/JProcedure17.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> extends JFunction17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure18.java b/src/library/scala/runtime/java8/JProcedure18.java
deleted file mode 100644
index fe2ab6f22c..0000000000
--- a/src/library/scala/runtime/java8/JProcedure18.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> extends JFunction18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure19.java b/src/library/scala/runtime/java8/JProcedure19.java
deleted file mode 100644
index 9289d639a5..0000000000
--- a/src/library/scala/runtime/java8/JProcedure19.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> extends JFunction19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure2.java b/src/library/scala/runtime/java8/JProcedure2.java
deleted file mode 100644
index 273357a3b0..0000000000
--- a/src/library/scala/runtime/java8/JProcedure2.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure2<T1, T2> extends JFunction2<T1, T2, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2);
-
-    default BoxedUnit apply(T1 t1, T2 t2) {
-        applyVoid(t1, t2);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure20.java b/src/library/scala/runtime/java8/JProcedure20.java
deleted file mode 100644
index 8701e9d422..0000000000
--- a/src/library/scala/runtime/java8/JProcedure20.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> extends JFunction20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure21.java b/src/library/scala/runtime/java8/JProcedure21.java
deleted file mode 100644
index f8e38f6c70..0000000000
--- a/src/library/scala/runtime/java8/JProcedure21.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> extends JFunction21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure22.java b/src/library/scala/runtime/java8/JProcedure22.java
deleted file mode 100644
index 8bae4d7e0d..0000000000
--- a/src/library/scala/runtime/java8/JProcedure22.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends JFunction22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21, T22 t22);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21, T22 t22) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21, t22);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure3.java b/src/library/scala/runtime/java8/JProcedure3.java
deleted file mode 100644
index 7c53187f31..0000000000
--- a/src/library/scala/runtime/java8/JProcedure3.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure3<T1, T2, T3> extends JFunction3<T1, T2, T3, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3) {
-        applyVoid(t1, t2, t3);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure4.java b/src/library/scala/runtime/java8/JProcedure4.java
deleted file mode 100644
index 33161bc151..0000000000
--- a/src/library/scala/runtime/java8/JProcedure4.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure4<T1, T2, T3, T4> extends JFunction4<T1, T2, T3, T4, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4) {
-        applyVoid(t1, t2, t3, t4);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure5.java b/src/library/scala/runtime/java8/JProcedure5.java
deleted file mode 100644
index c834c48bf6..0000000000
--- a/src/library/scala/runtime/java8/JProcedure5.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure5<T1, T2, T3, T4, T5> extends JFunction5<T1, T2, T3, T4, T5, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) {
-        applyVoid(t1, t2, t3, t4, t5);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure6.java b/src/library/scala/runtime/java8/JProcedure6.java
deleted file mode 100644
index 995bdd6734..0000000000
--- a/src/library/scala/runtime/java8/JProcedure6.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure6<T1, T2, T3, T4, T5, T6> extends JFunction6<T1, T2, T3, T4, T5, T6, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) {
-        applyVoid(t1, t2, t3, t4, t5, t6);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure7.java b/src/library/scala/runtime/java8/JProcedure7.java
deleted file mode 100644
index 1821d8d406..0000000000
--- a/src/library/scala/runtime/java8/JProcedure7.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure7<T1, T2, T3, T4, T5, T6, T7> extends JFunction7<T1, T2, T3, T4, T5, T6, T7, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure8.java b/src/library/scala/runtime/java8/JProcedure8.java
deleted file mode 100644
index 4b9dd0929a..0000000000
--- a/src/library/scala/runtime/java8/JProcedure8.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure8<T1, T2, T3, T4, T5, T6, T7, T8> extends JFunction8<T1, T2, T3, T4, T5, T6, T7, T8, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8);
-        return BoxedUnit.UNIT;
-    }
-}
diff --git a/src/library/scala/runtime/java8/JProcedure9.java b/src/library/scala/runtime/java8/JProcedure9.java
deleted file mode 100644
index c4cbc65b6c..0000000000
--- a/src/library/scala/runtime/java8/JProcedure9.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package scala.runtime.java8;
-
-import scala.runtime.BoxedUnit;
-
-@FunctionalInterface
-public interface JProcedure9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends JFunction9<T1, T2, T3, T4, T5, T6, T7, T8, T9, BoxedUnit> {
-    default void $init$() {
-    }
-
-    void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9);
-
-    default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9) {
-        applyVoid(t1, t2, t3, t4, t5, t6, t7, t8, t9);
-        return BoxedUnit.UNIT;
-    }
-}
-- 
cgit v1.2.3