Skip to content

Commit 6f436ba

Browse files
kristerrluksowscala-steward
authored
Eval refactor, fixing bugs in evaluation order (#217)
* Refactoring evaluation with new computation model. * inspectF * Small doc update * Fixing *semi*. * Fixing leftSemiflat*ap * Eval refactor continued (#218) * WIP with tailRecM * Cleanup * Working version. Some documentation. Dependency updates. * Missing build changes. * Website 2.12 update. * Update scalafmt-core to 3.7.17 (#216) * Update scalafmt-core to 3.7.17 * Reformat with scalafmt 3.7.17 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.7.17' to .git-blame-ignore-revs * Update sbt-mdoc to 2.3.8 (#213) * Update sbt-jmh to 0.4.6 (#211) * Update sbt-scalafmt to 2.5.2 (#209) Co-authored-by: Łukasz Sowa <contact@luksow.com> * Update sbt-ci-release to 1.5.12 (#190) Co-authored-by: Łukasz Sowa <contact@luksow.com> * Update sbt to 1.8.3 (#191) * sbt bump * Fixing #204 * Solving #205. --------- Co-authored-by: Łukasz Sowa <contact@luksow.com> Co-authored-by: Scala Steward <43047562+scala-steward@users.noreply.github.com>
1 parent e31f3cc commit 6f436ba

File tree

13 files changed

+593
-168
lines changed

13 files changed

+593
-168
lines changed

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Scala Steward: Reformat with scalafmt 3.7.17
2+
7c6966fbfe8e67006302d992d51bef38713be851

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: [ubuntu-latest]
17-
scala: [2.12.17, 2.13.10, 3.2.2]
17+
scala: [2.12.18, 2.13.12, 3.3.1]
1818
java: [temurin@8, temurin@17]
1919
runs-on: ${{ matrix.os }}
2020
steps:
@@ -61,4 +61,4 @@ jobs:
6161
with:
6262
fetch-depth: 0
6363
- uses: olafurpg/setup-scala@v13
64-
- run: sbt '++2.12.17 docs/mdoc'
64+
- run: sbt '++2.12.18 docs/mdoc'

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ newlines.topLevelStatementBlankLines = [
77
]
88
rewrite.rules = [SortImports, RedundantBraces]
99
runner.dialect = scala213
10-
version=3.7.3
10+
version=3.7.17

build.sbt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
21
val isDotty = Def.setting(CrossVersion.partialVersion(scalaVersion.value).exists(_._1 != 2))
32

43
// Dependencies
54

6-
val catsVersion = "2.9.0"
5+
val catsVersion = "2.10.0"
76
val castsTestkitScalatestVersion = "2.1.5"
87

98
libraryDependencies ++= Seq(
@@ -19,18 +18,18 @@ libraryDependencies ++= (if (isDotty.value) Nil
1918

2019
// Multiple Scala versions support
2120

22-
val scala_2_12 = "2.12.17"
23-
val scala_2_13 = "2.13.10"
24-
val dotty = "3.2.2"
21+
val scala_2_12 = "2.12.18"
22+
val scala_2_13 = "2.13.12"
23+
val dotty = "3.3.1"
2524
val mainScalaVersion = scala_2_13
2625
val supportedScalaVersions = Seq(scala_2_12, scala_2_13, dotty)
2726

2827
ThisBuild / crossScalaVersions := supportedScalaVersions
29-
ThisBuild / scalaVersion := mainScalaVersion
28+
ThisBuild / scalaVersion := mainScalaVersion
3029

3130
lazy val baseSettings = Seq(
3231
// Scala settings
33-
homepage := Some(url("https://github.com/theiterators/sealed-monad")),
32+
homepage := Some(url("https://github.com/theiterators/sealed-monad")),
3433
scalacOptions := Seq("-deprecation", "-unchecked", "-feature", "-encoding", "utf8") ++
3534
(if (isDotty.value)
3635
Seq("-language:implicitConversions", "-Ykind-projector", "-Xignore-scala2-macros")
@@ -62,13 +61,13 @@ lazy val baseSettings = Seq(
6261
connection = "scm:git:https://github.com/theiterators/sealed-monad.git"
6362
)
6463
),
65-
crossScalaVersions := supportedScalaVersions
64+
crossScalaVersions := supportedScalaVersions
6665
)
6766

6867
lazy val noPublishSettings =
6968
Seq(
70-
publishArtifact := false,
71-
skip / publish := true
69+
publishArtifact := false,
70+
skip / publish := true
7271
)
7372

7473
lazy val examples = project

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.8.2
1+
sbt.version=1.9.8

project/plugins.sbt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4")
2-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
3-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
1+
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
2+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
3+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
44
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.10.0")
5-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
5+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8")
6+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")

0 commit comments

Comments
 (0)