From eeb6924f4ef2c6919c62888998134f5739d4c2ae Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 14 Dec 2020 09:15:16 -0800 Subject: [PATCH] sbt 1.4.5 (was 1.4.4) --- project/build.properties | 2 +- scripts/common | 2 +- src/intellij/scala.ipr.SAMPLE | 36 ++++++++++++------------ test/benchmarks/project/build.properties | 2 +- test/jcstress/project/build.properties | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/project/build.properties b/project/build.properties index 7de0a9382f10..c06db1bb2ea4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.4 +sbt.version=1.4.5 diff --git a/scripts/common b/scripts/common index b3b960f53af8..929d78389c74 100644 --- a/scripts/common +++ b/scripts/common @@ -11,7 +11,7 @@ else fi SBT_CMD=${SBT_CMD-sbt} -SBT_CMD="$SBT_CMD -sbt-version 1.4.4" +SBT_CMD="$SBT_CMD -sbt-version 1.4.5" # repo to publish builds integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"} diff --git a/src/intellij/scala.ipr.SAMPLE b/src/intellij/scala.ipr.SAMPLE index 360b5a59c066..735950803ad4 100644 --- a/src/intellij/scala.ipr.SAMPLE +++ b/src/intellij/scala.ipr.SAMPLE @@ -325,13 +325,13 @@ - + - + - - + + @@ -355,7 +355,7 @@ - + @@ -369,8 +369,8 @@ - - + + @@ -382,13 +382,13 @@ - + - + @@ -402,16 +402,16 @@ - + - + - + - + @@ -435,18 +435,18 @@ - - + + - + - + - + diff --git a/test/benchmarks/project/build.properties b/test/benchmarks/project/build.properties index 7de0a9382f10..c06db1bb2ea4 100644 --- a/test/benchmarks/project/build.properties +++ b/test/benchmarks/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.4 +sbt.version=1.4.5 diff --git a/test/jcstress/project/build.properties b/test/jcstress/project/build.properties index 7de0a9382f10..c06db1bb2ea4 100644 --- a/test/jcstress/project/build.properties +++ b/test/jcstress/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.4 +sbt.version=1.4.5