diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-03-24 23:31:08 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-03-24 23:31:08 +0100 |
| commit | ef43abf9b54ba70783eb645f020b87c18bb58cb4 (patch) | |
| tree | 0e811388acab89ddd73c81189219d22c09334cbc | |
| parent | c1e0dd0307a27d146efb49ae423373e3c85a1312 (diff) | |
| download | Kamon-ef43abf9b54ba70783eb645f020b87c18bb58cb4.tar.gz Kamon-ef43abf9b54ba70783eb645f020b87c18bb58cb4.tar.bz2 Kamon-ef43abf9b54ba70783eb645f020b87c18bb58cb4.zip | |
= build: user cross versions in our build.
| -rw-r--r-- | project/Dependencies.scala | 1 | ||||
| -rw-r--r-- | project/Publish.scala | 2 | ||||
| -rw-r--r-- | project/Settings.scala | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b9788865..8d3e57fb 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -52,7 +52,6 @@ object Dependencies { val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion val slf4Jul = "org.slf4j" % "jul-to-slf4j" % slf4jVersion val slf4Log4j = "org.slf4j" % "log4j-over-slf4j" % slf4jVersion - val scalaCompiler = "org.scala-lang" % "scala-compiler" % Settings.ScalaVersion val scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % "7.1.0" val sigarLoader = "io.kamon" % "sigar-loader" % "1.6.5-rev001" val h2 = "com.h2database" % "h2" % "1.4.182" diff --git a/project/Publish.scala b/project/Publish.scala index 025e258e..ddb64d2d 100644 --- a/project/Publish.scala +++ b/project/Publish.scala @@ -19,7 +19,7 @@ import sbt.Keys._ object Publish { lazy val settings = Seq( - crossPaths := false, + crossPaths := true, pomExtra := kamonPomExtra, publishTo := kamonRepo, organization := "io.kamon", diff --git a/project/Settings.scala b/project/Settings.scala index c6306dc6..711023d9 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -29,7 +29,7 @@ object Settings { val ScalaVersion = "2.11.5" lazy val basicSettings = Seq( - scalaVersion := ScalaVersion, + crossScalaVersions := Seq("2.10.5", "2.11.6"), resolvers ++= Dependencies.resolutionRepos, fork in run := true, parallelExecution in Test := false, |