Use 2.12.0-RC1 as the Scala 2.12 cross version, and remove charts.

scalameter · Oct 14, 2016 · d81c962 · d81c962
1 parent b8174a1
commit d81c962
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 447 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -61,7 +61,7 @@ object ScalaMeterBuild extends MechaRepoBuild {
     name := "scalameter",
     organization := "com.storm-enroute",
     scalaVersion := "2.11.4",
-    crossScalaVersions := Seq("2.10.4", "2.11.4", "2.12.0-M1"),
+    crossScalaVersions := Seq("2.10.4", "2.11.4", "2.12.0-RC1"),
     scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-Xlint"),
     libraryDependencies <++= (scalaVersion)(sv => dependencies(sv)),
     parallelExecution in Test := false,
@@ -105,21 +105,19 @@ object ScalaMeterBuild extends MechaRepoBuild {
   def dependencies(scalaVersion: String) = {
     CrossVersion.partialVersion(scalaVersion) match {
       case Some((2, 12)) => List(
-        "org.scalatest" % "scalatest_2.12.0-M1" % "2.2.5-M1" % "test",
-        "com.github.wookietreiber" %% "scala-chart" % "0.5.0",
+        "org.scalatest" % "scalatest_2.12.0-RC1" % "3.0.0" % "test",
         "org.apache.commons" % "commons-math3" % "3.2",
         "org.scala-tools.testing" % "test-interface" % "0.5",
-        "org.scala-lang" % "scala-reflect" % "2.11.0",
-        "org.scala-lang.modules" % "scala-xml_2.12.0-M1" % "1.0.5",
-        "org.scala-lang.modules" % "scala-parser-combinators_2.12.0-M1" % "1.0.4",
+        "org.scala-lang" % "scala-reflect" % "2.12.0-RC1",
+        "org.scala-lang.modules" % "scala-xml_2.12.0-RC1" % "1.0.5",
+        "org.scala-lang.modules" % "scala-parser-combinators_2.12.0-RC1" % "1.0.4",
         "com.fasterxml.jackson.module" % "jackson-module-scala_2.11" % "2.5.2",
-        "org.mongodb" % "casbah_2.12.0-M2" % "3.1.1",
+        "org.mongodb" % "casbah_2.11" % "3.1.1",
         "commons-io" % "commons-io" % "2.4",
-        "io.spray" %  "spray-json_2.12.0-M3" % "1.3.2"
+        "io.spray" %  "spray-json_2.12.0-RC1" % "1.3.2"
       )
       case Some((2, 11)) => List(
-        "org.scalatest" %% "scalatest" % "2.2.6" % "test",
-        "com.github.wookietreiber" %% "scala-chart" % "0.5.0",
+        "org.scalatest" %% "scalatest" % "3.0.0" % "test",
         "org.apache.commons" % "commons-math3" % "3.2",
         "org.scala-tools.testing" % "test-interface" % "0.5",
         "org.scala-lang" % "scala-reflect" % "2.11.0",
@@ -131,8 +129,7 @@ object ScalaMeterBuild extends MechaRepoBuild {
         "io.spray" %%  "spray-json" % "1.3.2"
       )
       case Some((2, 10)) => List(
-        "org.scalatest" %% "scalatest" % "2.1.2" % "test",
-        "com.github.wookietreiber" %% "scala-chart" % "0.5.0",
+        "org.scalatest" %% "scalatest" % "3.0.0" % "test",
         "org.apache.commons" % "commons-math3" % "3.2",
         "org.scala-tools.testing" % "test-interface" % "0.5",
         "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.5.2",
@@ -192,12 +189,12 @@ object ScalaMeterBuild extends MechaRepoBuild {
   def coreDependencies(scalaVersion: String) = CrossVersion.partialVersion(scalaVersion) match {
     case Some((2, 12)) => List(
       "org.scalacheck" % "scalacheck_2.12.0-M1" % "1.12.4" % "test",
-      "org.scalatest" % "scalatest_2.12.0-M1" % "2.2.5-M1" % "test",
+      "org.scalatest" % "scalatest_2.12.0-RC1" % "3.0.0" % "test",
       "org.apache.commons" % "commons-math3" % "3.2",
       "org.apache.commons" % "commons-lang3" % "3.4",
-      "org.scala-lang" % "scala-reflect" % "2.11.0",
-      "org.scala-lang.modules" % "scala-xml_2.12.0-M1" % "1.0.5",
-      "org.scala-lang.modules" % "scala-parser-combinators_2.12.0-M1" % "1.0.4",
+      "org.scala-lang" % "scala-reflect" % "2.12.0-RC1",
+      "org.scala-lang.modules" % "scala-xml_2.12.0-RC1" % "1.0.5",
+      "org.scala-lang.modules" % "scala-parser-combinators_2.12.0-RC1" % "1.0.4",
       "org.ow2.asm" % "asm" % "5.0.4"
     )
     case Some((2, 11)) => List(

diff --git a/src/main/scala/org/scalameter/api.scala b/src/main/scala/org/scalameter/api.scala
@@ -59,9 +59,6 @@ object api extends Keys {
 
   /* reporting */
 
-  type ChartReporter[T] = reporting.ChartReporter[T]
-  val ChartReporter = reporting.ChartReporter
-
   type HtmlReporter[T] = reporting.HtmlReporter[T]
   val HtmlReporter = reporting.HtmlReporter
 
@@ -82,7 +79,6 @@ object api extends Keys {
 
   val Tester = reporting.RegressionReporter.Tester
   val Historian = reporting.RegressionReporter.Historian
-  val ChartFactory = reporting.ChartReporter.ChartFactory
 
   /* persistence */