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

Merge pull request #18410 from akka/wip-18408-scala-2.11.7-patriknw

Browse source 
=pro #18408 Update to Scala 2.11.7
This commit is contained in:
Patrik Nordwall 2015-09-10 11:24:04 +02:00
commit a22b3be9da
20 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-samples/akka-sample-camel-java/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-camel-java"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.11.5" scalaVersion := "2.11.7"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT", "com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT",

2
akka-samples/akka-sample-camel-scala/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-camel-scala"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.11.5" scalaVersion := "2.11.7"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",

2
akka-samples/akka-sample-cluster-java/build.sbt
View file

@ -9,7 +9,7 @@ val project = Project(
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq( settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-cluster-java", name := "akka-sample-cluster-java",
version := "2.4-SNAPSHOT", version := "2.4-SNAPSHOT",
scalaVersion := "2.11.6", scalaVersion := "2.11.7",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"), javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"),
javacOptions in doc in Compile := Seq("-source", "1.8", "-Xdoclint:none"), javacOptions in doc in Compile := Seq("-source", "1.8", "-Xdoclint:none"),

2
akka-samples/akka-sample-cluster-scala/build.sbt
View file

@ -9,7 +9,7 @@ val project = Project(
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq( settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-cluster-scala", name := "akka-sample-cluster-scala",
version := "2.4-SNAPSHOT", version := "2.4-SNAPSHOT",
scalaVersion := "2.11.6", scalaVersion := "2.11.7",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"), javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"),
libraryDependencies ++= Seq( libraryDependencies ++= Seq(

2
akka-samples/akka-sample-distributed-data-java/build.sbt
View file

@ -9,7 +9,7 @@ val project = Project(
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq( settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-distributed-data-java", name := "akka-sample-distributed-data-java",
version := "2.4-SNAPSHOT", version := "2.4-SNAPSHOT",
scalaVersion := "2.11.6", scalaVersion := "2.11.7",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation", "-Xdiags:verbose"), javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation", "-Xdiags:verbose"),
javacOptions in doc in Compile := Seq("-source", "1.8"), javacOptions in doc in Compile := Seq("-source", "1.8"),

2
akka-samples/akka-sample-distributed-data-scala/build.sbt
View file

@ -9,7 +9,7 @@ val project = Project(
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq( settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-distributed-data-scala", name := "akka-sample-distributed-data-scala",
version := "2.4-SNAPSHOT", version := "2.4-SNAPSHOT",
scalaVersion := "2.11.6", scalaVersion := "2.11.7",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"), javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"),
libraryDependencies ++= Seq( libraryDependencies ++= Seq(

2
akka-samples/akka-sample-fsm-java-lambda/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-docs-java-lambda"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.11.6" scalaVersion := "2.11.7"
javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-target", "1.8", "-Xlint") javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-target", "1.8", "-Xlint")

2
akka-samples/akka-sample-fsm-scala/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-fsm-scala"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.11.5" scalaVersion := "2.11.7"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"

2
akka-samples/akka-sample-main-java-lambda/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-main-java-lambda"
version := "1.0" version := "1.0"
scalaVersion := "2.11.6" scalaVersion := "2.11.7"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"

2
akka-samples/akka-sample-main-java/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-main-java"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.11.5" scalaVersion := "2.11.7"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"

2
akka-samples/akka-sample-main-scala/build.sbt
View file

@ -4,7 +4,7 @@ name := "akka-sample-main-scala"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.11.5" scalaVersion := "2.11.7"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"

2
akka-samples/akka-sample-multi-node-scala/build.sbt
View file

@ -9,7 +9,7 @@ val project = Project(
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq( settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-multi-node-scala", name := "akka-sample-multi-node-scala",
version := "2.4-SNAPSHOT", version := "2.4-SNAPSHOT",
scalaVersion := "2.11.5", scalaVersion := "2.11.7",
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % akkaVersion, "com.typesafe.akka" %% "akka-actor" % akkaVersion,
"com.typesafe.akka" %% "akka-remote" % akkaVersion, "com.typesafe.akka" %% "akka-remote" % akkaVersion,

2
akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
View file

@ -17,7 +17,7 @@
<paxexam.version>2.6.0</paxexam.version> <paxexam.version>2.6.0</paxexam.version>
<paxswissbox.version>1.6.0</paxswissbox.version> <paxswissbox.version>1.6.0</paxswissbox.version>
<protobuf.version>2.5.0</protobuf.version> <protobuf.version>2.5.0</protobuf.version>
<scala.version>2.11.5</scala.version> <scala.version>2.11.7</scala.version>
<scala.dep.version>2.11</scala.dep.version> <scala.dep.version>2.11</scala.dep.version>
<scalatest.version>2.2.3</scalatest.version> <scalatest.version>2.2.3</scalatest.version>
<typesafe.config.version>1.2.1</typesafe.config.version> <typesafe.config.version>1.2.1</typesafe.config.version>

2
akka-samples/akka-sample-persistence-java-lambda/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-persistence-java-lambda"
version := "1.0" version := "1.0"
scalaVersion := "2.11.6" scalaVersion := "2.11.7"
javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-target", "1.8", "-Xlint") javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-target", "1.8", "-Xlint")

2
akka-samples/akka-sample-persistence-java/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-persistence-java"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.11.5" scalaVersion := "2.11.7"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-persistence" % "2.4-SNAPSHOT" "com.typesafe.akka" %% "akka-persistence" % "2.4-SNAPSHOT"

2
akka-samples/akka-sample-persistence-scala/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-persistence-scala"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.11.5" scalaVersion := "2.11.7"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",

2
akka-samples/akka-sample-remote-java/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-remote-java"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.11.5" scalaVersion := "2.11.7"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",

2
akka-samples/akka-sample-remote-scala/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-remote-scala"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.11.5" scalaVersion := "2.11.7"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",

2
akka-samples/akka-sample-supervision-java-lambda/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-supervision-java-lambda"
version := "1.0" version := "1.0"
scalaVersion := "2.11.6" scalaVersion := "2.11.7"
javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-target", "1.8", "-Xlint") javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-target", "1.8", "-Xlint")

2
project/Dependencies.scala
View file

@ -10,7 +10,7 @@ object Dependencies {
lazy val scalaCheckVersion = settingKey[String]("The version of ScalaCheck to use.") lazy val scalaCheckVersion = settingKey[String]("The version of ScalaCheck to use.")
val Versions = Seq( val Versions = Seq(
crossScalaVersions := Seq("2.11.6"), //"2.12.0-M2" crossScalaVersions := Seq("2.11.7"), //"2.12.0-M2"
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.11.6"), scalaCheckVersion := sys.props.get("akka.build.scalaCheckVersion").getOrElse("1.11.6"),