Merge branch 'main' into add-iterator-group-methods

BalmungSan · BalmungSan · commit 8f9fd9cb976d · 2020-11-28T15:41:33.000-05:00
diff --git a/build.sbt b/build.sbt
@@ -21,7 +21,7 @@ lazy val scalaLibraryNext = crossProject(JVMPlatform, JSPlatform)
     scalaModuleMimaPreviousVersion := None,
     scalacOptions ++= Seq("-deprecation", "-feature", "-Werror"),
     libraryDependencies ++= Seq(
-      "org.scalacheck" %%% "scalacheck" % "1.14.3" % Test,
+      "org.scalacheck" %%% "scalacheck" % "1.15.1" % Test,
     ),
   )
   .jsSettings(
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.1
+sbt.version=1.4.4
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.3")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.1")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ lazy val scalaLibraryNext = crossProject(JVMPlatform, JSPlatform)`
`21`	`21`	`scalaModuleMimaPreviousVersion := None,`
`22`	`22`	`scalacOptions ++= Seq("-deprecation", "-feature", "-Werror"),`
`23`	`23`	`libraryDependencies ++= Seq(`
`24`		`- "org.scalacheck" %%% "scalacheck" % "1.14.3" % Test,`
	`24`	`+ "org.scalacheck" %%% "scalacheck" % "1.15.1" % Test,`
`25`	`25`	`),`
`26`	`26`	`)`
`27`	`27`	`.jsSettings(`