Skip to content

Make the sbt scripted tests use the caching resolver: reenable the eff integration test #7599

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 2 commits into from
Nov 22, 2019
Merged

Make the sbt scripted tests use the caching resolver: reenable the eff integration test #7599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffc423a
Make the sbt scripted tests use the caching resolver
smarter Nov 21, 2019
20501c1
Reenable the eff integration test
smarter Nov 21, 2019
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
8 changes: 6 additions & 2 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,8 +1041,12 @@ object Build {
"-Dplugin.scalaVersion=" + dottyVersion,
"-Dsbt.boot.directory=" + ((baseDirectory in ThisBuild).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469
),
// Pass along ivy home setting to sbt instances run from the tests
scriptedLaunchOpts ++= ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList,
// Pass along ivy home and repositories settings to sbt instances run from the tests
scriptedLaunchOpts ++= {
val repositoryPath = (io.Path.userHome / ".sbt" / "repositories").absolutePath
s"-Dsbt.repository.config=$repositoryPath" ::
ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList
},
scriptedBufferLog := true,
scripted := scripted.dependsOn(
publishLocal in `dotty-sbt-bridge`,
Expand Down
2 changes: 1 addition & 1 deletion sbt-dotty/sbt-test/scala2-compat/eff/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scalaVersion := sys.props("plugin.scalaVersion")

libraryDependencies +=
("org.atnos" %% "eff" % "5.4.1").withDottyCompat(scalaVersion.value)
("org.atnos" %% "eff" % "5.5.2").withDottyCompat(scalaVersion.value)
2 changes: 0 additions & 2 deletions sbt-dotty/sbt-test/scala2-compat/eff/pending
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions sbt-dotty/sbt-test/scala2-compat/eff/test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
> compile