Merge tag '0.6.8'

thyandrecardoso · Jan 13, 2015 · 9bfc23a · 9bfc23a
2 parents fe26e4e + 71bacad
commit 9bfc23a
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 3 deletions.
diff --git a/app/src/main/ls/0.6.8.json b/app/src/main/ls/0.6.8.json
@@ -0,0 +1,49 @@
+{
+  "organization" : "net.databinder.giter8",
+  "name" : "giter8",
+  "version" : "0.6.8",
+  "description" : "Command line tool to apply templates defined on github",
+  "site" : "https://github.com/n8han/giter8",
+  "tags" : [ ],
+  "docs" : "",
+  "resolvers" : [ "https://oss.sonatype.org/content/repositories/releases" ],
+  "dependencies" : [ {
+    "organization" : "org.clapper",
+    "name" : "scalasti",
+    "version" : "2.0.0"
+  }, {
+    "organization" : "jline",
+    "name" : "jline",
+    "version" : "1.0"
+  }, {
+    "organization" : "org.scala-sbt",
+    "name" : "launcher-interface",
+    "version" : "0.13.5"
+  }, {
+    "organization" : "org.eclipse.jgit",
+    "name" : "org.eclipse.jgit",
+    "version" : "1.3.0.201202151440-r"
+  }, {
+    "organization" : "com.github.scopt",
+    "name" : "scopt",
+    "version" : "3.1.0"
+  }, {
+    "organization" : "net.databinder",
+    "name" : "dispatch-json",
+    "version" : "0.8.10"
+  }, {
+    "organization" : "net.databinder",
+    "name" : "dispatch-http",
+    "version" : "0.8.10"
+  }, {
+    "organization" : "org.scala-sbt",
+    "name" : "launcher-interface",
+    "version" : "0.13.5"
+  } ],
+  "scalas" : [ "2.10.4" ],
+  "licenses" : [ {
+    "name" : "LGPL v3",
+    "url" : "http://www.gnu.org/licenses/lgpl.txt"
+  } ],
+  "sbt" : false
+}
diff --git a/library/src/main/scala/maven.scala b/library/src/main/scala/maven.scala
@@ -48,7 +48,7 @@ object Maven extends JavaTokenParsers {
       case (k, value)            => k -> Right(value)
     }
     val initial: Either[String, G8.OrderedProperties] = Right(List.empty)
-    defaults.foldLeft(initial) {
+    defaults.reverseIterator.foldLeft(initial) {
       case (accumEither, (k, either)) =>
         for {
           cur   <- accumEither.right

diff --git a/notes/0.6.8.markdown b/notes/0.6.8.markdown
@@ -0,0 +1,3 @@
+Fixes a regression introduced in 0.6.7.
+
+* Properties are computed out-of-order in 0.6.7 (causing breakage) [#151](https://github.com/n8han/giter8/issues/151) 
diff --git a/project/build.scala b/project/build.scala
@@ -6,7 +6,7 @@ object Builds extends sbt.Build {
   import sbtbuildinfo.Plugin._
   import conscript.Harness.conscriptSettings
 
-  val g8version = "0.6.7"
+  val g8version = "0.6.8"
 
   val typesafeRepo = "Typesafe repo" at "http://repo.typesafe.com/typesafe/repo/"
   lazy val buildSettings = Defaults.defaultSettings ++ lsSettings ++ Seq(

diff --git a/src/main/conscript/g8/launchconfig b/src/main/conscript/g8/launchconfig
@@ -1,5 +1,5 @@
 [app]
-  version: 0.6.7
+  version: 0.6.8
   org: net.databinder.giter8
   name: giter8
   class: giter8.Giter8
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Fixes a regression introduced in 0.6.7.

		* Properties are computed out-of-order in 0.6.7 (causing breakage) [#151](https://github.com/n8han/giter8/issues/151)