-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 sbt#332: Add sbt-header back to the build Update sbt-scalafmt to 1.12 Make classpath hashing more lightweight Fix sbt#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 sbt#436: Remove annoying log4j scripted exception Fix sbt#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#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#393 (a 1.x PR), conflicting with * sbt#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. (sbt#413, sbt#418, sbt#453). The MixedAnalyzingCompiler conflict is due to: * sbt#427 (a 1.x PR), conflicting with * sbt#452 (a 1.0.x PR).
- Loading branch information
Showing
96 changed files
with
1,235 additions
and
120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
#!/bin/bash | ||
|
||
# This is a hack to validate the compilation of 2.13 compiler bridge without using sbt, | ||
# which was used for bootstrapping the initial compiler bridge. | ||
# In the future when Scala compiler breaks source compatibility, this script might come in handy. | ||
|
||
# $ export SCALA_X_HOME=/usr/local/Cellar/scala@2.13/2.13.0-M2 | ||
|
||
if [[ -z "$SCALA_X_HOME" ]]; then | ||
echo "SCALA_X_HOME is not set!" 1>&2 | ||
echo "Run 'export SCALA_X_HOME=/usr/local/Cellar/scala@2.13/2.13.0-M2' or equivalent." | ||
exit 1 | ||
fi | ||
|
||
mkdir -p target/compiler-bridge/ | ||
|
||
"$SCALA_X_HOME/bin/scalac" \ | ||
-nowarn \ | ||
-classpath $HOME/.ivy2/cache/org.scala-sbt/compiler-interface/jars/compiler-interface-1.0.3.jar:$HOME/.ivy2/cache/org.scala-sbt/util-interface/jars/util-interface-1.0.2.jar \ | ||
-d target/compiler-bridge/ \ | ||
internal/compiler-bridge/src/main/scala/xsbt/API.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/DelegatingReporter.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/InteractiveConsoleInterface.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/ScaladocInterface.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/Analyzer.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/InteractiveConsoleResponse.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/CallbackGlobal.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/ExtractAPI.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/JavaUtils.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/ClassName.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/ExtractUsedNames.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/LocalToNonLocalClass.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/Command.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/GlobalHelpers.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/LocateClassFile.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/CompilerInterface.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/InteractiveConsoleFactory.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/Log.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/InteractiveConsoleHelper.scala \ | ||
internal/compiler-bridge/src/main/scala/xsbt/Message.scala \ | ||
internal/compiler-bridge/src/main/scala_2.13/xsbt/Compat.scala \ | ||
internal/compiler-bridge/src/main/scala_2.13/xsbt/ConsoleInterface.scala |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
internal/compiler-bridge/src/main/mima-filters/1.0.0.backwards.excludes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# xsbti Java interfaces must be defined in the compiler interface, not the bridge. | ||
# Bridge implementations are compiled per Zinc, so these are safe to change. | ||
ProblemFilters.exclude[MissingClassProblem]("xsbti.InteractiveConsoleFactory") | ||
ProblemFilters.exclude[MissingClassProblem]("xsbti.InteractiveConsoleResult") | ||
ProblemFilters.exclude[MissingClassProblem]("xsbti.InteractiveConsoleInterface") | ||
ProblemFilters.exclude[MissingClassProblem]("xsbti.InteractiveConsoleResponse") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.