From 6f782f2cd174b89ad26be4f5c5d1bda5fd704125 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 3 Jan 2022 12:19:18 +0100 Subject: [PATCH 1/4] Upgrade to SBT 1.6.1 --- community-build/src/scala/dotty/communitybuild/projects.scala | 2 +- project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 23b37c042388..8dfbd9fbea7e 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -140,7 +140,7 @@ final case class SbtCommunityProject( case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome") case _ => Nil extraSbtArgs ++ sbtProps ++ List( - "-sbt-version", "1.5.7", + "-sbt-version", "1.6.1", "-Dsbt.supershell=false", s"-Ddotty.communitybuild.dir=$communitybuildDir", s"--addPluginSbtFile=$sbtPluginFilePath" diff --git a/project/build.properties b/project/build.properties index baf5ff3ec78b..3161d2146c63 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.7 +sbt.version=1.6.1 From ba7e8f701f67bdfca514d1df6b71881c00c96705 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 4 Jan 2022 09:56:20 +0100 Subject: [PATCH 2/4] Update cmdTest to SBT 1.6.1 --- .../sourcepath-with-inline-api-hash/project/build.properties | 2 +- .../sourcepath-with-inline/project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties index 10fd9eee04ac..3161d2146c63 100644 --- a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.6.1 diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties index 10fd9eee04ac..3161d2146c63 100644 --- a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.6.1 From 8ddccabb89300cd235c05adc99b4da10ffc002b8 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 4 Jan 2022 09:57:31 +0100 Subject: [PATCH 3/4] Upgrade sbt-test to SBT 1.6.1 --- sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties b/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties index a919a9b5f46b..3161d2146c63 100644 --- a/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties +++ b/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.8 +sbt.version=1.6.1 From ef5b6b51631a582f1b62c6177a0c9f2fdfae5d3e Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 4 Jan 2022 09:58:12 +0100 Subject: [PATCH 4/4] Upgrade semanticdb to SBT 1.6.1 --- semanticdb/project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semanticdb/project/build.properties b/semanticdb/project/build.properties index 7c58a83abffb..3161d2146c63 100644 --- a/semanticdb/project/build.properties +++ b/semanticdb/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.6 +sbt.version=1.6.1