diff --git a/build.sbt b/build.sbt index c3a353bcd9..f1a5c71616 100644 --- a/build.sbt +++ b/build.sbt @@ -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) @@ -60,7 +65,7 @@ lazy val allModules = Seq( docs, millCodegenPlugin, json, - xml, + // xml, bootstrapped, tests, http4s, @@ -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 ) } } @@ -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", @@ -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 @@ -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) @@ -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 } ) diff --git a/modules/aws-kernel/src-native/smithy4s/aws/CryptoPlatformCompat.scala b/modules/aws-kernel/src-native/smithy4s/aws/CryptoPlatformCompat.scala index 9587104626..5f46926358 100644 --- a/modules/aws-kernel/src-native/smithy4s/aws/CryptoPlatformCompat.scala +++ b/modules/aws-kernel/src-native/smithy4s/aws/CryptoPlatformCompat.scala @@ -38,7 +38,7 @@ trait CryptoPlatformCompat { if ( EVP_Digest( message.atUnsafe(0), - message.length.toULong, + message.length.toSize.toCSize, md.atUnsafe(0), size, EvpMdSha256, @@ -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 diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3b9ac0c25c..ee9e8699c5 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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" @@ -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 { @@ -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) @@ -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) @@ -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) @@ -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) } diff --git a/project/plugins.sbt b/project/plugins.sbt index 92589b2280..f4c5b88d65 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") @@ -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