Move keys to autoImport

5 files changed, 15 insertions, 20 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"
diff --git a/project/Build.scala b/project/Build.scala
index b81634c..bb3abfc 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.5.1"
+    version := "0.5.2"
   ) ++ publishSettings
 
   lazy val root = (
@@ -50,7 +50,7 @@ object ApplicationBuild extends Build {
     )
     dependsOn(library)
   )
-  
+
   lazy val publishSettings: Seq[Setting[_]] = Seq(
     licenses := Seq(("LGPL", url("http://opensource.org/licenses/LGPL-3.0"))),
     homepage := Some(url("http://github.com/jodersky/sbt-mavlink")),
diff --git a/project/build.properties b/project/build.properties
new file mode 100644
index 0000000..176a863
--- /dev/null
+++ b/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.13.9
\ No newline at end of file