Skip to content

Commit a8484b5

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

File tree

2 files changed

+29
-15
lines changed

2 files changed

+29
-15
lines changed

build.sbt

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name := "selenium-3.141"
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-selenium"))
88

@@ -24,16 +24,16 @@ developers := List(
2424
)
2525

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

2929
libraryDependencies ++= Seq(
30-
"org.scalatest" %% "scalatest-core" % "3.2.2",
30+
"org.scalatest" %% "scalatest-core" % "3.2.3",
3131
"org.seleniumhq.selenium" % "selenium-java" % "3.141.59",
3232
"org.seleniumhq.selenium" % "htmlunit-driver" % "2.39.0",
3333
"org.eclipse.jetty" % "jetty-server" % "9.4.12.v20180830" % Test,
3434
"org.eclipse.jetty" % "jetty-webapp" % "9.4.12.v20180830" % Test,
35-
"org.scalatest" %% "scalatest-funspec" % "3.2.2" % Test,
36-
"org.scalatest" %% "scalatest-shouldmatchers" % "3.2.2" % Test
35+
"org.scalatest" %% "scalatest-funspec" % "3.2.3" % Test,
36+
"org.scalatest" %% "scalatest-shouldmatchers" % "3.2.3" % Test
3737
)
3838

3939
Test / scalacOptions ++= (if (isDotty.value) Seq("-language:implicitConversions") else Nil)
@@ -105,13 +105,27 @@ pomExtra := (
105105

106106
credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
107107

108-
scalacOptions ++= Seq(
109-
"-deprecation",
110-
"-encoding", "utf-8",
111-
"-explaintypes",
112-
"-feature",
113-
"-unchecked",
114-
"-Ywarn-dead-code",
115-
) ++ (if (scalaBinaryVersion.value == "2.10") Seq.empty else Seq("-Ywarn-unused"))
108+
scalacOptions ++= {
109+
(if (scalaBinaryVersion.value.startsWith("3."))
110+
Seq(
111+
"-deprecation",
112+
"-encoding", "utf-8",
113+
"-feature",
114+
"-unchecked",
115+
)
116+
else
117+
Seq(
118+
"-deprecation",
119+
"-encoding", "utf-8",
120+
"-explaintypes",
121+
"-feature",
122+
"-unchecked",
123+
"-Ywarn-dead-code",
124+
)
125+
) ++ (if (scalaBinaryVersion.value == "2.10" || scalaBinaryVersion.value.startsWith("3.")) Seq.empty else Seq("-Ywarn-unused"))
126+
}
127+
128+
// Temporary disable publishing of doc in dotty, can't get it to build.
129+
publishArtifact in (Compile, packageDoc) := !scalaBinaryVersion.value.startsWith("3.")
116130

117-
scalacOptions in (Compile, doc) ++= Seq("-doc-title", s"ScalaTest + Selenium ${version.value}")
131+
scalacOptions in (Compile, doc) := Seq("-doc-title", s"ScalaTest + Selenium ${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)