diff --git a/build.sbt b/build.sbt index 4c5701e..44f7750 100644 --- a/build.sbt +++ b/build.sbt @@ -1,21 +1,17 @@ -Nice.scalaProject - -name := "literator" -description := "An sbt plugin which converts sources to markdown" +name := "literator" +description := "An sbt plugin which converts sources to markdown" organization := "laughedelic" sbtPlugin := true -scalaVersion := "2.10.5" -publishBucketSuffix := "era7.com" +sbtVersion := "0.13.16" +scalaVersion := "2.10.6" + +libraryDependencies ++= Seq( + "org.scalatest" %% "scalatest" % "3.0.4" % Test +) -libraryDependencies += "org.scalatest" %% "scalatest" % "2.2.5" % Test +bintrayReleaseOnPublish := !isSnapshot.value +bintrayPackageLabels := Seq("sbt", "sbt-plugin", "documentation", "literate-programming") -// disablePlugins(BintrayPlugin) -bintrayRepository in bintray := "sbt-plugins" -bintrayOrganization in bintray := None publishMavenStyle := false publishTo := (publishTo in bintray).value - - -// this is covered by the test -generateDocs := {} diff --git a/project/build.properties b/project/build.properties index 35c88ba..017bb86 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.12 +sbt.version = 1.0.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index d7281c3..d8035f9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,11 +1,7 @@ -resolvers ++= Seq( - "Era7 maven releases" at "https://s3-eu-west-1.amazonaws.com/releases.era7.com", - "Era7 maven snapshots" at "https://s3-eu-west-1.amazonaws.com/snapshots.era7.com" -) +resolvers += Resolver.jcenterRepo +resolvers += "Github-API" at "http://repo.jenkins-ci.org/public/" +resolvers += "Era7 maven releases" at "https://s3-eu-west-1.amazonaws.com/releases.era7.com" -addSbtPlugin("ohnosequences" % "nice-sbt-settings" % "0.6.0") -addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0") +addSbtPlugin("ohnosequences" % "nice-sbt-settings" % "0.9.0") - -// itself for testing: -// addSbtPlugin("laughedelic" % "literator-plugin" % "0.7.0-SNAPSHOT") +addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1") diff --git a/src/main/scala/lib/FileUtils.scala b/src/main/scala/lib/FileUtils.scala index 7a8dddf..38d626c 100644 --- a/src/main/scala/lib/FileUtils.scala +++ b/src/main/scala/lib/FileUtils.scala @@ -12,12 +12,14 @@ case class FileNode(f: File, t: List[FileNode]) { import FileUtils._ def link(base: File): String = - if (f.isSource) "["+f.name+"]["+f.relativePath(base)+"]" + if (f.isSource) s"[${f.name}][${f.relativePath(base)}]" else f.name def listTree(base: File): List[String] = { - ("+ " + link(base)) :: - t.flatMap{ i: FileNode => i.listTree(base).map{ s: String => " " + s } } + s"+ ${link(base)}" :: + t.flatMap { i: FileNode => + i.listTree(base).map { str => s" ${str}" } + } } override def toString: String = listTree(f).mkString("\n") @@ -33,7 +35,7 @@ object FileUtils { /* Returning path of `file` relatively to `base` */ def relativePath(base: File): Path = { - val b = if (base.isDirectory) base.getCanonicalFile + val b = if (base.isDirectory) base.getCanonicalFile else base.getCanonicalFile.getParentFile b.toPath.relativize(file.getCanonicalFile.toPath) } @@ -50,8 +52,8 @@ object FileUtils { /* Traversing recursively and building file hierarchy tree */ def getFileTree(filter: (File => Boolean) = (_ => true)): Option[FileNode] = if (!filter(file)) None - else Some(FileNode(file, - if (file.isDirectory) file.listFiles.toList.map(_.getFileTree(filter)).flatten + else Some(FileNode(file, + if (file.isDirectory) file.listFiles.toList.map(_.getFileTree(filter)).flatten else List() )) diff --git a/src/main/scala/plugin/LiteratorPlugin.scala b/src/main/scala/plugin/LiteratorPlugin.scala index 5d65850..b08a3c4 100644 --- a/src/main/scala/plugin/LiteratorPlugin.scala +++ b/src/main/scala/plugin/LiteratorPlugin.scala @@ -26,13 +26,13 @@ object LiteratorPlugin extends AutoPlugin { docsOutputDirs := docsMap.value.values.toSeq, docsAddIndex := false, docsCleanBefore := true, - generateDocs := { + generateDocs := { val s: TaskStreams = streams.value docsMap.value map { case (in, out) => - s.log.info("Generating documentation for " + in) + s.log.info(s"Generating documentation for ${in}") if(docsCleanBefore.value && out.exists) { - s.log.info("Cleaning up output directory " + out) + s.log.info(s"Cleaning up output directory ${out}") Defaults.doClean(Seq(out), Seq()) } @@ -40,7 +40,7 @@ object LiteratorPlugin extends AutoPlugin { errors foreach { s.log.error(_) } if (errors.nonEmpty) sys.error("Couldn't generate documentation due to parsing errors") - else s.log.info("Documentation is written to " + out) + else s.log.info(s"Documentation is written to ${out}") } } ) diff --git a/version.sbt b/version.sbt deleted file mode 100644 index 48bb0f1..0000000 --- a/version.sbt +++ /dev/null @@ -1 +0,0 @@ -version in ThisBuild := "0.8.0-SNAPSHOT" \ No newline at end of file