Skip to content

Commit

Permalink
Merge pull request #292 from typelevel/merge-1.x
Browse files Browse the repository at this point in the history
Merge from 1.x
  • Loading branch information
rossabaker authored Jan 6, 2022
2 parents 4d1372f + 9ee472c commit 8bc602f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.15, 2.13.6, 3.1.0]
scala: [2.12.15, 2.13.7, 3.1.0]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
scala: [2.13.7]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -109,12 +109,12 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.6)
- name: Download target directories (2.13.7)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-2.13.6-${{ matrix.java }}
name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }}

- name: Inflate target directories (2.13.6)
- name: Inflate target directories (2.13.7)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
2 changes: 2 additions & 0 deletions .scala-steward.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
updates.pin = [
]
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ThisBuild / organization := "org.typelevel"
ThisBuild / organizationName := "Typelevel"

ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.6", "3.1.0")
ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.7", "3.1.0")
ThisBuild / scalaVersion := crossScalaVersions.value.filter(_.startsWith("2.")).last
ThisBuild / baseVersion := "2.0"
ThisBuild / publishGithubUser := "rossabaker"
Expand All @@ -13,7 +13,7 @@ ThisBuild / scmInfo := Some(
ScmInfo(url("https://github.com/typelevel/jawn-fs2"), "[email protected]:typelevel/jawn-fs2.git")
)

val JawnVersion = "1.3.0"
val JawnVersion = "1.3.2"
val Fs2Version = "3.2.4"
val MunitVersion = "0.7.29"
val MunitCatsEffectVersion = "1.0.7"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.6
sbt.version=1.6.1

0 comments on commit 8bc602f

Please sign in to comment.