From a9961ab418553aee40024ef1e8b9de6c34dc135f Mon Sep 17 00:00:00 2001 From: Simon Popugaev Date: Thu, 19 Sep 2024 18:35:23 +0300 Subject: [PATCH] upgrade zio --- .github/workflows/ci.yml | 3 +++ build.sbt | 13 ++++++++----- project/plugins.sbt | 6 +++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5eb3420..b177da0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,9 @@ env: pull_request: branches-ignore: - gh-pages +concurrency: + group: ${{ github.workflow }}-${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.run_id || github.ref }} + cancel-in-progress: true jobs: build: name: Build diff --git a/build.sbt b/build.sbt index dd1670c..ef3efdb 100644 --- a/build.sbt +++ b/build.sbt @@ -1,12 +1,15 @@ enablePlugins(ZioSbtEcosystemPlugin, ZioSbtCiPlugin) +val scala213Version = "2.13.14" + inThisBuild( List( name := "ZIO Bson", organization := "dev.zio", - zioVersion := "2.0.22", + zioVersion := "2.1.9", ciEnabledBranches := Seq("main"), - crossScalaVersions := Seq.empty, + crossScalaVersions := Seq(scala213Version), + scalaVersion := scala213Version, developers := List( Developer( "jdegoes", @@ -38,7 +41,7 @@ lazy val `zio-bson` = project .settings(buildInfoSettings("zio.bson")) .settings(enableZIO()) .settings( - crossScalaVersions := Seq(scala212.value, scala213.value, "3.4.3"), + crossScalaVersions := Seq(scala212.value, scala213Version, "3.4.3"), libraryDependencies ++= Seq( "org.mongodb" % "bson" % bsonVersion, "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion @@ -52,7 +55,7 @@ lazy val `zio-bson-magnolia` = project .settings(buildInfoSettings("zio.bson.magnolia")) .settings(enableZIO()) .settings( - crossScalaVersions := Seq(scala213.value), + crossScalaVersions := Seq(scala213Version), libraryDependencies ++= Seq( "dev.zio" %% "zio-test-magnolia" % zioVersion.value % Test, "com.softwaremill.magnolia1_2" %% "magnolia" % magnoliaVersion, @@ -68,7 +71,7 @@ lazy val docs = project .dependsOn(`zio-bson`, `zio-bson-magnolia`) .settings(stdSettings()) .settings( - crossScalaVersions := Seq(scala213.value), + crossScalaVersions := Seq(scala213Version), moduleName := "zio-bson-docs", scalacOptions -= "-Yno-imports", scalacOptions -= "-Xfatal-warnings", diff --git a/project/plugins.sbt b/project/plugins.sbt index 7a71024..2298fe4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.4.0-alpha.27") -addSbtPlugin("dev.zio" % "zio-sbt-ci" % "0.4.0-alpha.27") -addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % "0.4.0-alpha.27") +addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.4.0-alpha.28") +addSbtPlugin("dev.zio" % "zio-sbt-ci" % "0.4.0-alpha.28") +addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % "0.4.0-alpha.28")