Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into legacy-cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
luksow committed Oct 14, 2024
2 parents f16045f + 6d2926d commit 412d5e9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
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.8.2
version=3.8.3
6 changes: 2 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import sbt.util

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

// Dependencies
Expand All @@ -12,7 +10,7 @@ val disciplineVersion = "2.3.0"
// Multiple Scala versions support

val scala_2_13 = "2.13.15"
val scala_3 = "3.3.3"
val scala_3 = "3.3.4"
val mainScalaVersion = scala_2_13
val supportedScalaVersions = Seq(scala_2_13, scala_3)

Expand Down Expand Up @@ -144,4 +142,4 @@ lazy val sealedMonad = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.settings(
name := "sealed-monad",
description := "Scala library for nice for-comprehension-style error handling"
)
)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.1
sbt.version=1.10.2

0 comments on commit 412d5e9

Please sign in to comment.