Skip to content

Support js and native in core #396

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Support js and native in core #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c1e45b
Support js and native in core
majk-p Sep 8, 2025
69cfa94
update upickle
majk-p Sep 10, 2025
0484041
Merge branch 'master' into js-native-support
majk-p Sep 10, 2025
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
21 changes: 18 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ import Dependencies._
val scala2 = List("2.13.16")
val scala3 = List("3.3.6")

val tapirApispecDocs = Def.setting {
"com.softwaremill.sttp.tapir" %%% "tapir-apispec-docs" % V.tapir
}

val uJsonCirce = Def.setting {
"com.lihaoyi" %%% "ujson-circe" % V.uPickle
}

val uPickle = Def.setting {
"com.lihaoyi" %%% "upickle" % V.uPickle
}

def dependenciesFor(version: String)(deps: (Option[(Long, Long)] => ModuleID)*): Seq[ModuleID] =
deps.map(_.apply(CrossVersion.partialVersion(version)))

Expand All @@ -30,11 +42,14 @@ lazy val core = (projectMatrix in file("core"))
.jvmPlatform(
scalaVersions = scala2 ++ scala3
)
.nativePlatform(
scalaVersions = scala2 ++ scala3
)
.settings(
libraryDependencies ++= Seq(
Libraries.tapirApispecDocs,
Libraries.uJsonCirce,
Libraries.uPickle
tapirApispecDocs.value,
uJsonCirce.value,
uPickle.value
) ++ Libraries.sttpApispec ++ Libraries.sttpClient ++ Seq(Libraries.scalaTest)
)
.settings(commonSettings: _*)
Expand Down
8 changes: 1 addition & 7 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object Dependencies {
val pekkoStreams = "1.2.0"
val akkaStreams = "2.6.20"
val tapir = "1.11.44"
val uPickle = "4.3.0"
val uPickle = "4.3.1"
}

object Libraries {
Expand Down Expand Up @@ -49,12 +49,6 @@ object Dependencies {
"com.softwaremill.sttp.client4" %% "ox" % V.sttpClient
)

val tapirApispecDocs = "com.softwaremill.sttp.tapir" %% "tapir-apispec-docs" % V.tapir

val uJsonCirce = "com.lihaoyi" %% "ujson-circe" % V.uPickle

val uPickle = "com.lihaoyi" %% "upickle" % V.uPickle

}

}
2 changes: 2 additions & 0 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ val sbtSoftwareMillVersion = "2.1.0"
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % sbtSoftwareMillVersion)
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion)
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.11.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.7.2")
Loading