Merge pull request #230 from iRevive/sn-0.5

Update Scala Native to 0.5.8

Author: armanbilge

.github/workflows/ci.yml

@@ -401,5 +401,5 @@ jobs:
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2
         with:
-          modules-ignore: rootjs_3 rootjs_2.12 rootjs_2.13 rootjvm_3 rootjvm_2.12 rootjvm_2.13 rootnative_3 rootnative_2.12 rootnative_2.13 sbt-http4s-org-scalafix-internal_3 sbt-http4s-org-scalafix-internal_2.12 sbt-http4s-org-scalafix-internal_2.13 testruntime_3 testruntime_2.12 testruntime_2.13 testruntime_sjs1_3 testruntime_sjs1_2.12 testruntime_sjs1_2.13 testruntime_native0.4_3 testruntime_native0.4_2.12 testruntime_native0.4_2.13
+          modules-ignore: rootjs_3 rootjs_2.12 rootjs_2.13 rootjvm_3 rootjvm_2.12 rootjvm_2.13 rootnative_3 rootnative_2.12 rootnative_2.13 sbt-http4s-org-scalafix-internal_3 sbt-http4s-org-scalafix-internal_2.12 sbt-http4s-org-scalafix-internal_2.13 testruntime_3 testruntime_2.12 testruntime_2.13 testruntime_sjs1_3 testruntime_sjs1_2.12 testruntime_sjs1_2.13 testruntime_native0.5_3 testruntime_native0.5_2.12 testruntime_native0.5_2.13
           configs-ignore: test scala-tool scala-doc-tool test-internal

build.sbt

@@ -78,12 +78,12 @@ ThisBuild / Test / jsEnv := {
   }
 }
 
-val catsVersion = "2.10.0"
-val catsEffectVersion = "3.5.7"
-val scodecBitsVersion = "1.1.38"
-val munitVersion = "1.0.0-M10"
-val munitCEVersion = "2.0.0-M3"
-val disciplineMUnitVersion = "2.0.0-M3"
+val catsVersion = "2.13.0"
+val catsEffectVersion = "3.7.0-RC1"
+val scodecBitsVersion = "1.2.4"
+val munitVersion = "1.1.0"
+val munitCEVersion = "2.2.0-RC1"
+val disciplineMUnitVersion = "2.0.0"
 
 lazy val root = tlCrossRootProject.aggregate(crypto, testRuntime)
 
@@ -103,7 +103,7 @@ lazy val crypto = crossProject(JSPlatform, JVMPlatform, NativePlatform)
     )
   )
   .nativeSettings(
-    tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "0.2.4").toMap,
+    tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "0.3.0").toMap,
     unusedCompileDependenciesTest := {}
   )
   .dependsOn(testRuntime % Test)

crypto/native/src/main/scala/org/http4s/crypto/HashPlatform.scala

@@ -26,7 +26,7 @@ private[crypto] trait HashCompanionPlatform {
   implicit def forApplicativeThrow[F[_]](implicit F: ApplicativeThrow[F]): Hash[F] =
     new UnsealedHash[F] {
       def digest(algorithm: HashAlgorithm, data: ByteVector): F[ByteVector] =
-        Zone { implicit z =>
+        Zone.acquire { implicit z =>
           import HashAlgorithm._
 
           val name = algorithm match {
@@ -45,7 +45,7 @@ private[crypto] trait HashCompanionPlatform {
 
             if (openssl
                 .evp
-                .EVP_Digest(data.toPtr, data.size.toULong, md, size, `type`, null) == 1)
+                .EVP_Digest(data.toPtr, data.size.toUSize, md, size, `type`, null) == 1)
               F.pure(ByteVector.fromPtr(md.asInstanceOf[Ptr[Byte]], (!size).toLong))
             else
               F.raiseError(new GeneralSecurityException("EVP_DIGEST"))

crypto/native/src/main/scala/org/http4s/crypto/HmacKeyGenPlatform.scala

@@ -20,15 +20,14 @@ import cats.effect.kernel.Sync
 import scodec.bits.ByteVector
 
 import scala.scalanative.unsafe._
-import scala.scalanative.unsigned._
 
 private[crypto] trait HmacKeyGenCompanionPlatform {
   implicit def forSync[F[_]](implicit F: Sync[F]): HmacKeyGen[F] =
     new UnsealedHmacKeyGen[F] {
       def generateKey[A <: HmacAlgorithm](algorithm: A): F[SecretKey[A]] =
         F.delay {
           val len = algorithm.minimumKeyLength
-          val buf = stackalloc[Byte](len.toLong.toULong)
+          val buf = stackalloc[Byte](len)
           if (openssl.rand.RAND_bytes(buf, len) != 1)
             throw new GeneralSecurityException("RAND_bytes")
           SecretKeySpec(ByteVector.fromPtr(buf, len.toLong), algorithm)

crypto/native/src/main/scala/org/http4s/crypto/HmacPlatform.scala

@@ -29,7 +29,7 @@ private[crypto] trait HmacCompanionPlatform {
     new UnsealedHmac[F] {
 
       def digest(key: SecretKey[HmacAlgorithm], data: ByteVector): F[ByteVector] =
-        Zone { implicit z =>
+        Zone.acquire { implicit z =>
           import HmacAlgorithm._
 
           key match {
@@ -54,7 +54,7 @@ private[crypto] trait HmacCompanionPlatform {
                       keyBytes.toPtr,
                       keyBytes.size.toInt,
                       data.toPtr.asInstanceOf[Ptr[CUnsignedChar]],
-                      data.size.toULong,
+                      data.size.toCSize,
                       md,
                       mdLen) != null)
                   F.pure(ByteVector.fromPtr(md.asInstanceOf[Ptr[Byte]], (!mdLen).toLong))

project/plugins.sbt

@@ -1,6 +1,6 @@
 libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
 
 addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.0")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")