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

Merge pull request #1435 from akka/wip-upgrade-scalabuff-to-1.2.0-ban

Browse source 
Upgrade ScalaBuff to 1.2.0
This commit is contained in:
Roland Kuhn 2013-05-13 00:02:11 -07:00
commit e928fd87f4
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
project/AkkaBuild.scala
View file

@ -183,7 +183,7 @@ object AkkaBuild extends Build {
dependencies = Seq(remote, remoteTests % "test->test" , testkit % "test->test"),
settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ multiJvmSettings ++ OSGi.cluster ++ experimentalSettings ++
scalabuffSettings ++ Seq(
scalabuffVersion in ScalaBuff := "1.2.0-SNAPSHOT",
scalabuffVersion in ScalaBuff := "1.2.0",
libraryDependencies ++= Dependencies.cluster,
// disable parallel tests
parallelExecution in Test := false,
@ -628,8 +628,6 @@ object AkkaBuild extends Build {
}
lazy val defaultSettings = baseSettings ++ formatSettings ++ mimaSettings ++ lsSettings ++ Seq(
// this is only needed while we use the ScalaBuff SNAPSHOT version
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
// compile options
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"),