Skip to content

Commit 926a0c8

Browse files
Merge pull request #7599 from dotty-staging/sbt-scripted-cache
Make the sbt scripted tests use the caching resolver: reenable the eff integration test
2 parents f0a5769 + 20501c1 commit 926a0c8

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

project/Build.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,8 +1041,12 @@ object Build {
10411041
"-Dplugin.scalaVersion=" + dottyVersion,
10421042
"-Dsbt.boot.directory=" + ((baseDirectory in ThisBuild).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469
10431043
),
1044-
// Pass along ivy home setting to sbt instances run from the tests
1045-
scriptedLaunchOpts ++= ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList,
1044+
// Pass along ivy home and repositories settings to sbt instances run from the tests
1045+
scriptedLaunchOpts ++= {
1046+
val repositoryPath = (io.Path.userHome / ".sbt" / "repositories").absolutePath
1047+
s"-Dsbt.repository.config=$repositoryPath" ::
1048+
ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList
1049+
},
10461050
scriptedBufferLog := true,
10471051
scripted := scripted.dependsOn(
10481052
publishLocal in `dotty-sbt-bridge`,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
scalaVersion := sys.props("plugin.scalaVersion")
22

33
libraryDependencies +=
4-
("org.atnos" %% "eff" % "5.4.1").withDottyCompat(scalaVersion.value)
4+
("org.atnos" %% "eff" % "5.5.2").withDottyCompat(scalaVersion.value)

sbt-dotty/sbt-test/scala2-compat/eff/pending

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
> compile

0 commit comments

Comments
 (0)