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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ jobs:
if: github.event.pull_request.user.login == 'softwaremill-ci'
needs: [ build, mima, label ]
uses: softwaremill/github-actions-workflows/.github/workflows/auto-merge.yml@main
secrets: inherit
secrets: inherit
2 changes: 0 additions & 2 deletions .github/workflows/scala-steward.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,3 @@ jobs:
uses: softwaremill/github-actions-workflows/.github/workflows/scala-steward.yml@main
secrets:
github-token: ${{ secrets.SOFTWAREMILL_CI_PR_TOKEN }}
with:
java-version: '21'
5 changes: 4 additions & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ fileOverride {
"glob:**/scala-3/**" {
runner.dialect = scala3
}
}
"glob:**.sbt" {
runner.dialect = scala3
}
}
20 changes: 10 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ val scala3 = List("3.3.8")
val scalaTestVersion = "3.2.20"
val scalaTestPlusScalaCheckVersion = "3.2.20.0"

excludeLintKeys in Global ++= Set(ideSkipProject)
Global / excludeLintKeys ++= Set(ideSkipProject)

def dependenciesFor(version: String)(deps: (Option[(Long, Long)] => ModuleID)*): Seq[ModuleID] =
deps.map(_.apply(CrossVersion.partialVersion(version)))
Expand All @@ -24,7 +24,7 @@ val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
val commonJvmSettings = commonSettings ++ Seq(
scalacOptions ++=
(if (ScalaArtifacts.isScala3(scalaVersion.value)) Seq("-Yfuture-lazy-vals", "-java-output-version", "11")
else Seq.empty),
else Seq("-release", "8")),
ideSkipProject := (scalaVersion.value != scala2_13),
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % scalaTestVersion % Test,
Expand All @@ -51,17 +51,17 @@ val commonJsSettings = commonSettings ++ Seq(
}
},
libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-dom" % "2.8.1",
"org.scalatest" %%% "scalatest" % scalaTestVersion % Test,
"org.scalatestplus" %%% "scalacheck-1-19" % scalaTestPlusScalaCheckVersion % Test
"org.scala-js" %% "scalajs-dom" % "2.8.1",
"org.scalatest" %% "scalatest" % scalaTestVersion % Test,
"org.scalatestplus" %% "scalacheck-1-19" % scalaTestPlusScalaCheckVersion % Test
)
)

val commonNativeSettings = commonSettings ++ Seq(
ideSkipProject := true,
libraryDependencies ++= Seq(
"org.scalatest" %%% "scalatest" % scalaTestVersion % Test,
"org.scalatestplus" %%% "scalacheck-1-19" % scalaTestPlusScalaCheckVersion % Test
"org.scalatest" %% "scalatest" % scalaTestVersion % Test,
"org.scalatestplus" %% "scalacheck-1-19" % scalaTestPlusScalaCheckVersion % Test
)
)

Expand All @@ -80,9 +80,9 @@ lazy val allAggregates: Seq[ProjectReference] = {
val compileAndTest = "compile->compile;test->test"

lazy val rootProject = (project in file("."))
.settings(commonSettings: _*)
.settings(commonSettings*)
.settings(publish / skip := true, name := "sttp-model", scalaVersion := scala2_13)
.aggregate(allAggregates: _*)
.aggregate(allAggregates*)

lazy val core = (projectMatrix in file("core"))
.settings(
Expand All @@ -95,7 +95,7 @@ lazy val core = (projectMatrix in file("core"))
.jsPlatform(
scalaVersions = scala2 ++ scala3,
settings = commonJsSettings ++ browserChromeTestSettings ++ Seq(
libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.7.0"
libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.7.0"
)
)
.nativePlatform(
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.13.0
sbt.version=2.0.9
5 changes: 2 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.12")
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.11.0")

val sbtSoftwareMillVersion = "2.1.2"
val sbtSoftwareMillVersion = "3.0.0"
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % sbtSoftwareMillVersion)
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion)
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-browser-test-js" % sbtSoftwareMillVersion)

addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0")
addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.4")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.2.1")

addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")
Loading