Publishable/buildable for 2.12

bjlovegithub · Nov 2, 2016 · 74e9275 · 74e9275
1 parent b7c63cb
commit 74e9275
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/akka-remote/src/main/scala/akka/remote/AddressUidExtension.scala b/akka-remote/src/main/scala/akka/remote/AddressUidExtension.scala
@@ -40,7 +40,7 @@ class AddressUidExtension(val system: ExtendedActorSystem) extends Extension {
   }
 
   // used by old remoting and part of public api
-  @deprecated("Use longAddressUid instead", "2.4.x")
+  // @deprecated("Use longAddressUid instead", "2.4.x")
   lazy val addressUid: Int = {
     if (arteryEnabled) {
       throw new IllegalStateException("Int UID must never be used with Artery")

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -17,10 +17,10 @@ object Dependencies {
   val sslConfigVersion = "0.2.1"
 
   val Versions = Seq(
-    crossScalaVersions := Seq("2.12.0-RC2"),
+    crossScalaVersions := Seq("2.12.0"),
     scalaVersion := crossScalaVersions.value.head,
     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.4"),
     scalaTestVersion := {
       scalaVersion.value match {
         case "2.12.0-M5" => "3.0.0"
@@ -29,7 +29,7 @@ object Dependencies {
     },
     java8CompatVersion := {
       scalaVersion.value match {
-        case x if x.startsWith("2.12.0") => "0.8.0-RC8"
+        case x if x.startsWith("2.12.0") => "0.8.0"
         case _ => "0.7.0"
       }
     }