Adapt sbt scripted tests for the 2.13 stdlib

smarter · smarter · commit 4fd550fa2f64 · 2019-08-24T18:34:41.000+02:00
diff --git a/sbt-dotty/sbt-test/sbt-dotty/example-project/build.sbt b/sbt-dotty/sbt-test/sbt-dotty/example-project/build.sbt
@@ -1,4 +1,4 @@
 scalaVersion := sys.props("plugin.scalaVersion")
 
 libraryDependencies +=
-("org.scala-lang.modules" %% "scala-xml" % "1.0.6").withDottyCompat(scalaVersion.value)
+("org.scala-lang.modules" %% "scala-xml" % "1.2.0").withDottyCompat(scalaVersion.value)
diff --git a/sbt-dotty/sbt-test/scala2-compat/eff/pending b/sbt-dotty/sbt-test/scala2-compat/eff/pending
@@ -0,0 +1,2 @@
+# pending because eff hasn't been published for 2.13 yet: https://github.com/atnos-org/eff/issues/185
+> compile
diff --git a/sbt-dotty/sbt-test/scala2-compat/eff/test b/sbt-dotty/sbt-test/scala2-compat/eff/test
diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/A.scala b/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/A.scala
@@ -3,5 +3,5 @@ trait Equal[-A] {
   def equal(a1: A, a2: A): Boolean
 }
 object Test {
-  implicit def TraversableEqual[CC[X] <: collection.TraversableLike[X, CC[X]] with Traversable[X], A: Equal]: Equal[CC[A]] = sys.error("")
+  implicit def TraversableEqual[CC[X] <: collection.IterableOps[X, CC, CC[X]] with Iterable[X], A: Equal]: Equal[CC[A]] = sys.error("")
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# pending because eff hasn't been published for 2.13 yet: https://github.com/atnos-org/eff/issues/185`
	`2`	`+> compile`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ trait Equal[-A] {`
`3`	`3`	`def equal(a1: A, a2: A): Boolean`
`4`	`4`	`}`
`5`	`5`	`object Test {`
`6`		`- implicit def TraversableEqual[CC[X] <: collection.TraversableLike[X, CC[X]] with Traversable[X], A: Equal]: Equal[CC[A]] = sys.error("")`
	`6`	`+ implicit def TraversableEqual[CC[X] <: collection.IterableOps[X, CC, CC[X]] with Iterable[X], A: Equal]: Equal[CC[A]] = sys.error("")`
`7`	`7`	`}`