Generate ctags also for scala/java test directories

kinowarrior · Dec 22, 2014 · 9b5d182 · 9b5d182
1 parent 6884916
commit 9b5d182
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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,