Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
ThijsBroersen committed Nov 17, 2024
1 parent 63f2e01 commit e481639
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 29 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
with:
distribution: corretto
java-version: '17'
check-latest: 'true'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
- name: Check all code compiles
Expand All @@ -60,7 +60,7 @@ jobs:
with:
distribution: corretto
java-version: '17'
check-latest: 'true'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
- name: Check if the site workflow is up to date
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
with:
distribution: corretto
java-version: ${{ matrix.java }}
check-latest: 'true'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
- name: Git Checkout
Expand All @@ -120,7 +120,7 @@ jobs:
with:
distribution: corretto
java-version: '17'
check-latest: 'true'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
- name: Generate Readme
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
branch: zio-sbt-website/update-readme
commit-message: Update README.md
token: ${{ steps.generate-token.outputs.token }}
delete-branch: 'true'
delete-branch: true
title: Update README.md
- name: Approve PR
if: ${{ steps.cpr.outputs.pull-request-number }}
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
with:
distribution: corretto
java-version: '17'
check-latest: 'true'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
- name: Release
Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
with:
distribution: corretto
java-version: '17'
check-latest: 'true'
check-latest: true
- name: Cache Dependencies
uses: coursier/cache-action@v6
- name: Setup NodeJs
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The goal of this project is to create the best all-round JSON library for Scala:
In order to use this library, we need to add the following line in our `build.sbt` file:

```scala
libraryDependencies += "dev.zio" %% "zio-json" % "0.7.0"
libraryDependencies += "dev.zio" %% "zio-json" % "0.7.3"
```

## Example
Expand Down
8 changes: 2 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,11 @@ inThisBuild(
),
scalaVersion := scala213.value,
javaPlatform := zio.sbt.JavaVersion.`11`,
ciEnabledBranches := Seq("series/2.x")
ciEnabledBranches := Seq("series/2.x"),
checkMima / skip := true
)
)

addCommandAlias("check", "; scalafmtSbtCheck; scalafmtCheckAll")
addCommandAlias("fmt", "all scalafmtSbt scalafmtAll")
addCommandAlias("fmtCheck", "all scalafmtSbtCheck scalafmtCheckAll")
addCommandAlias("prepare", "fmt")

lazy val zioJsonRoot = project
.in(file("."))
.settings(
Expand Down
21 changes: 6 additions & 15 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
val zioSbtVersion = "0.0.0+526-a72bd851-SNAPSHOT"
val zioSbtVersion = "0.0.0+529-d9aba4fa-SNAPSHOT"

addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5")
addSbtPlugin("pl.project13.scala" % "sbt-jcstress" % "0.2.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("nl.thijsbroersen" % "zio-sbt-ci" % zioSbtVersion)
addSbtPlugin("nl.thijsbroersen" % "zio-sbt-ecosystem" % zioSbtVersion)
addSbtPlugin("nl.thijsbroersen" % "zio-sbt-website" % zioSbtVersion)
addSbtPlugin("pl.project13.scala" % "sbt-jcstress" % "0.2.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("nl.thijsbroersen" % "zio-sbt-ci" % zioSbtVersion)
addSbtPlugin("nl.thijsbroersen" % "zio-sbt-ecosystem" % zioSbtVersion)
addSbtPlugin("nl.thijsbroersen" % "zio-sbt-website" % zioSbtVersion)

resolvers ++= Resolver.sonatypeOssRepos("snapshots")

0 comments on commit e481639

Please sign in to comment.