Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
runner.dialect = scala3
version = 3.8.1
maxColumn = 120
maxColumn = 120
fileOverride {
"glob:**.sbt" {
runner.dialect = scala3
}
}
29 changes: 15 additions & 14 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,40 +1,41 @@
import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings
import com.softwaremill.Publish.ossPublishSettings

val scala211 = "2.11.12"
val scala212 = "2.12.19"
val scala213 = "2.13.13"
val scala213 = "2.13.18"
val scala30 = "3.4.1"

val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ List(
organization := "com.softwaremill.retry"
)
commonSmlBuildSettings
ossPublishSettings

organization := "com.softwaremill.retry"

lazy val rootProject = (project in file("."))
.settings(commonSettings: _*)
.settings(publish / skip := true, name := "retry", scalaVersion := scala213)
.aggregate(retry.projectRefs: _*)
.settings(publish / skip := true, name := "retry", moduleName := "retry-root", scalaVersion := scala213)
.aggregate(retry.projectRefs*)

lazy val retry = (projectMatrix in file("retry"))
.settings(commonSettings: _*)
.settings(
scalacOptions += "-feature",
moduleName := "retry",
name := "retry",
description := "a library of simple primitives for asynchronously retrying Scala Futures",
libraryDependencies ++=
Seq(
"org.scalatest" %%% "scalatest" % "3.2.18" % "test",
"com.softwaremill.odelay" %%% "odelay-core" % "0.4.0",
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.12.0"
"org.scalatest" %% "scalatest" % "3.2.18" % "test",
"com.softwaremill.odelay" %% "odelay-core" % "0.4.0",
"org.scala-lang.modules" %% "scala-collection-compat" % "2.12.0"
)
)
.jvmPlatform(
scalaVersions = List(scala211, scala212, scala213, scala30)
scalaVersions = List(scala212, scala213, scala30),
settings = Seq(
scalacOptions ++= (if (ScalaArtifacts.isScala3(scalaVersion.value)) Seq.empty else Seq("-release", "8"))
)
)
.jsPlatform(
scalaVersions = List(scala212, scala213, scala30),
settings = Seq(
libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.5.0"
libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.5.0"
)
)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=2.0.9
8 changes: 3 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")

val sbtSoftwareMillVersion = "2.0.20"
val sbtSoftwareMillVersion = "3.0.1"
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % sbtSoftwareMillVersion)
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion)

addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0")
addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.4")
Loading