| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| | |
Merge 2.11.x to 2.12.x
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Tracks nullness of values using an ASM analyzer.
Tracking nullness requires alias tracking for local variables and
stack values. For example, after an instance call, local variables
that point to the same object as the receiver are treated not-null.
|
|/ /
| |
| |
| |
| | |
This will unbreak the nightly release, and allow building 2.12.0-M2
without overriding SWING_VER.
|
|\| |
|
| |\
| | |
| | | |
Move ASM out of the repository [ci: last-only]
|
| | |
| | |
| | |
| | | |
The classfiles are still integrated into scala-compiler.jar.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Scalacheck 1.12.x cross-compiles to JS and will take more work to
integrate.
Make sure we never attempt to publish scalacheck to sonatype.
Force checkout module refs in case of dirty workspace.
Backport of f238586d1b9d93533ee9507b56a26a97c2b2501c
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The tagged revisions of the modules integrate the latest release of
the sbt-scala-modules sbt plugin. This enables building with a new
scala binary version (e.g. 2.12.0-M1) without failinig MiMa.
Also updates the other external dependencies.
Backport of 8da073cd6bfaaaf3789fc8b70a61ebb66a2f0ded
|
| | |
| | |
| | |
| | | |
Backport of f9153619380d755a531f887fe0bd63b6e6a91738
|
| |/
| |
| |
| | |
Backport of 3b2abdf6af87debdfb01f22f185d2a35852218fc
|
| |
| |
| |
| |
| |
| | |
Use 2.12.0-M1 as starr.
Also fixes comment in the bootstrap script.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Scalacheck 1.12.x cross-compiles to JS and will take more work to
integrate.
Make sure we never attempt to publish scalacheck to sonatype.
Force checkout module refs in case of dirty workspace.
|
| |
| |
| |
| | |
The 2.12 distribution will no longer ship an akka-actors jar.
|
| |
| |
| |
| |
| |
| |
| |
| | |
The tagged revisions of the modules integrate the latest release of
the sbt-scala-modules sbt plugin. This enables building with a new
scala binary version (e.g. 2.12.0-M1) without failinig MiMa.
Also updates the other external dependencies.
|
| | |
|
| | |
|
| | |
|
| | |
|
|\| |
|
| |
| |
| |
| | |
To enable #4285
|
|\| |
|
| | |
|
|\| |
|
| |\
| | |
| | | |
Fixes and tests for InnerClass / EnclsoingMethod classfile attributes
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Run a number of Java reflection operations on all classes in
scala library / reflect / compiler.
The test is based on a draft by Jason.
|
| |/
| |
| |
| |
| |
| |
| | |
Users of German & Swedish keyboards can again
type `]` in the REPL without crazy acrobatics.
Fixed upstream in https://github.com/jline/jline2/pull/175
|
| |\
| | |
| | | |
Update scala-partest dependency to 1.0.3
|
| | | |
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
merge/2.11.x-to-2.12.x-20150129
Conflicts:
build.number
src/library/scala/concurrent/Future.scala
versions.properties
|
| | | |
|
| |/ |
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
build.number
src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
src/library/scala/collection/Iterator.scala
versions.properties
|
| |
| |
| |
| | |
... to avoid having to revert the fix for SI-8253
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit seems bigger than it is. Most of it is tests, and moving
some code around. The actual changes are small, but a bit subtle.
The InnerClass and EnclosingMethod attributes should now be close to
the JVM spec (which is summarized in BTypes.scala). New tests make
sure that changes to these attributes, and changes to the way Java
reflection sees Scala classfiles, don't go unnoticed.
A new file, BCodeAsmCommon, holds code that's shared between the two
backend (it could hold more, future work).
In general, the difficulty with emitting InnerClass / EnclosingMethod
is that we need to find out source-level properties. We need to make
sure to do enough phase-travelling, and work around destructive
changes to the ownerchain in lambdalift (we use originalOwner a lot).
The change to JavaMirrors is prompted by the change to the
EnclosingMethod attribute, which changes Java reflection's answer to
getEnclosingMethod and getEnclosingConstructor. Classes defined in
field initializers no longer have an enclosing method, just an
enclosing class, which broke an assumption in JavaMirrors.
There's one change in erasure. Before this change, when an object
declaration implements / overrides a method, and a bridge is required,
then the bridge method was actually a ModuleSymbol (it would get the
lateMETHOD flag and be emitted as a method anyway). This is confusing,
when iterating through the members of a class, you can find two
modules with the same name, and one of them doesn't have a module
class. Now, such bridge methods will be MethodSymbols.
Removed Symbol.originalEnclosingMethod, that is a backend thing and
doesn't need to live in the symbol API.
|
|/ |
|
|
|
|
| |
Move version info where it belongs: versions.properties
|
| |
|
|
|
|
|
| |
Because serialization affected akka, we're upgrading the included
akka-actor to 2.3.3, which is built with Scala 2.11.1.
|
|
|
|
|
|
| |
New versions.properties generated by:
https://scala-webapps.epfl.ch/jenkins/view/scala-release-2.11.x/job/scala-release-2.11.x/57/
|
|
|
|
|
|
|
|
|
|
|
|
| |
Quoth @rkuhn:
> seeing that you are cutting a Scala release, we’ll need to
> decide on which Akka version to bundle with it. 2.3.0 has
> some remoting bugs which we’d like to leave behind
Given the difficult of overriding the bundled Akka version
from the Scala script runner (SI-8472), we've deemed it
worthwhile to bump the Akka version before releasing 2.11.0.
|
|
|
|
|
|
|
|
|
|
| |
Based on:
https://scala-webapps.epfl.ch/jenkins/view/scala-release-2.11.x/job/scala-release-2.11.x/52/artifact/scala/versions.properties
With a manual edit of the new property, scala.full.version, which
was not written out by `ant -Dupdate.versions`. That has since
been remedied.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When called with -Dupdate.versions, the build will render its current
set of versions to versions properties. This is used during releases,
when bootstrapping to a consistent set of modules that constitute
a release.
Particularly, scala.full.version is the non-SNAPSHOT full version
of scala that's closed to maven.version.number. It's similar in
spirit to the module build's snapshotScalaBinaryVersion,
except that it's always the full version, so, e.g., 2.11.1 rather than 2.11.
This version is so far only used to determine the dependency on
scala-continuations-plugin in scala-dist.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
While we must use full version, rather than the cross version
(12720e699), we need to use latest non-snapshot version.
This should avoid failures like:
https://jenkins.scala-ide.org:8496/jenkins/view/Scala%20Xsource%20flag%20nightlies/job/Akka/63/console
Such as:
[warn] ::::::::::::::::::::::::::::::::::::::::::::::
[warn] :: UNRESOLVED DEPENDENCIES ::
[warn] ::::::::::::::::::::::::::::::::::::::::::::::
[warn] :: org.scala-lang.plugins#scala-continuations-plugin_2.11.0-SNAPSHOT;1.0.1:
not found
[warn] ::::::::::::::::::::::::::::::::::::::::::::::
sbt.ResolveException: unresolved dependency:
org.scala-lang.plugins#scala-continuations-plugin_2.11.0-SNAPSHOT;1.0.1:
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit f2de2c4ec43180351ef1f306bcc5f24643ba5477 because it
broke both lift-json and json4s libraries that depend on scalap's APIs.
Arguably, those libraries shouldn't depend on unofficial APIs but they do
because they had no better alternative at the time (no Scala reflection).
The cost of breaking them is not worth minor change of the package.
The f2de2c4ec43180351ef1f306bcc5f24643ba5477 mixed two things:
1. Fixing feature warnings
2. Changing package name
When reverting (and resolving conflicts) I tried to keep 1. and revert just
2. However, there were also some questionable changes related to 1. that
got reverted. In particular, a package object with implicit members that
enable language features is an anti-pattern because members of package
object are visible both _within_ and _outside_ of the package. Therefore,
user could use wildcard import for importing everything from scalap
package and enabled postfixOps language feature unknowingly. I went for
just adding imports in just those few files where they were needed.
Amended by Adriaan:
To allow faster turn around, I re-enabled resolving partest from sonatype,
as its version needs to be bumped and I don't want to wait for maven central synch.
Conflicts:
src/partest/scala/tools/partest/nest/Runner.scala
src/scalap/scala/tools/scalap/scalax/rules/Memoisable.scala
src/scalap/scala/tools/scalap/scalax/rules/Rule.scala
src/scalap/scala/tools/scalap/scalax/rules/Rules.scala
src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala
src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala
|
| |
|