Merge branch 'pr/359' into wip/integration

Author: eed3si9n

src/main/contraband-java/xsbti/compile/CompileOptions.java

@@ -13,10 +13,10 @@ public static CompileOptions create() {
     public static CompileOptions of() {
         return new CompileOptions();
     }
-    public static CompileOptions create(java.io.File[] _classpath, java.io.File[] _sources, java.io.File _classesDirectory, String[] _scalacOptions, String[] _javacOptions, int _maxErrors, xsbti.F1<xsbti.Position, xsbti.Position> _sourcePositionMapper, xsbti.compile.CompileOrder _order) {
+    public static CompileOptions create(java.io.File[] _classpath, java.io.File[] _sources, java.io.File _classesDirectory, String[] _scalacOptions, String[] _javacOptions, int _maxErrors, java.util.function.Function<xsbti.Position, xsbti.Position> _sourcePositionMapper, xsbti.compile.CompileOrder _order) {
         return new CompileOptions(_classpath, _sources, _classesDirectory, _scalacOptions, _javacOptions, _maxErrors, _sourcePositionMapper, _order);
     }
-    public static CompileOptions of(java.io.File[] _classpath, java.io.File[] _sources, java.io.File _classesDirectory, String[] _scalacOptions, String[] _javacOptions, int _maxErrors, xsbti.F1<xsbti.Position, xsbti.Position> _sourcePositionMapper, xsbti.compile.CompileOrder _order) {
+    public static CompileOptions of(java.io.File[] _classpath, java.io.File[] _sources, java.io.File _classesDirectory, String[] _scalacOptions, String[] _javacOptions, int _maxErrors, java.util.function.Function<xsbti.Position, xsbti.Position> _sourcePositionMapper, xsbti.compile.CompileOrder _order) {
         return new CompileOptions(_classpath, _sources, _classesDirectory, _scalacOptions, _javacOptions, _maxErrors, _sourcePositionMapper, _order);
     }
     /**
@@ -35,7 +35,7 @@ public static CompileOptions of(java.io.File[] _classpath, java.io.File[] _sourc
     /** The options to pass to the Java compiler other than the sources and classpath to use. */
     private String[] javacOptions;
     private int maxErrors;
-    private xsbti.F1<xsbti.Position, xsbti.Position> sourcePositionMapper;
+    private java.util.function.Function<xsbti.Position, xsbti.Position> sourcePositionMapper;
     /** Controls the order in which Java and Scala sources are compiled. */
     private xsbti.compile.CompileOrder order;
     protected CompileOptions() {
@@ -46,10 +46,10 @@ protected CompileOptions() {
         scalacOptions = new String[0];
         javacOptions = new String[0];
         maxErrors = 100;
-        sourcePositionMapper = new xsbti.F1<xsbti.Position, xsbti.Position>() { public xsbti.Position apply(xsbti.Position a) { return a; } };
+        sourcePositionMapper = new java.util.function.Function<xsbti.Position, xsbti.Position>() { public xsbti.Position apply(xsbti.Position a) { return a; } };
         order = xsbti.compile.CompileOrder.Mixed;
     }
-    protected CompileOptions(java.io.File[] _classpath, java.io.File[] _sources, java.io.File _classesDirectory, String[] _scalacOptions, String[] _javacOptions, int _maxErrors, xsbti.F1<xsbti.Position, xsbti.Position> _sourcePositionMapper, xsbti.compile.CompileOrder _order) {
+    protected CompileOptions(java.io.File[] _classpath, java.io.File[] _sources, java.io.File _classesDirectory, String[] _scalacOptions, String[] _javacOptions, int _maxErrors, java.util.function.Function<xsbti.Position, xsbti.Position> _sourcePositionMapper, xsbti.compile.CompileOrder _order) {
         super();
         classpath = _classpath;
         sources = _sources;
@@ -78,7 +78,7 @@ public String[] javacOptions() {
     public int maxErrors() {
         return this.maxErrors;
     }
-    public xsbti.F1<xsbti.Position, xsbti.Position> sourcePositionMapper() {
+    public java.util.function.Function<xsbti.Position, xsbti.Position> sourcePositionMapper() {
         return this.sourcePositionMapper;
     }
     public xsbti.compile.CompileOrder order() {
@@ -102,7 +102,7 @@ public CompileOptions withJavacOptions(String[] javacOptions) {
     public CompileOptions withMaxErrors(int maxErrors) {
         return new CompileOptions(classpath, sources, classesDirectory, scalacOptions, javacOptions, maxErrors, sourcePositionMapper, order);
     }
-    public CompileOptions withSourcePositionMapper(xsbti.F1<xsbti.Position, xsbti.Position> sourcePositionMapper) {
+    public CompileOptions withSourcePositionMapper(java.util.function.Function<xsbti.Position, xsbti.Position> sourcePositionMapper) {
         return new CompileOptions(classpath, sources, classesDirectory, scalacOptions, javacOptions, maxErrors, sourcePositionMapper, order);
     }
     public CompileOptions withOrder(xsbti.compile.CompileOrder order) {

src/main/contraband/incremental.json

@@ -301,8 +301,8 @@
         },
         {
           "name": "sourcePositionMapper",
-          "type": "xsbti.F1<xsbti.Position, xsbti.Position>",
-          "default": "new xsbti.F1<xsbti.Position, xsbti.Position>() { public xsbti.Position apply(xsbti.Position a) { return a; } }",
+          "type": "java.util.function.Function<xsbti.Position, xsbti.Position>",
+          "default": "new java.util.function.Function<xsbti.Position, xsbti.Position>() { public xsbti.Position apply(xsbti.Position a) { return a; } }",
           "since": "0.1.0"
         },
         {

src/main/java/xsbti/api/SafeLazy.java

@@ -7,40 +7,43 @@
 
 package xsbti.api;
 
+import java.util.function.Supplier;
+
 /**
  * Implement a Scala `lazy val` in Java for the facing sbt interface.
  *
  * It holds a reference to a thunk that is lazily evaluated and then
  * its reference is clear to avoid memory leaks in memory-intensive code.
- * It needs to be defined in [[xsbti]] or a subpackage, see
- * [[xsbti.api.Lazy]] or [[xsbti.F0]] for similar definitions.
+ * It needs to be defined in [[xsbti]] or a subpackage, see [[xsbti.api.Lazy]]
+ * for similar definitions.
  */
 public final class SafeLazy {
 
   /* We do not use conversions from and to Scala functions because [[xsbti]]
    * cannot hold any reference to Scala code nor the Scala library. */
 
   /** Return a sbt [[xsbti.api.Lazy]] from a given Scala parameterless function. */
-  public static <T> xsbti.api.Lazy<T> apply(xsbti.F0<T> sbtThunk) {
+  public static <T> xsbti.api.Lazy<T> apply(Supplier<T> sbtThunk) {
     return new Impl<T>(sbtThunk);
   }
 
   /** Return a sbt [[xsbti.api.Lazy]] from a strict value. */
   public static <T> xsbti.api.Lazy<T> strict(T value) {
     // Convert strict parameter to sbt function returning it
-    return apply(new xsbti.F0<T>() {
-      public T apply() {
+    return apply(new Supplier<T>() {
+      @Override
+      public T get() {
         return value;
       }
     });
   }
 
   private static final class Impl<T> extends xsbti.api.AbstractLazy<T> {
-    private xsbti.F0<T> thunk;
+    private Supplier<T> thunk;
     private T result;
     private boolean flag = false;
 
-    Impl(xsbti.F0<T> thunk) {
+    Impl(Supplier<T> thunk) {
       this.thunk = thunk;
     }
 
@@ -52,7 +55,7 @@ private static final class Impl<T> extends xsbti.api.AbstractLazy<T> {
     public T get() {
       if (flag) return result;
       else {
-        result = thunk.apply();
+        result = thunk.get();
         flag = true;
         // Clear reference so that thunk is GC'ed
         thunk = null;