Skip to content

Commit

Permalink
Eval refactor, fixing bugs in evaluation order (#217)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
3 people committed Jan 4, 2024
1 parent e31f3cc commit 6f436ba
Show file tree
Hide file tree
Showing 13 changed files with 593 additions and 168 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.7.17
7c6966fbfe8e67006302d992d51bef38713be851
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.17, 2.13.10, 3.2.2]
scala: [2.12.18, 2.13.12, 3.3.1]
java: [temurin@8, temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -61,4 +61,4 @@ jobs:
with:
fetch-depth: 0
- uses: olafurpg/setup-scala@v13
- run: sbt '++2.12.17 docs/mdoc'
- run: sbt '++2.12.18 docs/mdoc'
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ newlines.topLevelStatementBlankLines = [
]
rewrite.rules = [SortImports, RedundantBraces]
runner.dialect = scala213
version=3.7.3
version=3.7.17
19 changes: 9 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

val isDotty = Def.setting(CrossVersion.partialVersion(scalaVersion.value).exists(_._1 != 2))

// Dependencies

val catsVersion = "2.9.0"
val catsVersion = "2.10.0"
val castsTestkitScalatestVersion = "2.1.5"

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

// Multiple Scala versions support

val scala_2_12 = "2.12.17"
val scala_2_13 = "2.13.10"
val dotty = "3.2.2"
val scala_2_12 = "2.12.18"
val scala_2_13 = "2.13.12"
val dotty = "3.3.1"
val mainScalaVersion = scala_2_13
val supportedScalaVersions = Seq(scala_2_12, scala_2_13, dotty)

ThisBuild / crossScalaVersions := supportedScalaVersions
ThisBuild / scalaVersion := mainScalaVersion
ThisBuild / scalaVersion := mainScalaVersion

lazy val baseSettings = Seq(
// Scala settings
homepage := Some(url("https://github.com/theiterators/sealed-monad")),
homepage := Some(url("https://github.com/theiterators/sealed-monad")),
scalacOptions := Seq("-deprecation", "-unchecked", "-feature", "-encoding", "utf8") ++
(if (isDotty.value)
Seq("-language:implicitConversions", "-Ykind-projector", "-Xignore-scala2-macros")
Expand Down Expand Up @@ -62,13 +61,13 @@ lazy val baseSettings = Seq(
connection = "scm:git:https://github.com/theiterators/sealed-monad.git"
)
),
crossScalaVersions := supportedScalaVersions
crossScalaVersions := supportedScalaVersions
)

lazy val noPublishSettings =
Seq(
publishArtifact := false,
skip / publish := true
publishArtifact := false,
skip / publish := true
)

lazy val examples = project
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.8.2
sbt.version=1.9.8
9 changes: 5 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
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")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
Loading

0 comments on commit 6f436ba

Please sign in to comment.