Skip to content

sbt-dotty: Use default dependency resolution, release 0.4.1 #8653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 3, 2020
Merged

sbt-dotty: Use default dependency resolution, release 0.4.1 #8653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
625efde
community-build: actually turn off supershell
smarter Apr 2, 2020
b7afd38
sbt-dotty: Use default dependency resolution
smarter Apr 2, 2020
0a1a010
sbt-dotty: Release 0.4.1
smarter Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 1 addition & 6 deletions sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down