Remove sbt-dotty from sbt-community-build scripted

adpi2 · adpi2 · commit 0b706a44349e · 2021-03-05T12:06:54.000+01:00
diff --git a/project/Build.scala b/project/Build.scala
@@ -1291,6 +1291,12 @@ object Build {
       version := sbtCommunityBuildVersion,
       organization := "ch.epfl.lamp",
       sbtTestDirectory := baseDirectory.value / "sbt-test",
+
+      // hack to run the scripted tests on a nightly version of sbt
+      // see https://github.com/sbt/sbt/issues/6347
+      scriptedSbt := "1.4.7",
+      scriptedLaunchOpts ++= Seq("-Dsbt.version=1.5.0-bin-20210302T081602"),
+
       scriptedLaunchOpts ++= Seq(
         "-Dplugin.version=" + version.value,
         "-Dplugin.scalaVersion=" + dottyVersion,
diff --git a/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/build.sbt b/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/build.sbt
@@ -9,14 +9,12 @@ lazy val a = project
   )
 
 lazy val b = project
-  .settings(onlyThisTestResolverSettings)
   .settings(
     name := "b",
     libraryDependencies := Seq(organization.value %% "a" % "0.4.0-SNAPSHOT"),
   )
 
 lazy val c = project
-  .settings(onlyThisTestResolverSettings)
   .settings(
     name := "c",
     libraryDependencies := Seq(),  // don't depend on scala-library
diff --git a/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/ThisTestPlugin.scala b/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/ThisTestPlugin.scala
@@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin {
       deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"),
     )
   }
-
-  object autoImport {
-    def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq(
-      externalResolvers := thisTestResolver.value :: Nil
-    )
-  }
 }
diff --git a/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/plugins.sbt b/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/plugins.sbt
@@ -1,2 +1 @@
 addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version"))
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion"))
diff --git a/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/build.sbt b/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/build.sbt
@@ -16,7 +16,6 @@ lazy val b = project
   )
 
 lazy val c = project
-  .settings(onlyThisTestResolverSettings)
   .settings(
     name := "c",
     libraryDependencies := Seq(
diff --git a/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/ThisTestPlugin.scala b/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/ThisTestPlugin.scala
@@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin {
       deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"),
     )
   }
-
-  object autoImport {
-    def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq(
-      externalResolvers := thisTestResolver.value :: Nil
-    )
-  }
 }
diff --git a/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/plugins.sbt b/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/plugins.sbt
@@ -1,2 +1 @@
 addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version"))
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion"))
diff --git a/sbt-community-build/sbt-test/sbt-community-build/scalajs/build.sbt b/sbt-community-build/sbt-test/sbt-community-build/scalajs/build.sbt
@@ -17,15 +17,13 @@ lazy val aJS = project
   )
 
 lazy val bJVM = project
-  .settings(onlyThisTestResolverSettings)
   .settings(
     name := "b",
     libraryDependencies := Seq(organization.value %%% "a" % "0.5.0-SNAPSHOT"),
   )
 
 lazy val bJS = project
   .enablePlugins(ScalaJSPlugin)
-  .settings(onlyThisTestResolverSettings)
   .settings(
     name := "b",
     libraryDependencies := Seq(organization.value %%% "a" % "0.5.0-SNAPSHOT"),
diff --git a/sbt-community-build/sbt-test/sbt-community-build/scalajs/project/ThisTestPlugin.scala b/sbt-community-build/sbt-test/sbt-community-build/scalajs/project/ThisTestPlugin.scala
@@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin {
       deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"),
     )
   }
-
-  object autoImport {
-    def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq(
-      externalResolvers := thisTestResolver.value :: Nil
-    )
-  }
 }
diff --git a/sbt-community-build/sbt-test/sbt-community-build/scalajs/project/plugins.sbt b/sbt-community-build/sbt-test/sbt-community-build/scalajs/project/plugins.sbt
@@ -1,3 +1,2 @@
 addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version"))
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion"))
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion"))
diff --git a/sbt-community-build/sbt-test/sbt-community-build/single-dep/build.sbt b/sbt-community-build/sbt-test/sbt-community-build/single-dep/build.sbt
@@ -9,7 +9,6 @@ lazy val a = project
   )
 
 lazy val b = project
-  .settings(onlyThisTestResolverSettings)
   .settings(
     name := "b",
     libraryDependencies := Seq(organization.value %% "a" % "0.1.0-SNAPSHOT"),
diff --git a/sbt-community-build/sbt-test/sbt-community-build/single-dep/project/ThisTestPlugin.scala b/sbt-community-build/sbt-test/sbt-community-build/single-dep/project/ThisTestPlugin.scala
@@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin {
       deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"),
     )
   }
-
-  object autoImport {
-    def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq(
-      externalResolvers := thisTestResolver.value :: Nil
-    )
-  }
 }
diff --git a/sbt-community-build/sbt-test/sbt-community-build/single-dep/project/plugins.sbt b/sbt-community-build/sbt-test/sbt-community-build/single-dep/project/plugins.sbt
@@ -1,2 +1 @@
 addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version"))
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion"))
diff --git a/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/build.sbt b/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/build.sbt
@@ -16,7 +16,6 @@ lazy val b = project
   )
 
 lazy val c = project
-  .settings(onlyThisTestResolverSettings)
   .settings(
     name := "c",
     libraryDependencies := Seq(organization.value %% "b" % "1.3.0-SNAPSHOT"),
diff --git a/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/ThisTestPlugin.scala b/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/ThisTestPlugin.scala
@@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin {
       deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"),
     )
   }
-
-  object autoImport {
-    def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq(
-      externalResolvers := thisTestResolver.value :: Nil
-    )
-  }
 }
diff --git a/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/plugins.sbt b/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/plugins.sbt
@@ -1,2 +1 @@
 addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version"))
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion"))

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,12 @@ lazy val a = project`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`lazy val b = project`
`12`		`- .settings(onlyThisTestResolverSettings)`
`13`	`12`	`.settings(`
`14`	`13`	`name := "b",`
`15`	`14`	`libraryDependencies := Seq(organization.value %% "a" % "0.4.0-SNAPSHOT"),`
`16`	`15`	`)`
`17`	`16`
`18`	`17`	`lazy val c = project`
`19`		`- .settings(onlyThisTestResolverSettings)`
`20`	`18`	`.settings(`
`21`	`19`	`name := "c",`
`22`	`20`	`libraryDependencies := Seq(), // don't depend on scala-library`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin {`
`24`	`24`	`deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"),`
`25`	`25`	`)`
`26`	`26`	`}`
`27`		`-`
`28`		`- object autoImport {`
`29`		`- def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq(`
`30`		`- externalResolvers := thisTestResolver.value :: Nil`
`31`		`- )`
`32`		`- }`
`33`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version"))`
`2`		`-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion"))`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ lazy val b = project`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`lazy val c = project`
`19`		`- .settings(onlyThisTestResolverSettings)`
`20`	`19`	`.settings(`
`21`	`20`	`name := "c",`
`22`	`21`	`libraryDependencies := Seq(`
Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,13 @@ lazy val aJS = project`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`lazy val bJVM = project`
`20`		`- .settings(onlyThisTestResolverSettings)`
`21`	`20`	`.settings(`
`22`	`21`	`name := "b",`
`23`	`22`	`libraryDependencies := Seq(organization.value %%% "a" % "0.5.0-SNAPSHOT"),`
`24`	`23`	`)`
`25`	`24`
`26`	`25`	`lazy val bJS = project`
`27`	`26`	`.enablePlugins(ScalaJSPlugin)`
`28`		`- .settings(onlyThisTestResolverSettings)`
`29`	`27`	`.settings(`
`30`	`28`	`name := "b",`
`31`	`29`	`libraryDependencies := Seq(organization.value %%% "a" % "0.5.0-SNAPSHOT"),`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version"))`
`2`		`-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion"))`
`3`	`2`	`addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion"))`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ lazy val a = project`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`lazy val b = project`
`12`		`- .settings(onlyThisTestResolverSettings)`
`13`	`12`	`.settings(`
`14`	`13`	`name := "b",`
`15`	`14`	`libraryDependencies := Seq(organization.value %% "a" % "0.1.0-SNAPSHOT"),`