From 1e81ce31ab34ff6874341d408814db4ca1df5ba0 Mon Sep 17 00:00:00 2001 From: Scott Carey Date: Thu, 13 Jun 2013 17:36:41 -0700 Subject: [PATCH 4/4] Fix cross-compile of tests, update to 2.10.2 and set as default --- core/build.sbt | 5 ++--- core/src/test/scala/unit/kafka/metrics/KafkaTimerTest.scala | 2 -- project/Build.scala | 4 ++-- project/build.properties | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/core/build.sbt b/core/build.sbt index 071fb3e..fda715b 100644 --- a/core/build.sbt +++ b/core/build.sbt @@ -22,9 +22,8 @@ libraryDependencies ++= Seq( libraryDependencies <<= (scalaVersion, libraryDependencies) { (sv, deps) => deps :+ (sv match { - case "2.8.0" => "org.scalatest" % "scalatest" % "1.2" % "test" - case "2.10.1" => "org.scalatest" % "scalatest_2.10.0" % "1.8" % "test" - case _ => "org.scalatest" %% "scalatest" % "1.8" % "test" + case "2.8.2" => "org.scalatest" %% "scalatest" % "1.8" % "test" + case _ => "org.scalatest" %% "scalatest" % "1.9.1" % "test" }) } diff --git a/core/src/test/scala/unit/kafka/metrics/KafkaTimerTest.scala b/core/src/test/scala/unit/kafka/metrics/KafkaTimerTest.scala index 3dd83cc..a511c5a 100644 --- a/core/src/test/scala/unit/kafka/metrics/KafkaTimerTest.scala +++ b/core/src/test/scala/unit/kafka/metrics/KafkaTimerTest.scala @@ -36,8 +36,6 @@ class KafkaTimerTest extends JUnit3Suite { clock.addMillis(1000) } assertEquals(1, metric.count()) - assertTrue((metric.max() - 1000).abs <= Double.Epsilon) - assertTrue((metric.min() - 1000).abs <= Double.Epsilon) //Epsilon removed in 2.10, Eps added in 2.11. Inline the definition here instead //See https://issues.scala-lang.org/browse/SI-3791 assertTrue((metric.max() - 1000).abs <= java.lang.Double.longBitsToDouble(0x3ca0000000000000L)) diff --git a/project/Build.scala b/project/Build.scala index d89d6a1..cca73f9 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -28,8 +28,8 @@ object KafkaBuild extends Build { val commonSettings = Seq( organization := "org.apache", scalacOptions ++= Seq("-deprecation", "-unchecked", "-g:none"), - crossScalaVersions := Seq("2.8.2", "2.9.1", "2.9.2", "2.9.3", "2.10.1"), - scalaVersion := "2.8.2", + crossScalaVersions := Seq("2.8.2", "2.9.1", "2.9.2", "2.9.3", "2.10.2"), + scalaVersion := "2.10.2", version := "0.8.0-SNAPSHOT", buildNumber := System.getProperty("build.number", ""), version <<= (buildNumber, version) { (build, version) => if (build == "") version else version + "+" + build}, diff --git a/project/build.properties b/project/build.properties index eea46f3..5ad7a3b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -14,4 +14,4 @@ # limitations under the License. #Project properties #Mon Feb 28 11:55:49 PST 2011 -sbt.version=0.12.1 +sbt.version=0.12.3 -- 1.8.3.1