From 9b5d182a42ee3a0b05fe74415a554d34298bd5f1 Mon Sep 17 00:00:00 2001
From: Federico Ragona <federico.ragona@gmail.com>
Date: Mon, 22 Dec 2014 23:51:30 +0100
Subject: [PATCH 1/3] Generate ctags also for scala/java test directories

---
 build.sbt                                          | 7 ++++---
 src/main/scala/net/ceedubs/sbtctags/SbtCtags.scala | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index b10637e..230959e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -22,14 +22,15 @@ scmInfo := Some(
   )
 )
 
-scalaVersion := "2.10.0"
-
 scalacOptions ++= Seq(
   "-deprecation",
   "-unchecked",
-  "-encoding", "UTF-8"
+  "-encoding", "UTF-8",
+  "-target:jvm-1.7"
 )
 
+javacOptions ++= Seq("-source", "1.7")
+
 /* publishing */
 publishMavenStyle := true
 
diff --git a/src/main/scala/net/ceedubs/sbtctags/SbtCtags.scala b/src/main/scala/net/ceedubs/sbtctags/SbtCtags.scala
index 6aeae0d..8bdff93 100644
--- a/src/main/scala/net/ceedubs/sbtctags/SbtCtags.scala
+++ b/src/main/scala/net/ceedubs/sbtctags/SbtCtags.scala
@@ -36,8 +36,8 @@ object SbtCtags extends Plugin {
 
       CtagsKeys.ctagsSrcFileFilter <<= CtagsKeys.ctagsParams(_.languages.foldLeft(NameFilter.fnToNameFilter(_ => false))((filter, lang) => filter | GlobFilter(s"*.$lang"))),
 
-      CtagsKeys.ctagsSrcDirs <<= (Keys.scalaSource in Compile, Keys.javaSource in Compile, CtagsKeys.dependencySrcUnzipDir){ (srcDir, javaSrcDir, depSrcDir) =>
-        Seq(srcDir, javaSrcDir, depSrcDir)
+      CtagsKeys.ctagsSrcDirs <<= (Keys.scalaSource in Compile, Keys.scalaSource in Test, Keys.javaSource in Compile, Keys.javaSource in Test, CtagsKeys.dependencySrcUnzipDir){ (srcDir, testDir, javaSrcDir, javaTestDir, depSrcDir) =>
+        Seq(srcDir, testDir, javaSrcDir, javaTestDir, depSrcDir)
       },
 
       CtagsKeys.ctagsGeneration in ThisBuild := defaultCtagsGeneration,

From 751d074aacf6738fd58bbc94954a1378b20be348 Mon Sep 17 00:00:00 2001
From: Federico Ragona <federico.ragona@gmail.com>
Date: Mon, 12 Jan 2015 20:50:55 +0100
Subject: [PATCH 2/3] Bump Scala version to 2.10.4

---
 build.sbt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.sbt b/build.sbt
index 230959e..81be8c3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -22,6 +22,8 @@ scmInfo := Some(
   )
 )
 
+scalaVersion := "2.10.4"
+
 scalacOptions ++= Seq(
   "-deprecation",
   "-unchecked",

From 384249853b2ac37d53d12997223c7196b38c1f17 Mon Sep 17 00:00:00 2001
From: Federico Ragona <federico.ragona@gmail.com>
Date: Mon, 12 Jan 2015 21:16:14 +0100
Subject: [PATCH 3/3] Undo targeting for java 1.7

---
 build.sbt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build.sbt b/build.sbt
index 81be8c3..c6063fd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -27,12 +27,9 @@ scalaVersion := "2.10.4"
 scalacOptions ++= Seq(
   "-deprecation",
   "-unchecked",
-  "-encoding", "UTF-8",
-  "-target:jvm-1.7"
+  "-encoding", "UTF-8"
 )
 
-javacOptions ++= Seq("-source", "1.7")
-
 /* publishing */
 publishMavenStyle := true