Skip to content
This repository was archived by the owner on Jan 24, 2025. It is now read-only.

Commit 6ef1942

Browse files
Merge branch 'master' into update/scala-library-2.13.8
2 parents 626ac39 + fb55675 commit 6ef1942

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v3
1717
- uses: coursier/[email protected]
18-
- uses: coursier/[email protected].0
18+
- uses: coursier/[email protected].1
1919
with:
2020
jvm: adopt:11
2121
apps: lsif-java

.github/workflows/scala-steward.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ name: Scala Steward
22

33
# This workflow will launch at 00:00 every day
44
on:
5-
schedule:
6-
- cron: '0 0 * * *'
5+
# disabled as the job fails daily
6+
#schedule:
7+
# - cron: '0 0 * * *'
78
workflow_dispatch:
89

910
jobs:
@@ -13,7 +14,7 @@ jobs:
1314
- name: Checkout
1415
uses: actions/checkout@v2
1516
- name: Set up JDK 11
16-
uses: actions/setup-java@v1
17+
uses: actions/setup-java@v3
1718
with:
1819
java-version: 11
1920
- name: Cache sbt

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.5.3
1+
version = 3.5.8
22
maxColumn = 120
33
runner.dialect = scala3
44
fileOverride {

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import sbt.Reference.display
44
import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings
55
import com.softwaremill.Publish.{ossPublishSettings, updateDocs}
66

7-
val scala212 = "2.12.15"
7+
val scala212 = "2.12.16"
88
val scala213 = "2.13.8"
9-
val scala3 = "3.1.0"
9+
val scala3 = "3.1.3"
1010

1111
val scalaIdeaVersion = scala3 // the version for which to import sources into intellij
1212

@@ -69,7 +69,7 @@ lazy val core = (projectMatrix in file("core"))
6969
"org.scalatest" %%% "scalatest-flatspec" % scalatestVersion % Test,
7070
"org.scalatest" %%% "scalatest-freespec" % scalatestVersion % Test,
7171
"org.scalatest" %%% "scalatest-shouldmatchers" % scalatestVersion % Test,
72-
"io.github.cquiroz" %%% "scala-java-time" % "2.3.0" % Test
72+
"io.github.cquiroz" %%% "scala-java-time" % "2.4.0" % Test
7373
),
7474
versionSpecificScalaSources
7575
)
@@ -210,7 +210,7 @@ lazy val cats = (projectMatrix in file("cats"))
210210
.settings(
211211
name := "diffx-cats",
212212
libraryDependencies ++= Seq(
213-
"org.typelevel" %%% "cats-core" % "2.7.0",
213+
"org.typelevel" %%% "cats-core" % "2.8.0",
214214
"org.scalatest" %%% "scalatest-freespec" % scalatestVersion % Test,
215215
"org.scalatest" %%% "scalatest-shouldmatchers" % scalatestVersion % Test
216216
)
@@ -248,7 +248,7 @@ lazy val docs = (projectMatrix in file("generated-docs")) // important: it must
248248
publishArtifact := false,
249249
name := "docs",
250250
libraryDependencies ++= Seq(
251-
"org.typelevel" %% "cats-core" % "2.7.0",
251+
"org.typelevel" %% "cats-core" % "2.8.0",
252252
"org.scalatest" %% "scalatest-shouldmatchers" % scalatestVersion
253253
),
254254
mdocIn := file("docs-sources"),

0 commit comments

Comments
 (0)