diff options
| author | = <=> | 2014-05-28 16:51:08 +0200 |
|---|---|---|
| committer | = <=> | 2014-05-28 16:51:08 +0200 |
| commit | 759341b041913f5b2de47be45e3f3c4d4d8c77fa (patch) | |
| tree | eb33a612b641cb992cf91e5f96022359e1e4725d /project | |
| parent | cf090f79b912cd879e23de394885f5e0ce210217 (diff) | |
| download | akka-serial-759341b041913f5b2de47be45e3f3c4d4d8c77fa.tar.gz akka-serial-759341b041913f5b2de47be45e3f3c4d4d8c77fa.tar.bz2 akka-serial-759341b041913f5b2de47be45e3f3c4d4d8c77fa.zip | |
add cross-compilation and remove scala version from native jarv2.0.2
Diffstat (limited to 'project')
| -rw-r--r-- | project/FlowBuild.scala | 6 | ||||
| -rw-r--r-- | project/build.properties | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala index 2b59910..450033b 100644 --- a/project/FlowBuild.scala +++ b/project/FlowBuild.scala @@ -8,14 +8,15 @@ import NativeKeys._ object FlowBuild extends Build { val Organization = "com.github.jodersky" val ScalaVersion = "2.11.1" - val Version = "2.0.1" + val Version = "2.0.2" lazy val commonSettings: Seq[Setting[_]] = UniqueVersionDefaults.settings ++ Seq( organization := Organization, - scalaVersion := ScalaVersion, + scalaVersion in ThisBuild := ScalaVersion, + crossScalaVersions in ThisBuild := Seq("2.10.4", ScalaVersion), baseVersion := Version, licenses := Seq(("BSD-3-Clause", url("http://opensource.org/licenses/BSD-3-Clause"))), homepage := Some(url("http://github.com/jodersky/flow")), @@ -81,6 +82,7 @@ object FlowBuild extends Build { settings(publishSettings: _*) settings(NativeDefaults.settings: _*) settings( + crossPaths := false, nativeBuildDirectory := (baseDirectory in ThisBuild).value / "flow-native" ) ) diff --git a/project/build.properties b/project/build.properties index 8ac605a..be6c454 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.2 +sbt.version=0.13.5 |