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

Update nscplugin, sbt-scala-native to 0.5.1 #2137

Merged
merged 3 commits into from
Apr 24, 2024
Merged

Update nscplugin, sbt-scala-native to 0.5.1 #2137

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
79a0751
Update nscplugin, sbt-scala-native to 0.5.1
Apr 17, 2024
eae28de
Update dependencies and remove native build from some modules
kciesielski Apr 24, 2024
228ad76
Fix compilation
kciesielski Apr 24, 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
15 changes: 4 additions & 11 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ val commonJsBackendSettings = JSDependenciesPlugin.projectSettings ++ List(
)

val commonNativeSettings = commonSettings ++ Seq(
nativeLinkStubs := true,
Test / test := {
// TODO: re-enable after scala-native release > 0.4.0-M2
if (sys.env.isDefinedAt("RELEASE_VERSION")) {
Expand Down Expand Up @@ -151,8 +150,8 @@ val zio2Version = "2.0.22"
val zio1InteropRsVersion = "1.3.12"
val zio2InteropRsVersion = "2.0.2"

val sttpModelVersion = "1.7.9"
val sttpSharedVersion = "1.3.17"
val sttpModelVersion = "1.7.10"
val sttpSharedVersion = "1.3.18"

val logback = "ch.qos.logback" % "logback-classic" % "1.5.5"

Expand Down Expand Up @@ -373,10 +372,6 @@ lazy val cats = (projectMatrix in file("effects/cats"))
scalaVersions = scala2 ++ scala3,
settings = commonJsSettings ++ commonJsBackendSettings ++ browserChromeTestSettings ++ testServerSettings
)
.nativePlatform(
scalaVersions = scala2 ++ scala3,
settings = commonNativeSettings
)

lazy val fs2Ce2 = (projectMatrix in file("effects/fs2-ce2"))
.settings(
Expand Down Expand Up @@ -421,7 +416,6 @@ lazy val fs2 = (projectMatrix in file("effects/fs2"))
)
)
.jsPlatform(scalaVersions = scala2 ++ scala3, settings = commonJsSettings)
.nativePlatform(scalaVersions = scala2 ++ scala3, settings = commonNativeSettings)

lazy val monix = (projectMatrix in file("effects/monix"))
.settings(
Expand Down Expand Up @@ -795,7 +789,6 @@ lazy val circe = (projectMatrix in file("json/circe"))
settings = commonJvmSettings
)
.jsPlatform(scalaVersions = scala2 ++ scala3, settings = commonJsSettings)
.nativePlatform(scalaVersions = scala2 ++ scala3, settings = commonNativeSettings)
.dependsOn(core, jsonCommon)

lazy val jsoniter = (projectMatrix in file("json/jsoniter"))
Expand Down Expand Up @@ -866,7 +859,7 @@ lazy val upickle = (projectMatrix in file("json/upickle"))
.settings(
name := "upickle",
libraryDependencies ++= Seq(
"com.lihaoyi" %%% "upickle" % "3.1.4"
"com.lihaoyi" %%% "upickle" % "3.3.0"
),
scalaTest,
// using macroRW causes a "match may not be exhaustive" error
Expand Down Expand Up @@ -982,7 +975,7 @@ lazy val scribeBackend = (projectMatrix in file("logging/scribe"))
.settings(
name := "scribe-backend",
libraryDependencies ++= Seq(
"com.outr" %%% "scribe" % "3.13.2"
"com.outr" %%% "scribe" % "3.13.3"
),
scalaTest
)
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scalanative/sttp/client4/curl/internal/CurlApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private[client4] object CurlApi {
def withEncoding(encoding: String)(implicit zone: Zone): CurlCode = CCurl.mimeEncoder(handle, toCString(encoding))

def withData(data: String, datasize: Long = CurlZeroTerminated)(implicit zone: Zone): CurlCode =
CCurl.mimeData(handle, toCString(data), datasize.toULong)
CCurl.mimeData(handle, toCString(data), datasize.toCSize)

def withFileData(filename: String)(implicit zone: Zone): CurlCode = CCurl.mimeFiledata(handle, toCString(filename))

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,6 +1,6 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")

Expand Down
Loading