Merge pull request #335 from sideeffffect/scala-native-0.5.x

Scala Native 0.5.x
cquiroz · May 31, 2024 · 31a1940 · 31a1940
2 parents 4e5e78a + bcb48b8
commit 31a1940
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/build.sbt b/build.sbt
@@ -45,7 +45,7 @@ lazy val api = crossProject(JSPlatform, JVMPlatform, NativePlatform)
     description := "scala-java-locales cldrl api",
     crossScalaVersions := Seq(scalaVersion212, "2.13.14", "3.3.3"),
     libraryDependencies ++= List(
-      ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.2").cross(CrossVersion.for3Use2_13),
+      ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.3").cross(CrossVersion.for3Use2_13),
       "org.scalameta"       %%% "munit"                  % "1.0.0-RC1" % Test
     ),
     testFrameworks += new TestFramework("munit.Framework")

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -7,7 +7,7 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
 
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
 
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 

diff --git a/sbt-locales/src/main/scala/locales/LocalesPlugin.scala b/sbt-locales/src/main/scala/locales/LocalesPlugin.scala
@@ -60,7 +60,7 @@ object LocalesPlugin extends AutoPlugin {
             }
           cachedActionFunction.apply(Set(coreZip)).toSeq
         }.value,
-        libraryDependencies += "org.portable-scala" %% "portable-scala-reflect" % "1.1.1"
+        libraryDependencies += "org.portable-scala" %% "portable-scala-reflect" % "1.1.3"
       )
   }
 

diff --git a/sbt-locales/src/sbt-test/sbt-locales/common-filtering/build.sbt b/sbt-locales/src/sbt-test/sbt-locales/common-filtering/build.sbt
@@ -8,11 +8,12 @@ lazy val root =
     .settings(
       name := "no-filtering",
       cldrVersion := CLDRVersion.Version("38.1"),
-      scalaVersion := "3.4.1",
+      scalaVersion := "3.3.3",
       localesFilter := LocalesFilter.Selection("en-US", "fi", "fi-FI"),
       nsFilter := NumberingSystemFilter.Minimal,
       currencyFilter := CurrencyFilter.Selection("EUR"),
       supportISOCodes := true,
       supportNumberFormats := true,
-      libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.2").cross(CrossVersion.for3Use2_13)
+      libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.3")
+        .cross(CrossVersion.for3Use2_13)
     )
diff --git a/sbt-locales/src/sbt-test/sbt-locales/common-filtering/test b/sbt-locales/src/sbt-test/sbt-locales/common-filtering/test
@@ -1,3 +1,3 @@
 > managedSources
-$ exec cat jvm/target/scala-3.4.1/src_managed/main/locales/cldr/data/data.scala
+$ exec cat jvm/target/scala-3.3.3/src_managed/main/locales/cldr/data/data.scala
 > compile
diff --git a/sbt-locales/src/sbt-test/sbt-locales/no-filtering/build.sbt b/sbt-locales/src/sbt-test/sbt-locales/no-filtering/build.sbt
@@ -12,5 +12,5 @@ lazy val root =
       localesFilter := LocalesFilter.All,
       nsFilter := NumberingSystemFilter.All,
       calendarFilter := CalendarFilter.All,
-      libraryDependencies += "org.portable-scala" %%% "portable-scala-reflect" % "1.1.2"
+      libraryDependencies += "org.portable-scala" %%% "portable-scala-reflect" % "1.1.3"
     )