raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

remove Range.Inclusive subclass (toString), #21548

Browse source 
* remove Range.Inclusive subclass (toString), #21548
* update java8-compat dependency for Scala 2.12-RC1
This commit is contained in:
Patrik Nordwall 2016-09-27 13:21:49 +02:00 • committed by Johan Andrén
parent 6e0b8b98f3
commit d37fa8ec02
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-stream/src/main/scala/akka/stream/javadsl/Source.scala
View file

@ -156,9 +156,7 @@ object Source {
def range(start: Int, end: Int, step: Int): javadsl.Source[Integer, NotUsed] = def range(start: Int, end: Int, step: Int): javadsl.Source[Integer, NotUsed] =
fromIterator[Integer](new function.Creator[util.Iterator[Integer]]() { fromIterator[Integer](new function.Creator[util.Iterator[Integer]]() {
def create(): util.Iterator[Integer] = def create(): util.Iterator[Integer] =
new Inclusive(start, end, step) { Range.inclusive(start, end, step).iterator.asJava.asInstanceOf[util.Iterator[Integer]]
override def toString: String = s"Range($start to $end, step = $step)"
}.iterator.asJava.asInstanceOf[util.Iterator[Integer]]
}) })
/** /**

5
project/Dependencies.scala
View file

@ -16,7 +16,7 @@ object Dependencies {
val junitVersion = "4.12" val junitVersion = "4.12"
val Versions = Seq( val Versions = Seq(
crossScalaVersions := Seq("2.11.8"), // "2.12.0-M4" crossScalaVersions := Seq("2.11.8"), // "2.12.0-RC1"
scalaVersion := crossScalaVersions.value.head, scalaVersion := crossScalaVersions.value.head,
scalaStmVersion := sys.props.get("akka.build.scalaStmVersion").getOrElse("0.7"), scalaStmVersion := sys.props.get("akka.build.scalaStmVersion").getOrElse("0.7"),
scalaCheckVersion := sys.props.get("akka.build.scalaCheckVersion").getOrElse("1.13.2"), scalaCheckVersion := sys.props.get("akka.build.scalaCheckVersion").getOrElse("1.13.2"),
@ -28,8 +28,7 @@ object Dependencies {
}, },
java8CompatVersion := { java8CompatVersion := {
scalaVersion.value match { scalaVersion.value match {
case "2.12.0-M4" => "0.8.0-RC1" case x if x.startsWith("2.12.0-RC1") => "0.8.0-RC7"
case "2.12.0-M5" => "0.8.0-RC3"
case _ => "0.7.0" case _ => "0.7.0"
} }
} }