Merge branch 'main' into update/sbt-version-policy-1.0.0

scala · May 13, 2021 · 6cd2c93 · 6cd2c93
2 parents a1e4bec + 45de198
commit 6cd2c93
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -5,6 +5,7 @@ ThisBuild / versionScheme := Some("early-semver")
 ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
 
 lazy val commonSettings: Seq[Setting[_]] =
+  Seq(scalaModuleAutomaticModuleName := Some("scala.collection.parallel")) ++
   ScalaModulePlugin.scalaModuleSettings ++ Seq(
     Compile / compile / scalacOptions --= (CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _)) => Seq("-Xlint")

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.1
+sbt.version=1.5.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.4")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.0")
 addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0")