8000 Merge 2.12.x to 2.13.x [ci: last-only] by SethTisue · Pull Request #5862 · scala/scala · GitHub
[go: up one dir, main page]
Skip to content

Merge 2.12.x to 2.13.x [ci: last-only] #5862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 37 commits into from
Apr 24, 2017
Merged

Merge 2.12.x to 2.13.x [ci: last-only] #5862

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
5cd3442
Better diagnostic for failing jvm/future-spec
retronym Mar 30, 2017
8ae0fda
Avoid needless work in the specialization info transform in the backend
retronym Feb 4, 2017
e65b714
Optimize SpecializeTypes#satisfiable
retronym Mar 16, 2017
fe4788b
Only do specialation definalization once per run
retronym Mar 20, 2017
e416a25
Optimize specializedTypeVars
retronym Mar 20, 2017
b3975a5
Optimize label defs finder in the backend
retronym Mar 15, 2017
7a6dc1a
Avoid excessive file stats during classfile writing
retronym Mar 15, 2017
455729e
Use AnyRefMap in labelReferences
retronym Mar 15, 2017
53dd4e4
Cache ClassSymbol.javaBinaryNameString
retronym Mar 13, 2017
1ae858c
Remove expensive assertion in the backend
retronym Mar 15, 2017
bebb188
Optimize method descriptor creation
retronym Mar 17, 2017
27be3a2
Avoid excessive IO in classfile parser
retronym Apr 4, 2017
a3987d8
Bump on 2.11.10 release
adriaanm Apr 10, 2017
7a5df57
Update README.md
adriaanm Apr 10, 2017
5167b69
MathJax CDN change and version bump
adriaanm Apr 10, 2017
8b4a033
upgrade to sbt 0.13.15
SethTisue Mar 14, 2017
77917e9
Actually retract clashing synthetic apply/unapply [backport]
adriaanm Apr 12, 2017
8a413ba
Merge pull request #5846 from adriaanm/t10261-2.11
adriaanm Apr 13, 2017
f668845
No-op merge 2.11.x into 2.12.x
adriaanm Apr 13, 2017
17e160d
Merge 2.11.x into 2.12.x
adriaanm Apr 13, 2017
771fe00
No-op merge 2.11.x into 2.12.x
adriaanm Apr 13, 2017
d61301d
Merge pull request #5851 from adriaanm/2.12-catchup-2.11
SethTisue Apr 13, 2017
070ab67
Review feedback: resurrect assertion, use LabelDefFinder.apply
retronym Apr 18, 2017
0c8bdf6
bump version to 2.12.3
SethTisue Apr 18, 2017
4efab51
Merge pull request #5775 from SethTisue/sbt-0.14
SethTisue Apr 18, 2017
7236da0
upgrade to partest 1.1.1
SethTisue Apr 18, 2017
a3ec4a0
Merge pull request #5855 from SethTisue/post-2.12.2-version-bump
SethTisue Apr 18, 2017
db80860
Merge pull request #5856 from SethTisue/partest-1.1.1
SethTisue Apr 18, 2017
d9343a7
Remove dead code catch in LambdaDeserializer
retronym Apr 20, 2017
6e7fd66
Merge pull request #5824 from retronym/faster/sourcefileattr
retronym Apr 21, 2017
3009880
Merge pull request #5820 from retronym/faster/backend
retronym Apr 21, 2017
81459e4
Merge pull request #5812 from retronym/faster/specialization
retronym Apr 21, 2017
9f522c6
Fix lambda deserialization in classes with 252+ lambdas
retronym Apr 18, 2017
7cc1f86
Merge pull request #5857 from retronym/ticket/10232
retronym Apr 24, 2017
3733536
Update error message for t5717
lrytz Apr 24, 2017
709a752
Merge pull request #5861 from lrytz/t5717-msg
SethTisue Apr 24, 2017
775bb11
Merge remote-tracking branch 'origin/2.12.x' into merge-2.12-to-2.13-…
SethTisue Apr 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=0.13.15
2 changes: 1 addition & 1 deletion scripts/common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ mkdir -p $IVY_CACHE
rm -rf $IVY_CACHE/cache/org.scala-lang

SBT_CMD=${sbtCmd-sbt}
SBT_CMD="$SBT_CMD -sbt-version 0.13.13"
SBT_CMD="$SBT_CMD -sbt-version 0.13.15"

# temp dir where all 'non-build' operation are performed
TMP_ROOT_DIR=$(mktemp -d -t pr-scala.XXXX)
Expand Down
66 changes: 33 additions & 33 deletions src/intellij/scala.ipr.SAMPLE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,31 +322,31 @@
<root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.6/lib/scala-compiler.jar!/" />
<root url="jar://$USER_HOME$/.sbt/boot/scala-2.10.6/lib/scala-reflect.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/com.typesafe/config/bundles/config-1.0.0.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/sbt/jars/sbt-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/main/jars/main-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/actions/jars/actions-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/classpath/jars/classpath-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/interface/jars/interface-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/io/jars/io-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/control/jars/control-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/sbt/jars/sbt-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/main/jars/main-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/actions/jars/actions-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/classpath/jars/classpath-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/interface/jars/interface-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/io/jars/io-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/control/jars/control-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/launcher-interface/jars/launcher-interface-1.0.0-M1.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/completion/jars/completion-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/collections/jars/collections-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/completion/jars/completion-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/collections/jars/collections-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.fusesource.jansi/jansi/jars/jansi-1.11.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/api/jars/api-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/classfile/jars/classfile-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/logging/jars/logging-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/process/jars/process-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/compiler-integration/jars/compiler-integration-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/incremental-compiler/jars/incremental-compiler-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/relation/jars/relation-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/compile/jars/compile-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/persist/jars/persist-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/api/jars/api-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/classfile/jars/classfile-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/logging/jars/logging-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/process/jars/process-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/compiler-integration/jars/compiler-integration-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/incremental-compiler/jars/incremental-compiler-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/relation/jars/relation-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/compile/jars/compile-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/persist/jars/persist-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-tools.sbinary/sbinary_2.10/jars/sbinary_2.10-0.4.2.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/compiler-ivy-integration/jars/compiler-ivy-integration-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/ivy/jars/ivy-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/cross/jars/cross-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/compiler-ivy-integration/jars/compiler-ivy-integration-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/ivy/jars/ivy-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/cross/jars/cross-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt.ivy/ivy/jars/ivy-2.3.0-sbt-2cf13e211b2cb31f0d3b317289dca70eca3362f6.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/serialization_2.10/jars/serialization_2.10-0.1.2.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-pickling_2.10/jars/scala-pickling_2.10-0.10.1.jar!/" />
Expand All @@ -356,20 +356,20 @@
<root url="jar://$USER_HOME$/.ivy2/cache/com.thoughtworks.paranamer/paranamer/jars/paranamer-2.6.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.spire-math/jawn-parser_2.10/jars/jawn-parser_2.10-0.6.0.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.spire-math/json4s-support_2.10/jars/json4s-support_2.10-0.6.0.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/run/jars/run-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/task-system/jars/task-system-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/tasks/jars/tasks-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/tracking/jars/tracking-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/cache/jars/cache-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/testing/jars/testing-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/test-agent/jars/test-agent-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/run/jars/run-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/task-system/jars/task-system-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/tasks/jars/tasks-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/tracking/jars/tracking-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/cache/jars/cache-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/testing/jars/testing-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/test-agent/jars/test-agent-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/test-interface/jars/test-interface-1.0.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/main-settings/jars/main-settings-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/apply-macro/jars/apply-macro-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/command/jars/command-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/main-settings/jars/main-settings-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/apply-macro/jars/apply-macro-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/command/jars/command-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/template-resolver/jars/template-resolver-0.1.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/logic/jars/logic-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/compiler-interface/jars/compiler-interface-0.13.13.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/logic/jars/logic-0.13.15.jar!/" />
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-sbt/compiler-interface/jars/compiler-interface-0.13.15.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand Down
2 changes: 1 addition & 1 deletion test/benchmarks/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=0.13.15
0