hanyi8000
/
Scala
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[nomerge] Update to sbt 1.3.8, remove workarounds

This commit is contained in:
Dale Wijnand 2020-02-03 22:40:39 +00:00
parent 1d6506e783
commit 85bf31536a
5 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.sbt
View File

@ -409,9 +409,6 @@ lazy val commonSettings = instanceSettings ++ clearSourceAndResourceDirectories
packageOptions in Compile in packageBin := Seq.empty,
packageOptions in Compile in packageSrc := Seq.empty,
// workaround for SBT regression. Real fix coming in https://github.com/scala/scala/pull/8525.
mappings in Compile in packageBin := (mappings in Compile in packageBin).value.filterNot(_._2 == ""),
// Lets us CTRL-C partest without exiting SBT entirely
cancelable in Global := true,

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=1.3.7
sbt.version=1.3.8

2
scripts/common
View File

@ -15,7 +15,7 @@ rm -rf "$WORKSPACE/resolutionScratch_"
mkdir -p "$WORKSPACE/resolutionScratch_"
SBT_CMD=${SBT_CMD-sbt}
SBT_CMD="$SBT_CMD -sbt-version 1.3.7"
SBT_CMD="$SBT_CMD -sbt-version 1.3.8"
# repo to publish builds
integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"}

10
src/library/scala/collection/GenIterableLike.scala
View File

@ -147,13 +147,3 @@ trait GenIterableLike[+A, +Repr] extends Any with GenTraversableLike[A, Repr] {
def zipAll[B, A1 >: A, That](that: GenIterable[B], thisElem: A1, thatElem: B)(implicit bf: CBF[Repr, (A1, B), That]): That
}
// Workaround for Scaladoc @usecase position bug scala/issues#11865
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
test/benchmarks/project/build.properties
View File

@ -1 +1 @@
sbt.version=1.3.7
sbt.version=1.3.8