diff --git a/README.md b/README.md
index 7a48bca..fccb96c 100644
--- a/README.md
+++ b/README.md
@@ -14,12 +14,12 @@ If ScalaTest has saved you time, helped you ship better software, or become a ke
**Usage**
-To use it for ScalaTest 3.2.19 and Selenium 4.21.x:
+To use it for ScalaTest 3.3.0-RC1 and Selenium 4.35.x:
SBT:
```
-libraryDependencies += "org.scalatestplus" %% "selenium-4-21" % "3.2.19.0" % "test"
+libraryDependencies += "org.scalatestplus" %% "selenium-4-35" % "3.3.0.0-RC1" % "test"
```
Maven:
@@ -27,8 +27,8 @@ Maven:
```
org.scalatestplus
- selenium-4-21_3
- 3.2.19.0
+ selenium-4-35_3
+ 3.3.0.0-RC1
test
```
@@ -39,4 +39,5 @@ Please use the following commands to publish to Sonatype:
```
$ sbt +publishSigned
+$ sbt sonaUpload
```
diff --git a/build.sbt b/build.sbt
index 8a223c7..d4c14fc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,11 +1,11 @@
import java.io.PrintWriter
import scala.io.Source
-name := "selenium-4.21"
+name := "selenium-4.35"
organization := "org.scalatestplus"
-version := "3.2.19.0"
+version := "3.3.0.0-RC1"
homepage := Some(url("https://github.com/scalatest/scalatestplus-selenium"))
@@ -26,17 +26,17 @@ developers := List(
)
)
-scalaVersion := "2.13.13"
+scalaVersion := "2.13.16"
-crossScalaVersions := List("2.11.12", "2.12.19", "2.13.13", "3.3.3")
+crossScalaVersions := List("2.11.12", "2.12.20", scalaVersion.value, "3.3.6")
libraryDependencies ++= Seq(
- "org.scalatest" %% "scalatest-core" % "3.2.19",
- "org.seleniumhq.selenium" % "selenium-java" % "4.21.0",
+ "org.scalatest" %% "scalatest-core" % "3.3.0-RC1",
+ "org.seleniumhq.selenium" % "selenium-java" % "4.35.0",
"org.seleniumhq.selenium" % "htmlunit-driver" % "4.13.0",
"org.eclipse.jetty" % "jetty-webapp" % "9.4.48.v20220622" % Test,
- "org.scalatest" %% "scalatest-funspec" % "3.2.19" % Test,
- "org.scalatest" %% "scalatest-shouldmatchers" % "3.2.19" % Test
+ "org.scalatest" %% "scalatest-funspec" % "3.3.0-RC1" % Test,
+ "org.scalatest" %% "scalatest-shouldmatchers" % "3.3.0-RC1" % Test
)
import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
@@ -83,10 +83,7 @@ OsgiKeys.additionalHeaders:= Map(
"Bundle-Vendor" -> "Artima, Inc."
)
-publishTo := {
- val nexus = "https://oss.sonatype.org/"
- Some("publish-releases" at nexus + "service/local/staging/deploy/maven2")
-}
+publishTo := localStaging.value
publishMavenStyle := true
diff --git a/project/build.properties b/project/build.properties
index e64c208..489e0a7 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.8
+sbt.version=1.11.4
diff --git a/src/main/scala-2/org/scalatestplus/selenium/WebBrowser.scala b/src/main/scala-2/org/scalatestplus/selenium/WebBrowser.scala
index 0ae9acc..a21ec39 100644
--- a/src/main/scala-2/org/scalatestplus/selenium/WebBrowser.scala
+++ b/src/main/scala-2/org/scalatestplus/selenium/WebBrowser.scala
@@ -24,19 +24,19 @@ import org.openqa.selenium.htmlunit.HtmlUnitDriver
import org.openqa.selenium.edge.EdgeDriver
import org.openqa.selenium.By
import org.openqa.selenium.WebElement
-import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeUnit
import scala.collection.JavaConverters._
import org.openqa.selenium.Cookie
-import java.util.Date
+import java.util.Date
import org.scalatest.time.Span
import org.openqa.selenium.TakesScreenshot
import org.openqa.selenium.OutputType
+
import java.io.File
import java.io.FileOutputStream
import java.io.FileInputStream
-
import org.openqa.selenium.Alert
import org.openqa.selenium.support.ui.Select
import org.scalatest.exceptions.TestFailedException
@@ -44,7 +44,9 @@ import org.scalatest.exceptions.StackDepthException
import org.openqa.selenium.JavascriptExecutor
import org.scalactic.source
import org.openqa.selenium.firefox.FirefoxOptions
+
import java.io.Closeable
+import java.time.Duration
/**
* Trait that provides a domain specific language (DSL) for writing browser-based tests using Selenium.
@@ -4015,7 +4017,7 @@ trait WebBrowser {
* @param driver the WebDriver
on which to set the implicit wait
*/
def implicitlyWait(timeout: Span)(implicit driver: WebDriver): Unit = {
- driver.manage.timeouts.implicitlyWait(timeout.totalNanos, TimeUnit.NANOSECONDS)
+ driver.manage.timeouts.implicitlyWait(Duration.ofNanos(timeout.totalNanos))
}
/**
@@ -4599,7 +4601,7 @@ trait WebBrowser {
* @param timeout the amount of time to wait for an asynchronous script to finish execution before throwing exception
*/
def setScriptTimeout(timeout: Span)(implicit driver: WebDriver): Unit = {
- driver.manage().timeouts().setScriptTimeout(timeout.totalNanos, TimeUnit.NANOSECONDS);
+ driver.manage().timeouts().scriptTimeout(Duration.ofNanos(timeout.totalNanos));
}
// Clears the text field or area, then presses the passed keys
@@ -4860,7 +4862,7 @@ object InternetExplorer extends InternetExplorer
*/
trait Edge extends WebBrowser with Driver with ScreenshotCapturer {
/**
- * WebBrowser
subtrait that defines an implicit WebDriver
for Safari (an org.openqa.selenium.safari.SafariDriver
).
+ * WebBrowser
subtrait that defines an implicit WebDriver
for Microsoft Edge (an org.openqa.selenium.edge.EdgeDriver
).
*/
implicit val webDriver = new EdgeDriver()