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

Commit

Permalink
Merge branch '1.0.x' into merge-1.0.x-into-1.x
Browse files Browse the repository at this point in the history
* 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).
  • Loading branch information
dwijnand committed Nov 23, 2017
2 parents 6c009b8 + 66d449c commit 1fdb75c
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 0 deletions.
22 changes: 22 additions & 0 deletions src/main/java/xsbti/InteractiveConsoleFactory.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Zinc - The incremental compiler for Scala.
* Copyright 2011 - 2017, Lightbend, Inc.
* Copyright 2008 - 2010, Mark Harrah
* This software is released under the terms written in LICENSE.
*/

package xsbti;

public interface InteractiveConsoleFactory {
InteractiveConsoleInterface createConsole(
String[] args,
String bootClasspathString,
String classpathString,
String initialCommands,
String cleanupCommands,
ClassLoader loader,
String[] bindNames,
Object[] bindValues,
Logger log
);
}
13 changes: 13 additions & 0 deletions src/main/java/xsbti/InteractiveConsoleInterface.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
* Zinc - The incremental compiler for Scala.
* Copyright 2011 - 2017, Lightbend, Inc.
* Copyright 2008 - 2010, Mark Harrah
* This software is released under the terms written in LICENSE.
*/

package xsbti;

public interface InteractiveConsoleInterface {
void reset();
InteractiveConsoleResponse interpret(String line, boolean synthetic);
}
15 changes: 15 additions & 0 deletions src/main/java/xsbti/InteractiveConsoleResponse.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* Zinc - The incremental compiler for Scala.
* Copyright 2011 - 2017, Lightbend, Inc.
* Copyright 2008 - 2010, Mark Harrah
* This software is released under the terms written in LICENSE.
*/

package xsbti;

/** Public interface for repl responses. */
public interface InteractiveConsoleResponse {
InteractiveConsoleResult result();

String output();
}
14 changes: 14 additions & 0 deletions src/main/java/xsbti/InteractiveConsoleResult.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* Zinc - The incremental compiler for Scala.
* Copyright 2011 - 2017, Lightbend, Inc.
* Copyright 2008 - 2010, Mark Harrah
* This software is released under the terms written in LICENSE.
*/

package xsbti;

public enum InteractiveConsoleResult {
Success,
Incomplete,
Error
}

0 comments on commit 1fdb75c

Please sign in to comment.