Merge branch 'main' into update/scala-collection-compat-2.13.0

zio · Feb 11, 2025 · 4230f5a · 4230f5a
2 parents 1a9bc7f + 59ae3ea
commit 4230f5a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,6 +36,8 @@ jobs:
         distribution: corretto
         java-version: '17'
         check-latest: true
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
     - name: Check all code compiles
@@ -61,6 +63,8 @@ jobs:
         distribution: corretto
         java-version: '17'
         check-latest: true
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
     - name: Check if the site workflow is up to date
@@ -87,6 +91,8 @@ jobs:
         distribution: corretto
         java-version: ${{ matrix.java }}
         check-latest: true
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
     - name: Git Checkout
@@ -113,6 +119,8 @@ jobs:
         distribution: corretto
         java-version: '17'
         check-latest: true
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
     - name: Generate Readme
@@ -131,7 +139,7 @@ jobs:
         app_private_key: ${{ secrets.APP_PRIVATE_KEY }}
     - name: Create Pull Request
       id: cpr
-      uses: peter-evans/create-pull-request@v6
+      uses: peter-evans/create-pull-request@v7
       with:
         body: |-
           Autogenerated changes after running the `sbt docs/generateReadme` command of the [zio-sbt-website](https://zio.dev/zio-sbt) plugin.
@@ -187,6 +195,8 @@ jobs:
         distribution: corretto
         java-version: '17'
         check-latest: true
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
     - name: Release
@@ -216,6 +226,8 @@ jobs:
         distribution: corretto
         java-version: '17'
         check-latest: true
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
     - name: Setup NodeJs

diff --git a/build.sbt b/build.sbt
@@ -21,7 +21,7 @@ inThisBuild(
   )
 )
 
-val bsonVersion                  = "5.2.0"
+val bsonVersion                  = "5.2.1"
 val scalaCollectionCompatVersion = "2.13.0"
 val magnoliaVersion              = "1.1.10"
 
@@ -41,7 +41,7 @@ lazy val `zio-bson` = project
   .settings(buildInfoSettings("zio.bson"))
   .settings(enableZIO())
   .settings(
-    crossScalaVersions := Seq(scala212.value, scala213Version, "3.5.1"),
+    crossScalaVersions := Seq(scala212.value, scala213Version, "3.5.2"),
     libraryDependencies ++= Seq(
       "org.mongodb"             % "bson"                    % bsonVersion,
       "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
-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")
+addSbtPlugin("dev.zio" % "zio-sbt-website"   % "0.4.0-alpha.30")
+addSbtPlugin("dev.zio" % "zio-sbt-ci"        % "0.4.0-alpha.30")
+addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % "0.4.0-alpha.30")