Merge branch '2.13.x' into advance-2.13-shas-20201223

SethTisue · SethTisue · commit 32457b581c64 · 2020-12-24T07:57:44.000-08:00
diff --git a/advance b/advance
@@ -1,4 +1,4 @@
-#!/usr/bin/env sbt -sbt-create -Dsbt.version=1.4.5 -Dsbt.main.class=sbt.ScriptMain -Dsbt.supershell=false -error
+#!/usr/bin/env sbt -sbt-create -Dsbt.version=1.4.6 -Dsbt.main.class=sbt.ScriptMain -Dsbt.supershell=false -error
 
 // to advance all projects:
 //   % ./advance scalacheck
diff --git a/community.conf b/community.conf
@@ -32,7 +32,7 @@ vars {
   sbt-0-13-version: "0.13.18"
   sbt-1-2-version: "1.2.8"
   sbt-1-3-version: "1.3.13"
-  sbt-version: "1.4.5"
+  sbt-version: "1.4.6"
   sbt-java-options: ["-Xms1536m", "-Xmx1536m", "-Xss2m"]
 }
 
diff --git a/narrow b/narrow
@@ -1,4 +1,4 @@
-#!/usr/bin/env sbt -sbt-create -Dsbt.version=1.4.5 -Dsbt.main.class=sbt.ScriptMain -Dsbt.supershell=false -error
+#!/usr/bin/env sbt -sbt-create -Dsbt.version=1.4.6 -Dsbt.main.class=sbt.ScriptMain -Dsbt.supershell=false -error
 
 // to narrow projs.conf to just one project and its dependencies:
 //   % ./narrow scalacheck
diff --git a/report/project/build.properties b/report/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.5
+sbt.version=1.4.6

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env sbt -sbt-create -Dsbt.version=1.4.5 -Dsbt.main.class=sbt.ScriptMain -Dsbt.supershell=false -error`
	`1`	`+#!/usr/bin/env sbt -sbt-create -Dsbt.version=1.4.6 -Dsbt.main.class=sbt.ScriptMain -Dsbt.supershell=false -error`
`2`	`2`
`3`	`3`	`// to advance all projects:`
`4`	`4`	`// % ./advance scalacheck`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ vars {`
`32`	`32`	`sbt-0-13-version: "0.13.18"`
`33`	`33`	`sbt-1-2-version: "1.2.8"`
`34`	`34`	`sbt-1-3-version: "1.3.13"`
`35`		`- sbt-version: "1.4.5"`
	`35`	`+ sbt-version: "1.4.6"`
`36`	`36`	`sbt-java-options: ["-Xms1536m", "-Xmx1536m", "-Xss2m"]`
`37`	`37`	`}`
`38`	`38`