Skip to content
This repository has been archived by the owner. It is now read-only.

Commit 1fdb75c

Browse files
committed
Merge branch '1.0.x' into merge-1.0.x-into-1.x
* 1.0.x: (28 commits) Split compiler bridge tests to another subproject Implement compiler bridge for 2.13.0-M2 Add yourkit acknoledgement in the README "sbt '++ 2.13.0-M2!' compile" does not work with sbt 1.0.0 Add header to cached hashing spec Add headers to missing files Fix #332: Add sbt-header back to the build Update sbt-scalafmt to 1.12 Make classpath hashing more lightweight Fix #442: Name hash of value class should include underlying type source-dependencies/value-class-underlying: fix test Ignore null in generic lambda tparams Improve and make scripted parallel Fix #436: Remove annoying log4j scripted exception Fix #127: Use `unexpanded` name instead of `name` Add pending test case for issue/127 source-dependencies / patMat-scope workaround Fixes undercompilation on inheritance on same source Add real reproduction case for sbt/zinc#417 Add trait-trait-212 for Scala 2.12.3 ... Conflicts: internal/zinc-apiinfo/src/main/scala/sbt/internal/inc/ClassToAPI.scala project/build.properties zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala The ClassToAPI conflict is due to: * sbt/zinc#393 (a 1.x PR), conflicting with * sbt/zinc#446 (a 1.0.x PR). The build.properties conflict is due to different PRs bumping sbt.version from 1.0.0 to 1.0.2 to 1.0.3. (#413, #418, #453). The MixedAnalyzingCompiler conflict is due to: * sbt/zinc#427 (a 1.x PR), conflicting with * sbt/zinc#452 (a 1.0.x PR).
2 parents 6c009b8 + 66d449c commit 1fdb75c

4 files changed

+64
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Zinc - The incremental compiler for Scala.
3+
* Copyright 2011 - 2017, Lightbend, Inc.
4+
* Copyright 2008 - 2010, Mark Harrah
5+
* This software is released under the terms written in LICENSE.
6+
*/
7+
8+
package xsbti;
9+
10+
public interface InteractiveConsoleFactory {
11+
InteractiveConsoleInterface createConsole(
12+
String[] args,
13+
String bootClasspathString,
14+
String classpathString,
15+
String initialCommands,
16+
String cleanupCommands,
17+
ClassLoader loader,
18+
String[] bindNames,
19+
Object[] bindValues,
20+
Logger log
21+
);
22+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/*
2+
* Zinc - The incremental compiler for Scala.
3+
* Copyright 2011 - 2017, Lightbend, Inc.
4+
* Copyright 2008 - 2010, Mark Harrah
5+
* This software is released under the terms written in LICENSE.
6+
*/
7+
8+
package xsbti;
9+
10+
public interface InteractiveConsoleInterface {
11+
void reset();
12+
InteractiveConsoleResponse interpret(String line, boolean synthetic);
13+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* Zinc - The incremental compiler for Scala.
3+
* Copyright 2011 - 2017, Lightbend, Inc.
4+
* Copyright 2008 - 2010, Mark Harrah
5+
* This software is released under the terms written in LICENSE.
6+
*/
7+
8+
package xsbti;
9+
10+
/** Public interface for repl responses. */
11+
public interface InteractiveConsoleResponse {
12+
InteractiveConsoleResult result();
13+
14+
String output();
15+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*
2+
* Zinc - The incremental compiler for Scala.
3+
* Copyright 2011 - 2017, Lightbend, Inc.
4+
* Copyright 2008 - 2010, Mark Harrah
5+
* This software is released under the terms written in LICENSE.
6+
*/
7+
8+
package xsbti;
9+
10+
public enum InteractiveConsoleResult {
11+
Success,
12+
Incomplete,
13+
Error
14+
}

0 commit comments

Comments
 (0)