| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| | |
Include 828a892 Merge pull request #5753
|
| | | |
|
| | |
| |
| |
| | |
This reverts commit 22dac3118e97b2a4707d42ef1f47ac292a8ed385.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is a temporary measure until we release Scala
2.12.0. It means we are able to release milestones,
and RCs of Scala without needing a public release of
Scalacheck. While we've never had to wait very long
for these in the past (Thanks, Rickard!) we'd like
to spare the maintainer some work betwen now and 2.12.0.
After we release Scala 2.12.0, we'll revert to a binary
dependency on the standard Scalacheck.
I have replaced the scala-parser-combinator based
command line option parsing with a quick and dirty
version.
I've had to remove scalacheck as a SBT test framework
in our build. We don't use it directly as such (instead,
it is used indirectly through `partest --scalacheck`),
and it's test discovery (which we expect to return nothing)
fails after re-STARR-ing due to an unsolved problem with
SBT's testLoader including either STARR or sbt-launch.jar
on the classpath used to discover and spawn tests.
For the record, I tried the following to no avail:
```
// Two modifications are needed from the stock SBT configuration in order to exclude STARR
// from the classloader that performs test discovery.
// - We make `isManagedVersion` hold by providing an explicit Scala version, in order to go into the desired
// branch in `createTestLoader`
// - We remove STARR from the classloader of the scala instance
def fixTestLoader = testLoader := {
val s = scalaInstance.value
val scalaInstance1 =
new ScalaInstance(s.version, appConfiguration.value.provider.scalaProvider.loader(), s.libraryJar, s.compilerJar, s.extraJars, Some(s.actualVersion))
assert(scalaInstance1.isManagedVersion)
TestFramework.createTestLoader(Attributed.data(fullClasspath.value), scalaInstance1, IO.createUniqueDirectory(taskTemporaryDirectory.value))
}
```
f
|
| |\|
| |
| |
| | |
Resolved conflicts as in b0e05b67c7
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
merge/2.11.x-to-2.12.x-20160225
Conflicts:
scripts/jobs/integrate/bootstrap
src/build/maven/scala-actors-pom.xml
test/files/pos/t3420.flags
Conflicts were trivial to resolve.
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/library/scala/collection/Iterator.scala
|
`-- trivial conflicts only. Parens were added to the
next() calls in 2.12.x, while in the meantime
`{Concat,Join}Iterator` were optimized in 2.11.x
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
This commit updates color and shape of the inheritence graphs. Also adds
a dropshadow on hover instead of opacity change.
Graphviz broke upon trying to include svg buttons instead of png.
Looking for a solution.
|
| |\| |
|
| | |
| |
| |
| |
| | |
(just hitting the highlights here, not worrying yet about bumping the
dates in every modified source file)
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use j.u.c.Forkjoin directly in active and disabled tests
Remove bitrotted benchmarks code
I was going to update these to use `java.util.concurrent.ForkJoin`
directly, instead of our deprecated stubs.
But most of them don't compile anymore (e.g. scala.testing.Benchmark
has been removed, ClassTag imports missing).
While I'm all for benchmarks, we should have large swathes of code
checked in that isn't at compiled and run automatically.
I'm happy to help someone resurrect these in a suitable form.
|
|
|
To avoid duplication in scala/scala-dist, where it'll just go stale.
|
