Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump zio & other deps #484

Merged
merged 2 commits into from
May 10, 2024
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
54 changes: 25 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ jobs:
continue-on-error: true
steps:
- name: Git Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6.4.5
uses: coursier/cache-action@v6
- name: Check all code compiles
run: sbt +Test/compile
- name: Check artifacts build process
Expand All @@ -49,19 +49,19 @@ jobs:
continue-on-error: false
steps:
- name: Git Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6.4.5
uses: coursier/cache-action@v6
- name: Check if the site workflow is up to date
run: sbt ciCheckGithubWorkflow
- name: Lint
Expand All @@ -75,28 +75,24 @@ 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.13 zioQueryJS
- ++3.3 zioQueryJS
steps:
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4
with:
distribution: corretto
java-version: ${{ matrix.java }}
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6.4.5
uses: coursier/cache-action@v6
- name: Git Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: Test
Expand All @@ -108,19 +104,19 @@ jobs:
if: ${{ github.event_name == 'push' }}
steps:
- name: Git Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6.4.5
uses: coursier/cache-action@v6
- name: Generate Readme
run: sbt docs/generateReadme
- name: Commit Changes
Expand All @@ -137,7 +133,7 @@ jobs:
app_private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v6.0.2
uses: peter-evans/create-pull-request@v6
with:
body: |-
Autogenerated changes after running the `sbt docs/generateReadme` command of the [zio-sbt-website](https://zio.dev/zio-sbt) plugin.
Expand Down Expand Up @@ -182,19 +178,19 @@ jobs:
if: ${{ github.event_name != 'pull_request' }}
steps:
- name: Git Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6.4.5
uses: coursier/cache-action@v6
- name: Release
run: sbt ci-release
env:
Expand All @@ -211,19 +207,19 @@ jobs:
if: ${{ ((github.event_name == 'release') && (github.event.action == 'published')) || (github.event_name == 'workflow_dispatch') }}
steps:
- name: Git Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
- name: Setup Scala
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6.4.5
uses: coursier/cache-action@v6
- name: Setup NodeJs
uses: actions/setup-node@v4
with:
Expand All @@ -242,7 +238,7 @@ jobs:
if: ${{ (github.event_name == 'release') && (github.event.action == 'published') }}
steps:
- name: Git Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: notify the main repo about the new release of docs package
Expand Down
57 changes: 55 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import com.typesafe.tools.mima.core.*
import explicitdeps.ExplicitDepsPlugin.autoImport.moduleFilterRemoveValue
import sbtcrossproject.CrossPlugin.autoImport.crossProject
import zio.sbt.githubactions.*
import _root_.io.circe.syntax.*

enablePlugins(ZioSbtEcosystemPlugin, ZioSbtCiPlugin)

Expand All @@ -10,7 +11,7 @@ crossScalaVersions := Seq.empty
inThisBuild(
List(
name := "ZIO Query",
zioVersion := "2.0.22",
zioVersion := "2.1.0",
developers := List(
Developer(
"kyri-petrou",
Expand Down Expand Up @@ -54,7 +55,7 @@ lazy val zioQuery = crossProject(JSPlatform, JVMPlatform)
.settings(scalacOptions += "-Wconf:msg=[zio.stacktracer.TracingImplicits.disableAutoTrace]:silent")
.settings(
libraryDependencies ++= Seq(
"org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0"
"org.scala-lang.modules" %% "scala-collection-compat" % "2.12.0"
),
scalacOptions ++=
(if (scalaBinaryVersion.value == "3")
Expand Down Expand Up @@ -127,3 +128,55 @@ ThisBuild / ciCheckArtifactsBuildSteps +=
"Check binary compatibility",
run = Some("sbt \"+zioQueryJVM/mimaReportBinaryIssues; +zioQueryJS/mimaReportBinaryIssues\"")
)

// Temporary, until zio-test issue with ScalaJS 2.12 is resolved
ThisBuild / ciTestJobs := Seq(
Job(
id = "test",
name = "Test",
runsOn = "ubuntu-latest",
timeoutMinutes = 15,
continueOnError = false,
strategy = Some(
Strategy(
matrix = Map(
"java" -> List("11", "21"),
"scala-project" -> List(
"++2.12 zioQueryJVM",
"++2.13 zioQueryJVM",
"++3.3 zioQueryJVM",
"++2.13 zioQueryJS",
"++3.3 zioQueryJS"
)
),
failFast = false
)
),
steps = List(
Step.SingleStep(
name = "Setup Scala",
uses = Some(ActionRef("actions/setup-java@v4")),
parameters = Map(
"distribution" -> "corretto".asJson,
"java-version" -> "${{ matrix.java }}".asJson,
"check-latest" -> true.asJson
)
),
Step.SingleStep(
name = "Cache Dependencies",
uses = Some(ActionRef("coursier/cache-action@v6"))
),
Step.SingleStep(
name = "Git Checkout",
uses = Some(ActionRef("actions/checkout@v4")),
parameters = Map(
"fetch-depth" -> "0".asJson
)
),
Step.SingleStep(
name = "Test",
run = Some("sbt ${{ matrix.scala-project }}/test")
)
)
)
)
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val zioSbtVersion = "0.4.0-alpha.25"
val zioSbtVersion = "0.4.0-alpha.26"

addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % zioSbtVersion)
addSbtPlugin("dev.zio" % "zio-sbt-website" % zioSbtVersion)
Expand Down