diff options
| author | Rocky Madden <git@rockymadden.com> | 2014-07-02 03:15:12 -0600 |
|---|---|---|
| committer | Rocky Madden <git@rockymadden.com> | 2014-07-02 03:15:12 -0600 |
| commit | bfbf50beefda0b8f410bc40722f7277a0398121e (patch) | |
| tree | 879ab39bf530aff1880bb89bf703e04ab69f82b9 | |
| parent | 0ec4f9e26a42737cc8399fd0311dc12d2ea11649 (diff) | |
| parent | dd78002ecb2e6f8038f5bc81811d2ac3c0e568b9 (diff) | |
| download | stringmetric-bfbf50beefda0b8f410bc40722f7277a0398121e.tar.gz stringmetric-bfbf50beefda0b8f410bc40722f7277a0398121e.tar.bz2 stringmetric-bfbf50beefda0b8f410bc40722f7277a0398121e.zip | |
Merge pull request #19 from nanop/master
add cross-compile support for scala 2.11.x
| -rwxr-xr-x | .travis.yml | 3 | ||||
| -rw-r--r-- | project/build.scala | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 54089b2..2a6ad42 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: scala scala: - - 2.10.3 + - 2.10.4 + - 2.11.1 jdk: - openjdk7 - oraclejdk7 diff --git a/project/build.scala b/project/build.scala index 6cf1fd2..a4893e0 100644 --- a/project/build.scala +++ b/project/build.scala @@ -29,21 +29,23 @@ object CoreBuild extends Build { publishMavenStyle := true, publishTo := Some("Sonatype" at "https://oss.sonatype.org/service/local/staging/deploy/maven2"), resolvers ++= Seq(DefaultMavenRepository), - scalaVersion := "2.10.3", + scalaVersion := "2.11.1", + crossScalaVersions := Seq("2.11.1", "2.10.4"), + crossVersion := CrossVersion.binary, version := "0.27.3" ) ).aggregate(core, cli) lazy val core: Project = Project("core", file("core"), settings = (root.settings: Seq[sbt.Def.Setting[_]]) ++ Seq( - libraryDependencies ++= Seq("org.specs2" %% "specs2" % "2.3.7" % "test"), + libraryDependencies ++= Seq("org.specs2" %% "specs2" % "2.3.12" % "test"), name := "stringmetric-core" ) ) lazy val cli: Project = Project("cli", file("cli"), settings = (root.settings: Seq[sbt.Def.Setting[_]]) ++ Seq( - libraryDependencies ++= Seq("org.specs2" %% "specs2" % "2.3.7" % "test"), + libraryDependencies ++= Seq("org.specs2" %% "specs2" % "2.3.12" % "test"), name := "stringmetric-cli" ) ).dependsOn(core) |