Skip to content

Commit 0c42211

Browse files
authored
Merge branch 'main' into update/shapeless-2.3.13
2 parents 5c70c00 + 8baa84b commit 0c42211

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ jobs:
237237

238238
dependency-submission:
239239
name: Submit Dependencies
240-
if: github.event_name != 'pull_request'
240+
if: github.event.repository.fork == false && github.event_name != 'pull_request'
241241
strategy:
242242
matrix:
243243
os: [ubuntu-latest]

.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.8.3"
1+
version = "3.8.6"
22

33
style = default
44

build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ThisBuild / organization := "org.typelevel"
88
ThisBuild / organizationName := "Typelevel"
99
ThisBuild / startYear := Some(2023)
1010

11-
ThisBuild / crossScalaVersions := Seq("3.3.3", "2.12.20", "2.13.14")
11+
ThisBuild / crossScalaVersions := Seq("3.3.5", "2.12.20", "2.13.16")
1212
ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.head
1313

1414
ThisBuild / doctestTestFramework := DoctestTestFramework.ScalaCheck
@@ -36,8 +36,8 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
3636
.settings(
3737
name := "twiddles-core",
3838
libraryDependencies ++= Seq(
39-
"org.typelevel" %%% "cats-core" % "2.12.0",
40-
"org.scalameta" %%% "munit" % "1.0.1"
39+
"org.typelevel" %%% "cats-core" % "2.13.0",
40+
"org.scalameta" %%% "munit" % "1.0.4"
4141
) ++ (if (scalaVersion.value.startsWith("2.")) Seq("com.chuusai" %%% "shapeless" % "2.3.13")
4242
else Nil),
4343
scalacOptions := scalacOptions.value.filterNot(_.startsWith("-source:"))

project/plugins.sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
val sbtTypelevelVersion = "0.7.3"
1+
val sbtTypelevelVersion = "0.7.7"
22
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
4-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
4+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7")
55
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
66
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.3.0")
7-
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.10.0")
7+
addSbtPlugin("io.github.sbt-doctest" % "sbt-doctest" % "0.11.1")
88
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
99

1010
libraryDependencySchemes += "com.lihaoyi" %% "geny" % VersionScheme.Always

0 commit comments

Comments
 (0)