Skip to content

Commit

Permalink
Merge branch 'main' into update/sbt-typelevel-0.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilquist committed May 23, 2024
2 parents d4c5eaf + 291d0b2 commit b3b0b5c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.17"
version = "3.8.1"

runner.dialect = Scala213Source3

Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ThisBuild / tlBaseVersion := "2.0"
ThisBuild / developers += tlGitHubDev("mpilquist", "Michael Pilquist")
ThisBuild / startYear := Some(2021)

ThisBuild / crossScalaVersions := List("3.3.3", "2.12.17", "2.13.12")
ThisBuild / crossScalaVersions := List("3.3.3", "2.12.19", "2.13.12")
ThisBuild / tlVersionIntroduced := Map("3" -> "1.0.2")

lazy val root = tlCrossRootProject.aggregate(core, munit)
Expand All @@ -15,7 +15,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
)
.settings(
libraryDependencies ++= List(
"org.scalacheck" %%% "scalacheck" % "1.17.0",
"org.scalacheck" %%% "scalacheck" % "1.17.1",
"org.typelevel" %%% "cats-core" % "2.10.0"
)
)
Expand All @@ -29,6 +29,6 @@ lazy val munit = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.settings(
libraryDependencies ++= List(
"org.scalameta" %%% "munit-scalacheck" % "1.0.0-M11",
"org.typelevel" %%% "cats-effect" % "3.5.3" % Test
"org.typelevel" %%% "cats-effect" % "3.5.4" % Test
)
)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.0
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.1")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

0 comments on commit b3b0b5c

Please sign in to comment.