From 24b02aab563de43db696de73b81c65a20f9a6587 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Tue, 24 Mar 2015 00:56:12 +0100 Subject: output sources into main --- README.md | 2 +- .../src/main/scala/com/github/jodersky/mavlink/sbt/SbtMavlink.scala | 2 +- mavlink-plugin/src/sbt-test/sbt-mavlink/codec/test | 2 +- project/Build.scala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ec8e7b1..f307268 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ can be guaranteed when generating messages.* Add the following to your plugins: ```scala - addSbtPlugin("com.github.jodersky" % "sbt-mavlink" % "0.4")` + addSbtPlugin("com.github.jodersky" % "sbt-mavlink" % "0.4.1")` ``` Set a MAVLink dialect diff --git a/mavlink-plugin/src/main/scala/com/github/jodersky/mavlink/sbt/SbtMavlink.scala b/mavlink-plugin/src/main/scala/com/github/jodersky/mavlink/sbt/SbtMavlink.scala index 03beaaa..afd2c94 100644 --- a/mavlink-plugin/src/main/scala/com/github/jodersky/mavlink/sbt/SbtMavlink.scala +++ b/mavlink-plugin/src/main/scala/com/github/jodersky/mavlink/sbt/SbtMavlink.scala @@ -20,7 +20,7 @@ object SbtMavlink extends AutoPlugin { override lazy val projectSettings: Seq[Setting[_]] = Seq( mavlinkDialect := baseDirectory.value / "conf" / "mavlink.xml", - mavlinkTarget := sourceManaged.value, + mavlinkTarget := (sourceManaged in Compile).value, mavlinkGenerate := generationTask.value, sourceGenerators in Compile += mavlinkGenerate.taskValue ) diff --git a/mavlink-plugin/src/sbt-test/sbt-mavlink/codec/test b/mavlink-plugin/src/sbt-test/sbt-mavlink/codec/test index c009de9..3cc4546 100644 --- a/mavlink-plugin/src/sbt-test/sbt-mavlink/codec/test +++ b/mavlink-plugin/src/sbt-test/sbt-mavlink/codec/test @@ -1,3 +1,3 @@ # check if the files get created > run -$ exists target/scala-2.10/src_managed/org/mavlink \ No newline at end of file +$ exists target/scala-2.10/src_managed/main/org/mavlink \ No newline at end of file diff --git a/project/Build.scala b/project/Build.scala index cf15776..a3e42c2 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -10,7 +10,7 @@ object ApplicationBuild extends Build { scalaVersion := "2.10.4", scalacOptions ++= Seq("-feature", "-deprecation"), organization := "com.github.jodersky", - version := "0.4-SNAPSHOT" + version := "0.4.1-SNAPSHOT" ) ++ publishSettings lazy val root = ( -- cgit v1.2.3