From 6e1c14eda2cff8c6fad6860f5acaa39dd07bcd5b Mon Sep 17 00:00:00 2001
From: Kyri Petrou <kyri.petrou@outlook.com>
Date: Sun, 30 Jun 2024 10:55:55 +1000
Subject: [PATCH] Update CI and plugin versions

---
 .github/workflows/ci.yml | 16 +++++++++-------
 build.sbt                | 18 +++++++++++-------
 project/plugins.sbt      |  2 +-
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eaee5131..25a9d1a0 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
@@ -75,15 +78,14 @@ jobs:
       matrix:
         java:
         - '11'
-        - '17'
         - '21'
         scala-project:
-        - ++2.12.19 zioQueryJVM
-        - ++2.13.13 zioQueryJVM
-        - ++3.3.3 zioQueryJVM
-        - ++2.12.19 zioQueryJS
-        - ++2.13.13 zioQueryJS
-        - ++3.3.3 zioQueryJS
+        - ++2.12 zioQueryJVM
+        - ++2.13 zioQueryJVM
+        - ++3.3 zioQueryJVM
+        - ++2.12 zioQueryJS
+        - ++2.13 zioQueryJS
+        - ++3.3 zioQueryJS
     steps:
     - name: Install libuv
       run: sudo apt-get update && sudo apt-get install -y libuv1-dev
diff --git a/build.sbt b/build.sbt
index 1c364149..d5b657d8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -7,10 +7,14 @@ enablePlugins(ZioSbtEcosystemPlugin, ZioSbtCiPlugin)
 
 crossScalaVersions := Seq.empty
 
+lazy val scalaV    = "2.13.14"
+lazy val allScalas = List("2.12", "2.13", "3.3")
+
 inThisBuild(
   List(
-    name       := "ZIO Query",
-    zioVersion := "2.1.4",
+    name         := "ZIO Query",
+    zioVersion   := "2.1.4",
+    scalaVersion := scalaV,
     developers := List(
       Developer(
         "kyri-petrou",
@@ -19,11 +23,12 @@ inThisBuild(
         url("https://github.com/kyri-petrou")
       )
     ),
-    ciEnabledBranches := Seq("series/2.x"),
+    ciEnabledBranches    := Seq("series/2.x"),
+    ciTargetJavaVersions := List("11", "21"),
     ciTargetScalaVersions :=
       Map(
-        (zioQueryJVM / thisProject).value.id -> (zioQueryJVM / crossScalaVersions).value,
-        (zioQueryJS / thisProject).value.id  -> (zioQueryJS / crossScalaVersions).value
+        (zioQueryJVM / thisProject).value.id -> allScalas,
+        (zioQueryJS / thisProject).value.id  -> allScalas
       ),
     versionScheme := Some("early-semver")
   )
@@ -96,8 +101,7 @@ lazy val docs = project
     scalacOptions -= "-Xfatal-warnings",
     projectName                                := (ThisBuild / name).value,
     mainModuleName                             := (zioQueryJVM / moduleName).value,
-    scalaVersion                               := scala213.value,
-    crossScalaVersions                         := Seq(scala213.value),
+    crossScalaVersions                         := Seq(scalaV),
     projectStage                               := ProjectStage.ProductionReady,
     ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(zioQueryJVM)
   )
diff --git a/project/plugins.sbt b/project/plugins.sbt
index e3d8dcbe..4b5d86b5 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
-val zioSbtVersion = "0.4.0-alpha.27"
+val zioSbtVersion = "0.4.0-alpha.28"
 
 addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % zioSbtVersion)
 addSbtPlugin("dev.zio" % "zio-sbt-website"   % zioSbtVersion)