Skip to content

Commit

Permalink
Merge branch 'main' into update/scala-compiler-2.13.14
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilquist committed May 13, 2024
2 parents d26fbbf + c2f2b99 commit 4e0be45
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 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.1"
version = "3.7.17"

style = default

Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ThisBuild / organization := "org.typelevel"
ThisBuild / organizationName := "Typelevel"
ThisBuild / startYear := Some(2023)

ThisBuild / crossScalaVersions := Seq("3.3.1", "2.12.18", "2.13.14")
ThisBuild / crossScalaVersions := Seq("3.3.3", "2.12.19", "2.13.14")
ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.head

ThisBuild / doctestTestFramework := DoctestTestFramework.ScalaCheck
Expand Down Expand Up @@ -37,7 +37,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
name := "twiddles-core",
libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-core" % "2.10.0",
"org.typelevel" %%% "munit-cats-effect" % "2.0.0-M3" % Test,
"org.typelevel" %%% "munit-cats-effect" % "2.0.0-RC1" % Test,
"org.typelevel" %%% "scalacheck-effect-munit" % "2.0.0-M2" % Test
) ++ (if (scalaVersion.value.startsWith("2.")) Seq("com.chuusai" %%% "shapeless" % "2.3.10")
else Nil),
Expand Down
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.7
sbt.version=1.10.0
12 changes: 6 additions & 6 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
val sbtTypelevelVersion = "0.6.0"
val sbtTypelevelVersion = "0.7.1"
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.0")
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.3.0")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.10.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8")

0 comments on commit 4e0be45

Please sign in to comment.