Giter8 0.11.0

.travis.yml

@@ -1,11 +1,11 @@
 language: scala
 
 scala:
-  - 2.10.6
-  - 2.12.1
+  - 2.10.7
+  - 2.12.6
 
 script:
-  - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "++$TRAVIS_SCALA_VERSION test"
+  - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "++$TRAVIS_SCALA_VERSION! test"
 
 jdk:
   - oraclejdk8

build.sbt

@@ -2,36 +2,47 @@ import Dependencies._
 
 def baseVersion: String = "0.1.3-SNAPSHOT"
 
-lazy val root = (project in file(".")).
-  settings(
-    inThisBuild(List(
+lazy val root = (project in file(".")).settings(
+  inThisBuild(
+    List(
       organization := "org.scala-sbt.sbt-giter8-resolver",
       git.baseVersion := baseVersion,
-      scalaVersion := "2.10.6",
-      crossScalaVersions := List("2.10.6", "2.12.1"),
+      scalaVersion := "2.10.7",
+      crossScalaVersions := List("2.10.7", "2.12.6"),
       homepage := Some(url("https://github.com/sbt/sbt-giter8-resolver")),
       description := "template resolver for sbt new command with Giter8 support",
-      licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
+      licenses := Seq(
+        "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
       developers := List(
-        Developer("eed3si9n", "Eugene Yokota", "@eed3si9n", url("https://github.com/eed3si9n"))
+        Developer("eed3si9n",
+                  "Eugene Yokota",
+                  "@eed3si9n",
+                  url("https://github.com/eed3si9n"))
       ),
-      scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt-giter8-resolver"), "git@github.com:sbt/sbt-giter8-resolver.git"))
+      scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt-giter8-resolver"),
+                              "git@github.com:sbt/sbt-giter8-resolver.git"))
     )),
-    name := "sbt-giter8-resolver",
-    libraryDependencies ++= List(templateResolverApi, giter8, launcherInterface % Provided),
-    bintrayOrganization := Some("sbt"),
-    bintrayRepository := "maven-releases",
-    bintrayPackage := "sbt-giter8-resolver",
-    bintrayReleaseOnPublish := false,
-    relaxNon212
-  )
+  name := "sbt-giter8-resolver",
+  libraryDependencies ++= List(templateResolverApi,
+                               giter8,
+                               launcherInterface % Provided),
+  bintrayOrganization := Some("sbt"),
+  bintrayRepository := "maven-releases",
+  bintrayPackage := "sbt-giter8-resolver",
+  bintrayReleaseOnPublish := false,
+  relaxNon212
+)
 
 def relaxNon212: Seq[Setting[_]] = Seq(
-    scalacOptions := {
-      val old = scalacOptions.value
-      scalaBinaryVersion.value match {
-        case "2.12" => old
-        case _      => old filterNot Set("-Xfatal-warnings", "-deprecation", "-Ywarn-unused", "-Ywarn-unused-import")
-      }
+  scalacOptions := {
+    val old = scalacOptions.value
+    scalaBinaryVersion.value match {
+      case "2.12" => old
+      case _ =>
+        old filterNot Set("-Xfatal-warnings",
+                          "-deprecation",
+                          "-Ywarn-unused",
+                          "-Ywarn-unused-import")
     }
-  )
+  }
+)

project/Dependencies.scala

@@ -3,6 +3,6 @@ import Keys._
 
 object Dependencies {
   lazy val templateResolverApi = "org.scala-sbt" % "template-resolver" % "0.1"
-  lazy val giter8 = "org.foundweekends.giter8" %% "giter8" % "0.7.2"
-  lazy val launcherInterface = "org.scala-sbt" % "launcher-interface" % "1.0.0-M1"
+  lazy val giter8 = "org.foundweekends.giter8" %% "giter8" % "0.11.0"
+  lazy val launcherInterface = "org.scala-sbt" % "launcher-interface" % "1.0.4"
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=1.1.6

project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("org.scala-sbt"     % "sbt-houserules"  % "0.3.7")

src/main/scala/sbt/Giter8TemplateResolver.scala

@@ -3,30 +3,29 @@ package sbtgiter8resolver
 import sbt.template.TemplateResolver
 
 class Giter8TemplateResolver extends TemplateResolver {
-  def isDefined(args0: Array[String]): Boolean =
-    {
-      val args = args0.toList filterNot { _.startsWith("-") }
-      // Mandate .g8
-      val Github = """^([^\s/]+)/([^\s/]+?)(?:\.g8)$""".r
-      val Local = """^file://(\S+)(?:\.g8)(?:/)?$""".r
-      object GitUrl {
-        val NativeUrl = "^(git[@|://].*)$".r
-        val HttpsUrl = "^(https://.*)$".r
-        val HttpUrl = "^(http://.*)$".r
-        val SshUrl = "^(ssh://.*)$".r
-        def unapplySeq(s: Any): Option[List[String]] =
-          NativeUrl.unapplySeq(s) orElse
-            HttpsUrl.unapplySeq(s) orElse
-            HttpUrl.unapplySeq(s) orElse
-            SshUrl.unapplySeq(s)
-      }
-      args.headOption match {
-        case Some(Github(_, _)) => true
-        case Some(Local(_))     => true
-        case Some(GitUrl(uri))  => uri.mkString("") endsWith (".g8.git")
-        case _                  => false
-      }
+  def isDefined(args0: Array[String]): Boolean = {
+    val args = args0.toList filterNot { _.startsWith("-") }
+    // Mandate .g8
+    val Github = """^([^\s/]+)/([^\s/]+?)(?:\.g8)$""".r
+    val Local = """^file://(\S+)(?:\.g8)(?:/)?$""".r
+    object GitUrl {
+      val NativeUrl = "^(git[@|://].*)$".r
+      val HttpsUrl = "^(https://.*)$".r
+      val HttpUrl = "^(http://.*)$".r
+      val SshUrl = "^(ssh://.*)$".r
+      def unapplySeq(s: Any): Option[List[String]] =
+        NativeUrl.unapplySeq(s) orElse
+          HttpsUrl.unapplySeq(s) orElse
+          HttpUrl.unapplySeq(s) orElse
+          SshUrl.unapplySeq(s)
     }
+    args.headOption match {
+      case Some(Github(_, _)) => true
+      case Some(Local(_))     => true
+      case Some(GitUrl(uri))  => uri.mkString("") endsWith (".g8.git")
+      case _                  => false
+    }
+  }
   def run(args: Array[String]): Unit =
     giter8.Giter8.run(args)
 }