Skip to content

Commit 67a611d

Browse files
authored
Merge branch 'main' into update/sbt-mdoc-2.6.5
2 parents 5d563d7 + 39d3c36 commit 67a611d

File tree

5 files changed

+23
-11
lines changed

5 files changed

+23
-11
lines changed

.github/workflows/ci.yml

+13-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ jobs:
3434
runs-on: ${{ matrix.os }}
3535
timeout-minutes: 60
3636
steps:
37+
- name: Install sbt
38+
if: contains(runner.os, 'macos')
39+
run: brew install sbt
40+
3741
- name: Checkout current branch (full)
3842
uses: actions/checkout@v4
3943
with:
@@ -103,6 +107,10 @@ jobs:
103107
java: [temurin@8]
104108
runs-on: ${{ matrix.os }}
105109
steps:
110+
- name: Install sbt
111+
if: contains(runner.os, 'macos')
112+
run: brew install sbt
113+
106114
- name: Checkout current branch (full)
107115
uses: actions/checkout@v4
108116
with:
@@ -237,13 +245,17 @@ jobs:
237245

238246
dependency-submission:
239247
name: Submit Dependencies
240-
if: github.event_name != 'pull_request'
248+
if: github.event.repository.fork == false && github.event_name != 'pull_request'
241249
strategy:
242250
matrix:
243251
os: [ubuntu-latest]
244252
java: [temurin@8]
245253
runs-on: ${{ matrix.os }}
246254
steps:
255+
- name: Install sbt
256+
if: contains(runner.os, 'macos')
257+
run: brew install sbt
258+
247259
- name: Checkout current branch (full)
248260
uses: actions/checkout@v4
249261
with:

.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

+4-4
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,9 +36,9 @@ 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"
41-
) ++ (if (scalaVersion.value.startsWith("2.")) Seq("com.chuusai" %%% "shapeless" % "2.3.12")
39+
"org.typelevel" %%% "cats-core" % "2.13.0",
40+
"org.scalameta" %%% "munit" % "1.0.4"
41+
) ++ (if (scalaVersion.value.startsWith("2.")) Seq("com.chuusai" %%% "shapeless" % "2.3.13")
4242
else Nil),
4343
scalacOptions := scalacOptions.value.filterNot(_.startsWith("-source:"))
4444
)

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.1
1+
sbt.version=1.10.11

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.6.5")
99

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

0 commit comments

Comments
 (0)