Merge remote-tracking branch 'origin/2.11.x-jdk8' into 2.12.x

SethTisue · SethTisue · commit 7156c551fab6 · 2016-02-24T17:37:43.000-05:00
diff --git a/common.conf b/common.conf
@@ -126,7 +126,7 @@ vars: {
   spray-json-shapeless-ref     : "fommil/spray-json-shapeless.git#v1.1.0"
 
   // version settings
-  sbt-version-override         : "0.13.9"
+  sbt-version-override         : "0.13.11"
 }
 
 vars {
@@ -468,7 +468,7 @@ build += {
     name:   "fastparse",
     uri:    "http://github.com/"${vars.fastparse-ref}
     // no Scala.js plz
-    extra.projects: ["fastparseJVM", "scalaparseJVM"]
+    extra.projects: ["fastparseJVM"]
     extra.run-tests: false // TODO: tests depend on lambda toString looking like e.g `<function1>`
   }
 

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ vars: {`
`126`	`126`	`spray-json-shapeless-ref : "fommil/spray-json-shapeless.git#v1.1.0"`
`127`	`127`
`128`	`128`	`// version settings`
`129`		`- sbt-version-override : "0.13.9"`
	`129`	`+ sbt-version-override : "0.13.11"`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`vars {`
`@@ -468,7 +468,7 @@ build += {`
`468`	`468`	`name: "fastparse",`
`469`	`469`	`uri: "http://github.com/"${vars.fastparse-ref}`
`470`	`470`	`// no Scala.js plz`
`471`		`- extra.projects: ["fastparseJVM", "scalaparseJVM"]`
	`471`	`+ extra.projects: ["fastparseJVM"]`
`472`	`472`	extra.run-tests: false // TODO: tests depend on lambda toString looking like e.g `<function1>`
`473`	`473`	`}`
`474`	`474`