Merge branch '1.0.0-SNAP5'

bvenners · bvenners · commit 5f24b60e99fa · 2019-09-22T21:55:02.000-07:00
diff --git a/build.sbt b/build.sbt
@@ -1,8 +1,8 @@
-name := "scalatestplus-easymock"
+name := "easymock-3.2"
 
 organization := "org.scalatestplus"
 
-version := "1.0.0-SNAP1"
+version := "3.1.0.0-RC3"
 
 homepage := Some(url("https://github.com/scalatest/scalatestplus-easymock"))
 
@@ -23,13 +23,13 @@ developers := List(
   )
 )
 
-crossScalaVersions := List("2.10.7", "2.11.12", "2.12.8", "2.13.0-M5")
+crossScalaVersions := List("2.10.7", "2.11.12", "2.12.10", "2.13.0")
 
 resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
 
 libraryDependencies ++= Seq(
   "org.easymock" % "easymockclassextension" % "3.2",
-  "org.scalatest" %% "scalatest" % "3.1.0-SNAP8"
+  "org.scalatest" %% "scalatest" % "3.1.0-RC3"
 )
 
 enablePlugins(SbtOsgi)

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-name := "scalatestplus-easymock"`
	`1`	`+name := "easymock-3.2"`
`2`	`2`
`3`	`3`	`organization := "org.scalatestplus"`
`4`	`4`
`5`		`-version := "1.0.0-SNAP1"`
	`5`	`+version := "3.1.0.0-RC3"`
`6`	`6`
`7`	`7`	`homepage := Some(url("https://github.com/scalatest/scalatestplus-easymock"))`
`8`	`8`
`@@ -23,13 +23,13 @@ developers := List(`
`23`	`23`	`)`
`24`	`24`	`)`
`25`	`25`
`26`		`-crossScalaVersions := List("2.10.7", "2.11.12", "2.12.8", "2.13.0-M5")`
	`26`	`+crossScalaVersions := List("2.10.7", "2.11.12", "2.12.10", "2.13.0")`
`27`	`27`
`28`	`28`	`resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"`
`29`	`29`
`30`	`30`	`libraryDependencies ++= Seq(`
`31`	`31`	`"org.easymock" % "easymockclassextension" % "3.2",`
`32`		`- "org.scalatest" %% "scalatest" % "3.1.0-SNAP8"`
	`32`	`+ "org.scalatest" %% "scalatest" % "3.1.0-RC3"`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`enablePlugins(SbtOsgi)`