Skip to content

Commit 9e0ded3

Browse files
committed
Updated release version, default scala version, Dotty version 3.0.0-M1 and fixed scaladoc problem when publishing.
1 parent a581206 commit 9e0ded3

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

build.sbt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name := "testng-6.7"
22

33
organization := "org.scalatestplus"
44

5-
version := "3.2.2.0"
5+
version := "3.2.3.0"
66

77
homepage := Some(url("https://github.com/scalatest/scalatestplus-testng"))
88

@@ -23,13 +23,15 @@ developers := List(
2323
)
2424
)
2525

26-
crossScalaVersions := List("2.10.7", "2.11.12", "2.12.12", "2.13.3", "0.27.0-RC1")
26+
scalaVersion := "2.13.3"
27+
28+
crossScalaVersions := List("2.10.7", "2.11.12", "2.12.12", "2.13.3", "3.0.0-M1")
2729

2830
libraryDependencies ++= Seq(
29-
"org.scalatest" %% "scalatest-core" % "3.2.2",
31+
"org.scalatest" %% "scalatest-core" % "3.2.3",
3032
"org.testng" % "testng" % "6.7",
3133
"commons-io" % "commons-io" % "1.3.2" % "test",
32-
"org.scalatest" %% "scalatest-funsuite" % "3.2.2" % "test"
34+
"org.scalatest" %% "scalatest-funsuite" % "3.2.3" % "test"
3335
)
3436

3537
import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
@@ -100,4 +102,7 @@ pomExtra := (
100102
</scm>
101103
)
102104

105+
// Temporary disable publishing of doc in dotty, can't get it to build.
106+
publishArtifact in (Compile, packageDoc) := !scalaBinaryVersion.value.startsWith("3.")
107+
103108
scalacOptions in (Compile, doc) := Seq("-doc-title", s"ScalaTest + TestNG ${version.value}")

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
22

33
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
44

5-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.1")
5+
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.5")

0 commit comments

Comments
 (0)