Skip to content

Commit

Permalink
Merge pull request #148 from http4s/update/scala-library-2.12.19
Browse files Browse the repository at this point in the history
Update scala-library to 2.12.19
  • Loading branch information
ybasket authored Mar 10, 2024
2 parents 56c6a0b + cca1644 commit 434b5cc
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 7 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / tlBaseVersion := "0.3"
ThisBuild / tlBaseVersion := "0.4"
ThisBuild / tlJdkRelease := Some(11)
// exclude Java 8 from CI as fs2-data doesn't support it
ThisBuild / githubWorkflowJavaVersions -= JavaSpec.temurin("8")
Expand All @@ -8,7 +8,7 @@ ThisBuild / developers := List(
)

val Scala213 = "2.13.12"
ThisBuild / crossScalaVersions := Seq("2.12.18", Scala213, "3.3.3")
ThisBuild / crossScalaVersions := Seq("2.12.19", Scala213, "3.3.3")
ThisBuild / scalaVersion := Scala213

// ensure missing timezones don't break tests on JS
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 http4s.org
* Copyright 2024 http4s.org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -21,11 +21,12 @@ import cats.data.NonEmptyList
import cats.effect.Concurrent
import cats.syntax.applicative._
import cats.syntax.monadError._
import fs2.data.json._
import fs2.Stream
import cats.syntax.show._
import fs2.Stream
import fs2.data.json._
import org.http4s.Charset.`UTF-8`
import org.http4s.headers.{`Content-Type`, `Transfer-Encoding`}
import org.http4s.headers.`Content-Type`
import org.http4s.headers.`Transfer-Encoding`

trait JsonInstances {

Expand Down
2 changes: 1 addition & 1 deletion json/src/main/scala/org/http4s/fs2data/json/package.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 http4s.org
* Copyright 2024 http4s.org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
16 changes: 16 additions & 0 deletions json/src/test/scala/org/http4s/fs2data/json/JsonEventSuite.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2024 http4s.org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.http4s.fs2data.json

import cats.effect.IO
Expand Down

0 comments on commit 434b5cc

Please sign in to comment.