diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-02-03 23:57:54 -0800 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2016-02-03 23:58:22 -0800 |
| commit | bfbe18bc70a1534b0dcdea2db45cdf1a71435a6d (patch) | |
| tree | babc4847108a7fc1deadb00d96f2ee00f6ad6beb /mavlink-plugin | |
| parent | cf714fe53c086582a0ff8b69063502624f72442c (diff) | |
| download | sbt-mavlink-bfbe18bc70a1534b0dcdea2db45cdf1a71435a6d.tar.gz sbt-mavlink-bfbe18bc70a1534b0dcdea2db45cdf1a71435a6d.tar.bz2 sbt-mavlink-bfbe18bc70a1534b0dcdea2db45cdf1a71435a6d.zip | |
Move keys to autoImport
Diffstat (limited to 'mavlink-plugin')
3 files changed, 12 insertions, 18 deletions
diff --git a/mavlink-plugin/src/main/scala/com/github/jodersky/mavlink/sbt/MavlinkKeys.scala b/mavlink-plugin/src/main/scala/com/github/jodersky/mavlink/sbt/MavlinkKeys.scala deleted file mode 100644 index e09a623..0000000 --- a/mavlink-plugin/src/main/scala/com/github/jodersky/mavlink/sbt/MavlinkKeys.scala +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.jodersky.mavlink.sbt - -import sbt._ -import sbt.Keys._ -import java.io.File - -object MavlinkKeys { - - lazy val mavlinkDialect = settingKey[File]("Dialect definition from which to generate files.") - lazy val mavlinkTarget = settingKey[File]("Target directory to contain all generated mavlink files.") - - lazy val mavlinkGenerate = taskKey[Seq[File]]("Generate mavlink files.") - -}
\ No newline at end of file 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 21a3114..05e014a 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 @@ -1,7 +1,5 @@ package com.github.jodersky.mavlink.sbt -import MavlinkKeys._ - import com.github.jodersky.mavlink.Generator import com.github.jodersky.mavlink.Parser import com.github.jodersky.mavlink.Reporter @@ -14,6 +12,16 @@ object SbtMavlink extends AutoPlugin { override def requires = JvmPlugin //this is required as sourceGenerators are otherwise reset + object autoImport { + + lazy val mavlinkDialect = settingKey[File]("Dialect definition from which to generate files.") + lazy val mavlinkTarget = settingKey[File]("Target directory to contain all generated mavlink files.") + + lazy val mavlinkGenerate = taskKey[Seq[File]]("Generate mavlink files.") + + } + import autoImport._ + override lazy val projectSettings: Seq[Setting[_]] = Seq( mavlinkDialect := baseDirectory.value / "conf" / "mavlink.xml", mavlinkTarget := (sourceManaged in Compile).value, diff --git a/mavlink-plugin/src/sbt-test/sbt-mavlink/codec/build.sbt b/mavlink-plugin/src/sbt-test/sbt-mavlink/codec/build.sbt index d4035f2..15915be 100644 --- a/mavlink-plugin/src/sbt-test/sbt-mavlink/codec/build.sbt +++ b/mavlink-plugin/src/sbt-test/sbt-mavlink/codec/build.sbt @@ -1,4 +1,4 @@ -import com.github.jodersky.mavlink.sbt.MavlinkKeys._ +enablePlugins(SbtMavlink) mavlinkDialect := baseDirectory.value / "mavlink.xml" @@ -8,4 +8,4 @@ name := "test" organization := "test" -version := "1.0"
\ No newline at end of file +version := "1.0" |