From 050b85d1318543b7e7357a775ef14b077119637c Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 28 Jun 2018 17:33:34 -0400 Subject: [PATCH 1/3] bump Scala 2.12.4 -> 2.12.6 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8ca9bb6..ac2acfe 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ name := "scala-partest" version := "1.1.4-SNAPSHOT" scalaVersionsByJvm in ThisBuild := { - val vs = List("2.12.4", "2.13.0-M3") + val vs = List("2.12.6", "2.13.0-M3") Map( 8 -> vs.map(_ -> true), From ae2b5d1ae483a4c1dd6c25b74213ead150f37924 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 28 Jun 2018 17:34:30 -0400 Subject: [PATCH 2/3] drop Scala 2.13 from the cross-build not needed anymore since partest we re-in-sourced into scala/scala --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ac2acfe..634e834 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ name := "scala-partest" version := "1.1.4-SNAPSHOT" scalaVersionsByJvm in ThisBuild := { - val vs = List("2.12.6", "2.13.0-M3") + val vs = List("2.12.6") Map( 8 -> vs.map(_ -> true), From c2b1008d7d9255d3281818ce56d3d5ad0aa8b927 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 28 Jun 2018 17:42:31 -0400 Subject: [PATCH 3/3] allow building on JDK 10 & 11 context: Scala community build on JDK 10. might as well throw 11 in too. --- build.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 634e834..4277334 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,9 @@ scalaVersionsByJvm in ThisBuild := { Map( 8 -> vs.map(_ -> true), - 9 -> vs.map(_ -> false)) + 9 -> vs.map(_ -> false), + 10 -> vs.map(_ -> false), + 11 -> vs.map(_ -> false)) } scalaXmlVersion := "1.0.6"