From 625efdec31461bdb8ba59e84a23c9602f55f5698 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 2 Apr 2020 17:54:34 +0200 Subject: [PATCH 1/3] community-build: actually turn off supershell The option was passed in the wrong place so wasn't actually set most of the time. --- .../test/scala/dotty/communitybuild/CommunityBuildTest.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index c878687fe5ac..072978cd0715 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -103,10 +103,11 @@ final case class SbtCommunityProject( override val runCommandsArgs: List[String] = // Run the sbt command with the compiler version and sbt plugin set in the build val sbtProps = Option(System.getProperty("sbt.ivy.home")) match - case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome", "-Dsbt.supershell=false") + case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome") case _ => Nil extraSbtArgs ++ sbtProps ++ List( "-sbt-version", "1.3.8", + "-Dsbt.supershell=false", s"--addPluginSbtFile=$sbtPluginFilePath") object projects: From b7afd38f11d5f98c2e90ae8424fcbe6f4fe12d3d Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 2 Apr 2020 17:42:39 +0200 Subject: [PATCH 2/3] sbt-dotty: Use default dependency resolution In particular, this should use coursier instead of ivy unless someone forced the use of ivy. And we shouldn't have to worry about inter-project dependencies in the dotty build because of https://github.com/coursier/sbt-coursier/pull/101. --- sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala b/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala index b4a5da54086c..5b7a2bb5fd03 100644 --- a/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala +++ b/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala @@ -405,15 +405,10 @@ object DottyPlugin extends AutoPlugin { /** Create a scalaInstance task that uses Dotty based on `moduleName`. */ def dottyScalaInstanceTask(moduleName: String): Initialize[Task[ScalaInstance]] = Def.task { - val ivyConfig0 = Classpaths.mkIvyConfiguration.value - // When compiling non-bootstrapped projects in the build of Dotty itself, - // dependency resolution might pick a local project which is not what we - // want. We avoid this by dropping the inter-project resolver. - val ivyConfig1 = ivyConfig0.withResolvers(ivyConfig0.resolvers.filter(_.name != "inter-project")) val updateReport = fetchArtifactsOf( scalaOrganization.value %% moduleName % scalaVersion.value, - ivy.IvyDependencyResolution(ivyConfig1), + dependencyResolution.value, scalaModuleInfo.value, updateConfiguration.value, (unresolvedWarningConfiguration in update).value, From 0a1a010eeebbd32d43b748f27a2fa5ad93d335bb Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 2 Apr 2020 19:33:10 +0200 Subject: [PATCH 3/3] sbt-dotty: Release 0.4.1 --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index b99bc81b3acc..0e2eec2b40f2 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -65,7 +65,7 @@ object Build { val referenceVersion = "0.24.0-bin-20200325-37eec14-NIGHTLY" val baseVersion = "0.24.0" - val baseSbtDottyVersion = "0.4.0" + val baseSbtDottyVersion = "0.4.1" // Versions used by the vscode extension to create a new project // This should be the latest published releases.