Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ jobs:
- name: Submit Dependencies
uses: scalacenter/sbt-dependency-submission@v2
with:
modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 fs2-data-msgpack_2.12 fs2-data-msgpack_2.13 fs2-data-msgpack_3 site_2.12 site_2.13 site_3 jq-like_2.12 jq-like_2.13 jq-like_3 benchmarks_2.12 benchmarks_2.13 benchmarks_3 fs2-data-msgpack_native0.4_2.12 fs2-data-msgpack_native0.4_2.13 fs2-data-msgpack_native0.4_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3 jq-like_sjs1_2.12 jq-like_sjs1_2.13 jq-like_sjs1_3 fs2-data-msgpack_sjs1_2.12 fs2-data-msgpack_sjs1_2.13 fs2-data-msgpack_sjs1_3 jq-like_native0.4_2.12 jq-like_native0.4_2.13 jq-like_native0.4_3
modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 fs2-data-msgpack_2.12 fs2-data-msgpack_2.13 fs2-data-msgpack_3 site_2.12 site_2.13 site_3 jq-like_2.12 jq-like_2.13 jq-like_3 benchmarks_2.12 benchmarks_2.13 benchmarks_3 fs2-data-msgpack_native0.5_2.12 fs2-data-msgpack_native0.5_2.13 fs2-data-msgpack_native0.5_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3 jq-like_sjs1_2.12 jq-like_sjs1_2.13 jq-like_sjs1_3 fs2-data-msgpack_sjs1_2.12 fs2-data-msgpack_sjs1_2.13 fs2-data-msgpack_sjs1_3
configs-ignore: test scala-tool scala-doc-tool test-internal

validate-steward:
Expand Down
47 changes: 26 additions & 21 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ import xerial.sbt.Sonatype.sonatypeCentralHost
val scala212 = "2.12.20"
val scala213 = "2.13.16"
val scala3 = "3.3.6"
val fs2Version = "3.12.0"
val circeVersion = "0.14.8"
val fs2Version = "3.13.0-M7"
val circeVersion = "0.14.14"
val circeExtrasVersion = "0.14.2"
val playVersion = "3.0.5"
val shapeless2Version = "2.3.11"
val shapeless3Version = "3.4.1"
val shapeless2Version = "2.3.13"
val shapeless3Version = "3.5.0"
val scalaJavaTimeVersion = "2.6.0"
val diffsonVersion = "4.6.0"
val literallyVersion = "1.1.0"
val weaverVersion = "0.8.4"
val diffsonVersion = "5.0-8cf53fd-SNAPSHOT"
val literallyVersion = "1.2.0"
val weaverVersion = "0.11-ddd6eba-SNAPSHOT"

ThisBuild / tlBaseVersion := "1.12"

Expand All @@ -50,18 +50,21 @@ ThisBuild / tlJdkRelease := Some(11)
ThisBuild / sonatypeCredentialHost := sonatypeCentralHost
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"))

ThisBuild / resolvers += Resolver.sonatypeCentralSnapshots

val commonSettings = List(
versionScheme := Some("early-semver"),
libraryDependencies ++= List(
"co.fs2" %%% "fs2-core" % fs2Version,
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.11.0",
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.13.0",
"io.circe" %%% "circe-parser" % circeVersion % "test",
"io.circe" %%% "circe-jawn" % circeVersion % "test",
"io.circe" %%% "circe-generic" % circeVersion % "test",
"co.fs2" %%% "fs2-io" % fs2Version % "test",
"com.disneystreaming" %%% "weaver-cats" % weaverVersion % "test",
"com.disneystreaming" %%% "weaver-scalacheck" % weaverVersion % Test,
"com.eed3si9n.expecty" %%% "expecty" % "0.16.0" % "test",
"org.typelevel" %%% "weaver-cats" % weaverVersion % "test",
"org.typelevel" %%% "weaver-scalacheck" % weaverVersion % Test,
"org.scalameta" %%% "munit-diff" % "1.2.0" % Test, // added explicitly to overcome https://github.com/typelevel/weaver-test/issues/208
"com.eed3si9n.expecty" %%% "expecty" % "0.17.0" % "test",
"org.portable-scala" %%% "portable-scala-reflect" % "1.1.3" cross CrossVersion.for3Use2_13
) ++ PartialFunction
.condOpt(CrossVersion.partialVersion(scalaVersion.value)) { case Some((2, _)) =>
Expand Down Expand Up @@ -126,7 +129,7 @@ lazy val text = crossProject(JVMPlatform, JSPlatform, NativePlatform)
name := "fs2-data-text",
description := "Utilities for textual data format",
libraryDependencies ++= List(
"org.typelevel" %%% "cats-collections-core" % "0.9.8"
"org.typelevel" %%% "cats-collections-core" % "0.9.10"
),
mimaBinaryIssueFilters ++= List(
// private class
Expand Down Expand Up @@ -278,7 +281,7 @@ lazy val json = crossProject(JVMPlatform, JSPlatform, NativePlatform)
description := "Streaming JSON manipulation library",
libraryDependencies ++= List(
"org.typelevel" %%% "literally" % literallyVersion,
"org.typelevel" %%% "cats-parse" % "1.0.0"
"org.typelevel" %%% "cats-parse" % "1.1.0"
) ++ PartialFunction
.condOpt(CrossVersion.partialVersion(scalaVersion.value)) { case Some((2, _)) =>
"org.scala-lang" % "scala-reflect" % scalaVersion.value
Expand Down Expand Up @@ -436,7 +439,7 @@ lazy val scalaXml = crossProject(JVMPlatform, JSPlatform, NativePlatform)
.settings(
name := "fs2-data-xml-scala",
description := "Support for Scala XML ASTs",
libraryDependencies += "org.scala-lang.modules" %%% "scala-xml" % "2.2.0",
libraryDependencies += "org.scala-lang.modules" %%% "scala-xml" % "2.4.0",
tlVersionIntroduced := Map("3" -> "1.4.0", "2.13" -> "1.4.0", "2.12" -> "1.4.0"),
mimaBinaryIssueFilters ++= List(
// Changed from implicit object to implicit val, seems impossible to stub. Second is Scala 3 only
Expand Down Expand Up @@ -534,7 +537,8 @@ lazy val benchmarks = crossProject(JVMPlatform)
)
.dependsOn(csv, scalaXml, jsonCirce, msgpack)

lazy val exampleJq = crossProject(JVMPlatform, NativePlatform, JSPlatform)
// NOTE: cross build disabled for NativePlatform due to decline-effect missing on native
lazy val exampleJq = crossProject(JVMPlatform, JSPlatform)
.crossType(CrossType.Pure)
.in(file("examples/jqlike"))
.enablePlugins(NoPublishPlugin)
Expand All @@ -543,18 +547,19 @@ lazy val exampleJq = crossProject(JVMPlatform, NativePlatform, JSPlatform)
name := "jq-like",
libraryDependencies ++= List(
"co.fs2" %%% "fs2-io" % fs2Version,
"com.monovore" %%% "decline-effect" % "2.4.1"
"com.monovore" %%% "decline-effect" % "2.5.0"
)
)
.jvmSettings(
assembly / mainClass := Some("fs2.data.example.jqlike.JqLike"),
assembly / assemblyJarName := "jq-like.jar"
)
.nativeSettings(nativeConfig ~= {
_.withLTO(LTO.thin)
.withMode(Mode.releaseFast)
.withGC(GC.immix)
})
// Uncomment when decline-effect is available for SN 0.5.x
// .nativeSettings(nativeConfig ~= {
// _.withLTO(LTO.thin)
// .withMode(Mode.releaseFast)
// .withGC(GC.immix)
// })
.jsSettings(
scalaJSUseMainModuleInitializer := true,
scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.7")

addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")

addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")