diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-15 02:01:00 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-15 02:01:00 +0100 |
| commit | 97536d1ccc4444d67334a7137d386c4c308836ad (patch) | |
| tree | 9858dae1c7e5c59d694672f3d1e9b3841000ad01 /project/Settings.scala | |
| parent | cbe74e89112cfba113a1bba4184b417406e02b98 (diff) | |
| parent | 81c52c27d2b4784d561ae63b884b6e8c9e03db58 (diff) | |
| download | Kamon-97536d1ccc4444d67334a7137d386c4c308836ad.tar.gz Kamon-97536d1ccc4444d67334a7137d386c4c308836ad.tar.bz2 Kamon-97536d1ccc4444d67334a7137d386c4c308836ad.zip | |
Merge branch 'master' into release-legacy-akka-2.2
Conflicts:
kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala
kamon-core/src/main/scala/kamon/trace/TracerExtensionSettings.scala
kamon-jdbc/src/main/scala/kamon/jdbc/Jdbc.scala
kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala
project/Dependencies.scala
project/Projects.scala
project/Settings.scala
Diffstat (limited to 'project/Settings.scala')
| -rw-r--r-- | project/Settings.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/project/Settings.scala b/project/Settings.scala index 12f51dc1..7b9743db 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -26,14 +26,13 @@ import net.virtualvoid.sbt.graph.Plugin.graphSettings object Settings { val JavaVersion = "1.6" - val ScalaVersion = "2.10.4" lazy val basicSettings = Seq( scalaVersion := ScalaVersion, resolvers ++= Dependencies.resolutionRepos, fork in run := true, - testGrouping in Test := singleTests((definedTests in Test).value, (javaOptions in Test).value), + testGrouping in Test := singleTestPerJvm((definedTests in Test).value, (javaOptions in Test).value), moduleName := moduleName.value + "_akka-2.2", javacOptions in compile := Seq( "-Xlint:-options", @@ -58,7 +57,7 @@ object Settings { )) ++ publishSettings ++ releaseSettings ++ graphSettings - def singleTests(tests: Seq[TestDefinition], jvmSettings: Seq[String]): Seq[Group] = + def singleTestPerJvm(tests: Seq[TestDefinition], jvmSettings: Seq[String]): Seq[Group] = tests map { test => new Group( name = test.name, |