Skip to content

Commit 330feb5

Browse files
committed
Remove sbt-dotty from sbt-community-build scripted
1 parent 58fe96c commit 330feb5

File tree

16 files changed

+6
-42
lines changed

16 files changed

+6
-42
lines changed

project/Build.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,6 +1295,12 @@ object Build {
12951295
version := sbtCommunityBuildVersion,
12961296
organization := "ch.epfl.lamp",
12971297
sbtTestDirectory := baseDirectory.value / "sbt-test",
1298+
1299+
// hack to run the scripted tests on a nightly version of sbt
1300+
// see https://github.com/sbt/sbt/issues/6347
1301+
scriptedSbt := "1.4.7",
1302+
scriptedLaunchOpts ++= Seq("-Dsbt.version=1.5.0-bin-20210302T081602"),
1303+
12981304
scriptedLaunchOpts ++= Seq(
12991305
"-Dplugin.version=" + version.value,
13001306
"-Dplugin.scalaVersion=" + dottyVersion,

sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@ lazy val a = project
99
)
1010

1111
lazy val b = project
12-
.settings(onlyThisTestResolverSettings)
1312
.settings(
1413
name := "b",
1514
libraryDependencies := Seq(organization.value %% "a" % "0.4.0-SNAPSHOT"),
1615
)
1716

1817
lazy val c = project
19-
.settings(onlyThisTestResolverSettings)
2018
.settings(
2119
name := "c",
2220
libraryDependencies := Seq(), // don't depend on scala-library

sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/ThisTestPlugin.scala

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin {
2424
deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"),
2525
)
2626
}
27-
28-
object autoImport {
29-
def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq(
30-
externalResolvers := thisTestResolver.value :: Nil
31-
)
32-
}
3327
}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version"))
2-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion"))

sbt-community-build/sbt-test/sbt-community-build/multiple-deps/build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ lazy val b = project
1616
)
1717

1818
lazy val c = project
19-
.settings(onlyThisTestResolverSettings)
2019
.settings(
2120
name := "c",
2221
libraryDependencies := Seq(

sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/ThisTestPlugin.scala

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin {
2424
deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"),
2525
)
2626
}
27-
28-
object autoImport {
29-
def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq(
30-
externalResolvers := thisTestResolver.value :: Nil
31-
)
32-
}
3327
}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version"))
2-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion"))

sbt-community-build/sbt-test/sbt-community-build/scalajs/build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@ lazy val aJS = project
1717
)
1818

1919
lazy val bJVM = project
20-
.settings(onlyThisTestResolverSettings)
2120
.settings(
2221
name := "b",
2322
libraryDependencies := Seq(organization.value %%% "a" % "0.5.0-SNAPSHOT"),
2423
)
2524

2625
lazy val bJS = project
2726
.enablePlugins(ScalaJSPlugin)
28-
.settings(onlyThisTestResolverSettings)
2927
.settings(
3028
name := "b",
3129
libraryDependencies := Seq(organization.value %%% "a" % "0.5.0-SNAPSHOT"),

sbt-community-build/sbt-test/sbt-community-build/scalajs/project/ThisTestPlugin.scala

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin {
2424
deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"),
2525
)
2626
}
27-
28-
object autoImport {
29-
def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq(
30-
externalResolvers := thisTestResolver.value :: Nil
31-
)
32-
}
3327
}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version"))
2-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion"))
32
addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion"))

sbt-community-build/sbt-test/sbt-community-build/single-dep/build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ lazy val a = project
99
)
1010

1111
lazy val b = project
12-
.settings(onlyThisTestResolverSettings)
1312
.settings(
1413
name := "b",
1514
libraryDependencies := Seq(organization.value %% "a" % "0.1.0-SNAPSHOT"),

sbt-community-build/sbt-test/sbt-community-build/single-dep/project/ThisTestPlugin.scala

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin {
2424
deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"),
2525
)
2626
}
27-
28-
object autoImport {
29-
def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq(
30-
externalResolvers := thisTestResolver.value :: Nil
31-
)
32-
}
3327
}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version"))
2-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion"))

sbt-community-build/sbt-test/sbt-community-build/transitive-dep/build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ lazy val b = project
1616
)
1717

1818
lazy val c = project
19-
.settings(onlyThisTestResolverSettings)
2019
.settings(
2120
name := "c",
2221
libraryDependencies := Seq(organization.value %% "b" % "1.3.0-SNAPSHOT"),

sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/ThisTestPlugin.scala

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin {
2424
deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"),
2525
)
2626
}
27-
28-
object autoImport {
29-
def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq(
30-
externalResolvers := thisTestResolver.value :: Nil
31-
)
32-
}
3327
}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version"))
2-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion"))

0 commit comments

Comments
 (0)