Skip to content

Commit 6cd2c93

Browse files
authored
Merge branch 'main' into update/sbt-version-policy-1.0.0
2 parents a1e4bec + 45de198 commit 6cd2c93

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ ThisBuild / versionScheme := Some("early-semver")
55
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
66

77
lazy val commonSettings: Seq[Setting[_]] =
8+
Seq(scalaModuleAutomaticModuleName := Some("scala.collection.parallel")) ++
89
ScalaModulePlugin.scalaModuleSettings ++ Seq(
910
Compile / compile / scalacOptions --= (CrossVersion.partialVersion(scalaVersion.value) match {
1011
case Some((3, _)) => Seq("-Xlint")

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.1
1+
sbt.version=1.5.2

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.4")
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.0")
22
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0")

0 commit comments

Comments
 (0)