From aa26ae64b9ae12ae9aef17de327efe8bdf3036af Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 10 Jan 2018 15:42:42 +0000 Subject: [PATCH 1/4] Add version 1.1.2 to mimaPreviousArtifacts --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3b35213c5..a32a71f16 100644 --- a/build.sbt +++ b/build.sbt @@ -32,7 +32,7 @@ def commonSettings: Seq[Setting[_]] = Seq( val mimaSettings = Def settings ( mimaPreviousArtifacts := Set( "1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4", - "1.1.0", "1.1.1", + "1.1.0", "1.1.1", "1.1.2", ) map (version => organization.value %% moduleName.value % version cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled) From 86c59d8f72b716492f021367ac572a2618af0b6b Mon Sep 17 00:00:00 2001 From: OlegYch Date: Thu, 18 Jan 2018 16:04:37 +0300 Subject: [PATCH 2/4] avoid deadlocks on spotty connections, fix https://github.com/sbt/sbt/issues/3738 --- .../librarymanagement/ivyint/ParallelResolveEngine.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala old mode 100644 new mode 100755 index 4e3b4bedd..326c500b2 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala @@ -38,7 +38,9 @@ private[sbt] class ParallelResolveEngine(settings: ResolveEngineSettings, val allDownloads = dependencies.par.flatMap { dep => if (!(dep.isCompletelyEvicted || dep.hasProblem) && dep.getModuleRevision != null) { - ParArray(downloadNodeArtifacts(dep, artifactFilter, options)) + scala.concurrent.blocking { + ParArray(downloadNodeArtifacts(dep, artifactFilter, options)) + } } else ParArray.empty[DownloadResult] } From d267b6fda5970fb0a465579c2698605512048736 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Thu, 18 Jan 2018 18:27:03 +0300 Subject: [PATCH 3/4] clarify intent --- .../librarymanagement/ivyint/ParallelResolveEngine.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala index 326c500b2..f461d0cdf 100755 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala @@ -38,6 +38,7 @@ private[sbt] class ParallelResolveEngine(settings: ResolveEngineSettings, val allDownloads = dependencies.par.flatMap { dep => if (!(dep.isCompletelyEvicted || dep.hasProblem) && dep.getModuleRevision != null) { + //don't block in global ec to avoid deadlocks scala.concurrent.blocking { ParArray(downloadNodeArtifacts(dep, artifactFilter, options)) } From bfe347cd22f9b362e2f12b501ba6c6c16b1af85f Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 14 Feb 2018 10:46:24 +0000 Subject: [PATCH 4/4] Update version/mimaPreviousArtifacts/sbt.version --- build.sbt | 6 ++---- project/build.properties | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index a32a71f16..642a91b22 100644 --- a/build.sbt +++ b/build.sbt @@ -2,8 +2,6 @@ import Dependencies._ import Path._ //import com.typesafe.tools.mima.core._, ProblemFilters._ -def baseVersion = "1.0.0-SNAPSHOT" - def commonSettings: Seq[Setting[_]] = Seq( scalaVersion := scala212, // publishArtifact in packageDoc := false, @@ -32,7 +30,7 @@ def commonSettings: Seq[Setting[_]] = Seq( val mimaSettings = Def settings ( mimaPreviousArtifacts := Set( "1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4", - "1.1.0", "1.1.1", "1.1.2", + "1.1.0", "1.1.1", "1.1.2", "1.1.3", ) map (version => organization.value %% moduleName.value % version cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled) @@ -61,7 +59,7 @@ lazy val lmRoot = (project in file(".")) }, bintrayPackage := "librarymanagement", scalafmtOnCompile in Sbt := false, - git.baseVersion := baseVersion, + git.baseVersion := "1.1.3", version := { val v = version.value if (v contains "SNAPSHOT") git.baseVersion.value diff --git a/project/build.properties b/project/build.properties index 394cb75cf..31334bbd3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.0.4 +sbt.version=1.1.1