Skip to content

Commit dfa1b6b

Browse files
committed
Remove workaround for fixed sbt issue
1 parent 77f6062 commit dfa1b6b

File tree

5 files changed

+5
-26
lines changed

5 files changed

+5
-26
lines changed

sbt-dotty/sbt-test/scala2-compat/erasure/build.sbt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,5 @@ lazy val scala2Lib = project.in(file("scala2Lib"))
66
lazy val dottyApp = project.in(file("dottyApp"))
77
.dependsOn(scala2Lib)
88
.settings(
9-
scalaVersion := sys.props("plugin.scalaVersion"),
10-
// https://github.com/sbt/sbt/issues/5369
11-
projectDependencies := {
12-
projectDependencies.value.map(_.withDottyCompat(scalaVersion.value))
13-
}
9+
scalaVersion := sys.props("plugin.scalaVersion")
1410
)
15-

sbt-dotty/sbt-test/scala2-compat/i8001/build.sbt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@ lazy val lib = (project in file ("lib"))
77
lazy val test = (project in file ("main"))
88
.dependsOn(lib)
99
.settings(
10-
scalaVersion := scala3Version,
11-
// https://github.com/sbt/sbt/issues/5369
12-
projectDependencies := {
13-
projectDependencies.value.map(_.withDottyCompat(scalaVersion.value))
14-
}
10+
scalaVersion := scala3Version
1511
)

sbt-dotty/sbt-test/scala2-compat/i8847/build.sbt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@ lazy val `i8847-lib` = (project in file ("lib"))
77
lazy val `i8847-test` = (project in file ("main"))
88
.dependsOn(`i8847-lib`)
99
.settings(
10-
scalaVersion := scala3Version,
11-
// https://github.com/sbt/sbt/issues/5369
12-
projectDependencies := {
13-
projectDependencies.value.map(_.withDottyCompat(scalaVersion.value))
14-
}
10+
scalaVersion := scala3Version
1511
)

sbt-dotty/sbt-test/scala2-compat/i9916a/build.sbt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@ lazy val `i9916a-lib` = (project in file ("lib"))
77
lazy val `i9916a-test` = (project in file ("main"))
88
.dependsOn(`i9916a-lib`)
99
.settings(
10-
scalaVersion := scala3Version,
11-
// https://github.com/sbt/sbt/issues/5369
12-
projectDependencies := {
13-
projectDependencies.value.map(_.withDottyCompat(scalaVersion.value))
14-
}
10+
scalaVersion := scala3Version
1511
)

sbt-dotty/sbt-test/scala2-compat/i9916b/build.sbt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@ lazy val `i9916b-lib` = (project in file ("lib"))
77
lazy val `i9916b-test` = (project in file ("main"))
88
.dependsOn(`i9916b-lib`)
99
.settings(
10-
scalaVersion := scala3Version,
11-
// https://github.com/sbt/sbt/issues/5369
12-
projectDependencies := {
13-
projectDependencies.value.map(_.withDottyCompat(scalaVersion.value))
14-
}
10+
scalaVersion := scala3Version
1511
)

0 commit comments

Comments
 (0)