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

Changes needed to build/test/release for 2.12.0 (#21789)

Browse source
This commit is contained in:
Johan Andrén 2016-11-03 16:17:36 +01:00 • committed by GitHub
parent 8f0d1a3465
commit e9253c7c7d
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
akka-remote/src/main/scala/akka/remote/AddressUidExtension.scala
View file

@ -39,11 +39,14 @@ class AddressUidExtension(val system: ExtendedActorSystem) extends Extension {
else tlr.nextInt().toLong else tlr.nextInt().toLong
} }
// used by old remoting and part of public api // private because GenJavaDoc fails on deprecated annotated lazy val
@deprecated("Use longAddressUid instead", "2.4.x") private lazy val _addressUid: Int = {
lazy val addressUid: Int = {
if (arteryEnabled) { if (arteryEnabled) {
throw new IllegalStateException("Int UID must never be used with Artery") throw new IllegalStateException("Int UID must never be used with Artery")
} else longAddressUid.toInt } else longAddressUid.toInt
} }
// used by old remoting and part of public api
@deprecated("Use longAddressUid instead", "2.4.x")
def addressUid: Int = _addressUid
} }

16
project/Dependencies.scala
View file

@ -17,19 +17,17 @@ object Dependencies {
val sslConfigVersion = "0.2.1" val sslConfigVersion = "0.2.1"
val Versions = Seq( val Versions = Seq(
crossScalaVersions := Seq("2.11.8"), // "2.12.0-RC2" crossScalaVersions := Seq("2.11.8"), // "2.12.0"
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(
scalaTestVersion := { if (scalaVersion.value.startsWith("2.12")) "1.13.4" // does not work for 2.11
scalaVersion.value match { else "1.13.2"
case "2.12.0-M5" => "3.0.0" ),
case _ => "3.0.0" scalaTestVersion := "3.0.0",
}
},
java8CompatVersion := { java8CompatVersion := {
scalaVersion.value match { scalaVersion.value match {
case x if x.startsWith("2.12.0") => "0.8.0-RC8" case x if x.startsWith("2.12") => "0.8.0"
case _ => "0.7.0" case _ => "0.7.0"
} }
} }