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

=pro sbt-0.13.2-RC2 with name hashing, scala 2.10.4

Browse source 
* take advantage of latest incremental compiler improvements
* scala 2.10.4
* Remove workaround in FutureSpec, bug fixed in Scala 2.10.4
* Change version of samples to allow snapshot overwrite in publishM2
* allow publish overwrite for osgi-dining-hakkers/uncommons
This commit is contained in:
Patrik Nordwall 2014-03-07 13:15:17 +01:00
parent d51e06b389
commit f677ed0b68
20 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
View file

@ -71,10 +71,9 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
Await.result(failure fallbackTo timedOut, timeout.duration) should be("Timedout")
Await.result(timedOut fallbackTo empty, timeout.duration) should be("Timedout")
Await.result(failure fallbackTo failure fallbackTo timedOut, timeout.duration) should be("Timedout")
val expected = if (scala.util.Properties.versionNumberString.startsWith("2.10.")) "last" else "br0ken"
intercept[RuntimeException] {
Await.result(failure fallbackTo otherFailure, timeout.duration)
}.getMessage should be(expected)
}.getMessage should be("br0ken")
}
}
"completed with a result" must {

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

@ -2,7 +2,7 @@ name := "akka-docs-java-lambda"
version := "2.4-SNAPSHOT"
scalaVersion := "2.10.3"
scalaVersion := "2.10.4"
compileOrder := CompileOrder.ScalaThenJava

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

@ -1,8 +1,8 @@
name := "akka-sample-camel-java"
version := "1.0"
version := "2.3-SNAPSHOT"
scalaVersion := "2.10.3"
scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT",

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

@ -1,8 +1,8 @@
name := "akka-sample-camel-scala"
version := "1.0"
version := "2.3-SNAPSHOT"
scalaVersion := "2.10.3"
scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT",

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

@ -8,8 +8,8 @@ val project = Project(
base = file("."),
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-cluster-java",
version := "1.0",
scalaVersion := "2.10.3",
version := "2.3-SNAPSHOT",
scalaVersion := "2.10.4",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation"),
libraryDependencies ++= Seq(

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

@ -8,8 +8,8 @@ val project = Project(
base = file("."),
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-cluster-scala",
version := "1.0",
scalaVersion := "2.10.3",
version := "2.3-SNAPSHOT",
scalaVersion := "2.10.4",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation"),
libraryDependencies ++= Seq(

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

@ -1,8 +1,8 @@
name := "akka-docs-java-lambda"
version := "1.0"
version := "2.3-SNAPSHOT"
scalaVersion := "2.10.3"
scalaVersion := "2.10.4"
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")

2
akka-samples/akka-sample-fsm-java-lambda/pom.xml
View file

@ -11,7 +11,7 @@
<groupId>sample</groupId>
<artifactId>akka-sample-fsm-java-lambda</artifactId>
<packaging>jar</packaging>
<version>1.0</version>
<version>2.3-SNAPSHOT</version>
<dependencies>
<dependency>

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

@ -1,8 +1,8 @@
name := "akka-sample-fsm-scala"
version := "1.0"
version := "2.3-SNAPSHOT"
scalaVersion := "2.10.3"
scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"

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

@ -1,8 +1,8 @@
name := "akka-sample-main-java"
version := "1.0"
version := "2.3-SNAPSHOT"
scalaVersion := "2.10.3"
scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"

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

@ -1,8 +1,8 @@
name := "akka-sample-main-scala"
version := "1.0"
version := "2.3-SNAPSHOT"
scalaVersion := "2.10.3"
scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"

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

@ -8,8 +8,8 @@ val project = Project(
base = file("."),
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-multi-node-scala",
version := "1.0",
scalaVersion := "2.10.3",
version := "2.3-SNAPSHOT",
scalaVersion := "2.10.4",
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-remote" % akkaVersion,
"com.typesafe.akka" %% "akka-multi-node-testkit" % akkaVersion,

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

@ -17,7 +17,7 @@
<paxexam.version>2.6.0</paxexam.version>
<paxswissbox.version>1.6.0</paxswissbox.version>
<protobuf.version>2.5.0</protobuf.version>
<scala.version>2.10.3</scala.version>
<scala.version>2.10.4</scala.version>
<scala.dep.version>2.10</scala.dep.version>
<scalatest.version>2.0</scalatest.version>
<typesafe.config.version>1.2.0</typesafe.config.version>

2
akka-samples/akka-sample-persistence-java-lambda/pom.xml
View file

@ -11,7 +11,7 @@
<groupId>sample</groupId>
<artifactId>akka-sample-persistence-java8</artifactId>
<packaging>jar</packaging>
<version>0.0.1-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
<dependencies>
<dependency>

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

@ -1,8 +1,8 @@
name := "akka-sample-persistence-java"
version := "1.0"
version := "2.3-SNAPSHOT"
scalaVersion := "2.10.3"
scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-persistence-experimental" % "2.4-SNAPSHOT"

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

@ -1,8 +1,8 @@
name := "akka-sample-persistence-scala"
version := "1.0"
version := "2.3-SNAPSHOT"
scalaVersion := "2.10.3"
scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-persistence-experimental" % "2.4-SNAPSHOT"

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

@ -1,8 +1,8 @@
name := "akka-sample-remote-java"
version := "1.0"
version := "2.3-SNAPSHOT"
scalaVersion := "2.10.3"
scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-remote" % "2.4-SNAPSHOT"

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

@ -1,8 +1,8 @@
name := "akka-sample-remote-scala"
version := "1.0"
version := "2.3-SNAPSHOT"
scalaVersion := "2.10.3"
scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-remote" % "2.4-SNAPSHOT"

7
project/AkkaBuild.scala
View file

@ -35,7 +35,7 @@ object AkkaBuild extends Build {
val enableMiMa = false
val requestedScalaVersion = System.getProperty("akka.scalaVersion", "2.10.3")
val requestedScalaVersion = System.getProperty("akka.scalaVersion", "2.10.4")
val Seq(scalaEpoch, scalaMajor) = """(\d+)\.(\d+)\..*""".r.unapplySeq(requestedScalaVersion).get.map(_.toInt)
lazy val buildSettings = Seq(
@ -246,7 +246,7 @@ object AkkaBuild extends Build {
id = "akka-agent",
base = file("akka-agent"),
dependencies = Seq(actor, testkit % "test->test"),
settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.agent ++ Seq(
settings = defaultSettings ++ formatSettings ++ scaladocSettingsNoVerificationOfDiagrams ++ javadocSettings ++ OSGi.agent ++ Seq(
libraryDependencies ++= Dependencies.agent,
previousArtifact := akkaPreviousArtifact("akka-agent")
)
@ -473,6 +473,8 @@ object AkkaBuild extends Build {
base = file("akka-samples/akka-sample-osgi-dining-hakkers/uncommons"),
settings = sampleSettings ++ osgiSampleSettings ++ OSGi.osgiDiningHakkersSampleUncommons ++ Seq(
libraryDependencies ++= Dependencies.uncommons,
// allow publishLocal/publishM2 to overwrite
isSnapshot := true,
version := "1.2.0"
)
)
@ -683,6 +685,7 @@ object AkkaBuild extends Build {
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation"),
javacOptions in doc ++= Seq("-encoding", "UTF-8", "-source", "1.6"),
incOptions := incOptions.value.withNameHashing(true),
crossVersion := CrossVersion.binary,

2
project/build.properties
View file

@ -1 +1 @@
sbt.version=0.13.1
sbt.version=0.13.2-RC2