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.

Sign up for GitHub

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

Jump to bottom

Support Scala native 0.5, Update deps #602

Merged
merged 8 commits into from
Jul 31, 2024
Merged

Support Scala native 0.5, Update deps #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9fb47f6
Update scala-library to 2.13.14
valencik Jul 30, 2024
a4e3612
Update cats to 2.12.0
valencik Jul 30, 2024
ace18f3
Update scala-native to 0.5.4
valencik Jul 30, 2024
7f7bda9
Update munit deps to 1.0.0
valencik Jul 30, 2024
7cb99bc
Fix munit deps for Scala 2.11
valencik Jul 30, 2024
177a297
Fix build.sbt formatting
valencik Jul 30, 2024
22528f8
Fix repeated naming warning / error
valencik Jul 31, 2024
0501613
Reset tlVersionIntroduced for Scala Native 0.5
valencik Jul 31, 2024
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
22 changes: 15 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import com.typesafe.tools.mima.core._
import Dependencies._
val scala211 = "2.11.12"
val scala212 = "2.12.19"
val scala213 = "2.13.12"
val scala213 = "2.13.14"
val scala3 = "3.3.3"

GlobalScope / tlCommandAliases ++= Map(
Expand Down Expand Up @@ -67,11 +67,18 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.settings(
name := "cats-parse",
libraryDependencies ++= {
Seq(
if (isScala211.value) cats211.value else cats.value,
munit.value % Test,
munitScalacheck.value % Test
)
if (isScala211.value)
Seq(
cats211.value,
munit211.value % Test,
munitScalacheck211.value % Test
)
else
Seq(
cats.value,
munit.value % Test,
munitScalacheck.value % Test
)
},
libraryDependencies ++= {
if (tlIsScala3.value) Nil else Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)
Expand Down Expand Up @@ -113,7 +120,8 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
)
.nativeSettings(
crossScalaVersions := (ThisBuild / crossScalaVersions).value.filterNot(_.startsWith("2.11")),
tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "0.3.8").toMap,
// cats-parse 1.0.1 switches to Scala Native 0.5, reset tlVersionIntroduced
tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "1.0.1").toMap,
coverageEnabled := false
)

Expand Down
2 changes: 1 addition & 1 deletion core/jvm/src/test/scala/cats/parse/JvmNumbersTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class JvmNumbersTest extends munit.ScalaCheckSuite {
case Left(_) => None
case Right(a) => Some(a)
}
val jawn = JParser.parseFromString(a).toOption.collect { case jn: JNum => jn }
val jawn = JParser.parseFromString(a).toOption.collect { case jnum: JNum => jnum }

assertEquals(jn.isDefined, jawn.isDefined)

Expand Down
8 changes: 5 additions & 3 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ import sbt._
import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._

object Dependencies {
lazy val cats = Def.setting("org.typelevel" %%% "cats-core" % "2.11.0")
lazy val cats = Def.setting("org.typelevel" %%% "cats-core" % "2.12.0")
lazy val cats211 = Def.setting("org.typelevel" %%% "cats-core" % "2.0.0")
lazy val munit = Def.setting("org.scalameta" %%% "munit" % "1.0.0-M10")
lazy val munitScalacheck = Def.setting("org.scalameta" %%% "munit-scalacheck" % "1.0.0-M10")
lazy val munit = Def.setting("org.scalameta" %%% "munit" % "1.0.0")
lazy val munit211 = Def.setting("org.scalameta" %%% "munit" % "1.0.0-M10")
lazy val munitScalacheck = Def.setting("org.scalameta" %%% "munit-scalacheck" % "1.0.0")
lazy val munitScalacheck211 = Def.setting("org.scalameta" %%% "munit-scalacheck" % "1.0.0-M10")
lazy val fastParse = "com.lihaoyi" %% "fastparse" % "3.1.1"
lazy val parsley = "org.http4s" %% "parsley" % "1.5.0-M3"
lazy val jawnAst = Def.setting("org.typelevel" %% "jawn-ast" % "1.6.0")
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.4")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
Expand Down
Loading