Skip to content

Update Scala Native to 0.5.x #1821

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
majk-p wants to merge 8 commits into
base: series/0.18
Choose a base branch
from
Draft

Update Scala Native to 0.5.x #1821

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
106a9c5
Update Scala Native to 0.5.x
majk-p Aug 29, 2025
6741758
use published weaver snapshot
majk-p Sep 2, 2025
14ca350
use snapshot version of http4s
majk-p Sep 11, 2025
a5d0669
update scalapb and jsoniter, disable xml module
majk-p Sep 11, 2025
c57887f
update decline
majk-p Sep 11, 2025
47255a4
fix cryptoplatform
majk-p Sep 12, 2025
43c7e94
update protobuf dependency
majk-p Sep 16, 2025
add7fa1
Merge branch 'series/0.18' into update/scala-native-0.5
majk-p Sep 18, 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
57 changes: 31 additions & 26 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ ThisBuild / resolvers += Resolver.sonatypeCentralSnapshots

Global / onChangedBuildSource := ReloadOnSourceChanges

// Silence binary compatibility warnings for test-interface in Scala Native 0.5.x series
// has to include _native suffix due to https://github.com/sbt/sbt/issues/7140
ThisBuild / libraryDependencySchemes +=
"org.scala-native" %% "test-interface_native0.5" % VersionScheme.Always

import Smithy4sBuildPlugin._

val latest2ScalaVersions = List(Scala213, Scala3)
Expand Down Expand Up @@ -60,7 +65,7 @@ lazy val allModules = Seq(
docs,
millCodegenPlugin,
json,
xml,
// xml,
bootstrapped,
tests,
http4s,
Expand Down Expand Up @@ -173,13 +178,13 @@ val weaverDeps = Def.setting {
val munitDeps = Def.setting {
if (virtualAxes.value.contains(VirtualAxis.native)) {
Seq(
Dependencies.MunitMilestone.core.value % Test,
Dependencies.MunitMilestone.scalacheck.value % Test
Dependencies.MunitV1.core.value % Test,
Dependencies.MunitV1.scalacheck.value % Test
)
} else {
Seq(
Dependencies.Munit.core.value % Test,
Dependencies.Munit.scalacheck.value % Test
Dependencies.MunitV1.core.value % Test,
Dependencies.MunitV1.scalacheck.value % Test
)
}
}
Expand Down Expand Up @@ -379,7 +384,7 @@ lazy val `aws-http4s` = projectMatrix
`aws-kernel`,
`http4s-kernel`,
json,
xml,
// xml,
complianceTests % "test->compile",
dynamic % "test->compile",
tests % "test->compile",
Expand Down Expand Up @@ -762,24 +767,24 @@ lazy val json = projectMatrix
* Module that contains fs2-data-based XML encoders/decoders for the generated
* types.
*/
lazy val xml = projectMatrix
.in(file("modules/xml"))
.dependsOn(
core,
bootstrapped % "test->test",
scalacheck % "test -> compile"
)
.settings(
isMimaEnabled := false,
libraryDependencies ++= Seq(
Dependencies.Fs2Data.xml.value
) ++ weaverDeps.value,
libraryDependencies ++= munitDeps.value,
Test / fork := virtualAxes.value.contains(VirtualAxis.jvm)
)
.jvmPlatform(allJvmScalaVersions, jvmDimSettings)
.jsPlatform(allJsScalaVersions, jsDimSettings)
.nativePlatform(allNativeScalaVersions, nativeDimSettings)
// lazy val xml = projectMatrix
// .in(file("modules/xml"))
// .dependsOn(
// core,
// bootstrapped % "test->test",
// scalacheck % "test -> compile"
// )
// .settings(
// isMimaEnabled := false,
// libraryDependencies ++= Seq(
// Dependencies.Fs2Data.xml.value
// ) ++ weaverDeps.value,
// libraryDependencies ++= munitDeps.value,
// Test / fork := virtualAxes.value.contains(VirtualAxis.jvm)
// )
// .jvmPlatform(allJvmScalaVersions, jvmDimSettings)
// .jsPlatform(allJsScalaVersions, jsDimSettings)
// .nativePlatform(allNativeScalaVersions, nativeDimSettings)

/**
* Module that contains protobuf encoders/decoders for the generated
Expand All @@ -803,7 +808,7 @@ lazy val protobuf = projectMatrix
)
else
Seq(
"com.thesamet.scalapb" %%% "protobuf-runtime-scala" % "0.8.14"
"com.thesamet.scalapb" %%% "protobuf-runtime-scala" % "1.0.0-alpha.2"
)
},
Test / fork := virtualAxes.value.contains(VirtualAxis.jvm)
Expand Down Expand Up @@ -979,7 +984,7 @@ lazy val complianceTests = projectMatrix
Dependencies.Http4s.circe.value,
Dependencies.Http4s.client.value,
Dependencies.Pprint.core.value,
Dependencies.Fs2Data.xml.value
// Dependencies.Fs2Data.xml.value
) ++ weaverDeps.value
}
)
Expand Down
4 changes: 2 additions & 2 deletions modules/aws-kernel/src-native/smithy4s/aws/CryptoPlatformCompat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ trait CryptoPlatformCompat {
if (
EVP_Digest(
message.atUnsafe(0),
message.length.toULong,
message.length.toSize.toCSize,
md.atUnsafe(0),
size,
EvpMdSha256,
Expand All @@ -64,7 +64,7 @@ trait CryptoPlatformCompat {
key.atUnsafe(0),
key.size.toInt,
d.atUnsafe(0),
d.length.toULong,
d.length.toSize.toCSize,
md.atUnsafe(0),
mdLen
) == null
Expand Down
24 changes: 12 additions & 12 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ object Dependencies {

val collectionsCompat =
Def.setting(
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.11.0"
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.13.0"
)

val Jsoniter = new {
val org = "com.github.plokhotnyuk.jsoniter-scala"
val jsoniterScalaVersion = "2.30.2"
val jsoniterScalaVersion = "2.37.10"
val core = Def.setting(org %%% "jsoniter-scala-core" % jsoniterScalaVersion)
val macros = Def.setting(
org %%% "jsoniter-scala-macros" % jsoniterScalaVersion % "compile-internal"
Expand Down Expand Up @@ -46,7 +46,7 @@ object Dependencies {

val Cats = new {
val core: Def.Initialize[ModuleID] =
Def.setting("org.typelevel" %%% "cats-core" % "2.11.0")
Def.setting("org.typelevel" %%% "cats-core" % "2.13.0")
}

val Monocle = new {
Expand All @@ -55,21 +55,21 @@ object Dependencies {
}

object Circe {
val circeVersion = "0.14.8"
val circeVersion = "0.14.14"
val core = Def.setting("io.circe" %%% "circe-core" % circeVersion)
val parser = Def.setting("io.circe" %%% "circe-parser" % circeVersion)
val generic = Def.setting("io.circe" %%% "circe-generic" % circeVersion)
}

object Decline {
val declineVersion = "2.4.1"
val declineVersion = "2.5.0"

val core = Def.setting("com.monovore" %%% "decline" % declineVersion)
val effect =
Def.setting("com.monovore" %%% "decline-effect" % declineVersion)
}
object Fs2 {
val fs2Version = "3.12.0"
val fs2Version = "3.13.0-M6"

val core: Def.Initialize[ModuleID] =
Def.setting("co.fs2" %%% "fs2-core" % fs2Version)
Expand All @@ -96,15 +96,15 @@ object Dependencies {
}

object Pprint {
val pprintVersion = "0.8.1"
val pprintVersion = "0.9.3"
val core = Def.setting("com.lihaoyi" %%% "pprint" % pprintVersion)
}

val CatsEffect3: Def.Initialize[ModuleID] =
Def.setting("org.typelevel" %%% "cats-effect" % "3.6.0")
Def.setting("org.typelevel" %%% "cats-effect" % "3.7.0-RC1")

object Http4s {
val http4sVersion = "0.23.30"
val http4sVersion = "0.23.30-161-f5b9629-SNAPSHOT"

val emberServer: Def.Initialize[ModuleID] =
Def.setting("org.http4s" %%% "http4s-ember-server" % http4sVersion)
Expand All @@ -122,7 +122,7 @@ object Dependencies {

object Weaver {

val weaverVersion = "0.10.0"
val weaverVersion = "0.11-b0644b4-SNAPSHOT"

val cats: Def.Initialize[ModuleID] =
Def.setting("org.typelevel" %%% "weaver-cats" % weaverVersion)
Expand All @@ -141,13 +141,13 @@ object Dependencies {
}
object Munit extends MunitCross("0.7.29")
object MunitMilestone extends MunitCross("1.0.0-M6")
object MunitV1 extends MunitCross("1.0.0") {
object MunitV1 extends MunitCross("1.1.0") {
val diff: Def.Initialize[ModuleID] =
Def.setting("org.scalameta" %%% "munit-diff" % munitVersion)
}

val Scalacheck = new {
val scalacheckVersion = "1.17.1"
val scalacheckVersion = "1.18.1"
val scalacheck =
Def.setting("org.scalacheck" %%% "scalacheck" % scalacheckVersion)
}
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1"
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.11.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.13")
Expand All @@ -23,7 +23,7 @@ addSbtPlugin("org.polyvariant" % "smithy-trait-codegen-sbt" % "0.2.3")
libraryDependencies ++= Seq(
"com.lihaoyi" %% "os-lib" % "0.10.7",
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.30.15",
"com.thesamet.scalapb" %% "compilerplugin" % "0.11.15"
"com.thesamet.scalapb" %% "compilerplugin" % "1.0.0-alpha.2"
)

addDependencyTreePlugin
Loading