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

cquiroz · Jun 6, 2024 · a19e09a · a19e09a
2 parents db787b1 + 5a5adf3
commit a19e09a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,6 +26,7 @@ jobs:
   build:
     name: Build and Test
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest]
         scala: [2.12, 2.13, 3]
@@ -252,5 +253,5 @@ jobs:
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2
         with:
-          modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 tests_sjs1_2.12 tests_sjs1_2.13 tests_sjs1_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3 demo_2.12 demo_2.13 demo_3 tests_2.12 tests_2.13 tests_3 demo_native0.4_2.12 demo_native0.4_2.13 demo_native0.4_3 tests_native0.4_2.12 tests_native0.4_2.13 tests_native0.4_3 demo_sjs1_2.12 demo_sjs1_2.13 demo_sjs1_3
+          modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 tests_sjs1_2.12 tests_sjs1_2.13 tests_sjs1_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3 demo_2.12 demo_2.13 demo_3 tests_2.12 tests_2.13 tests_3 demo_native0.5_2.12 demo_native0.5_2.13 demo_native0.5_3 tests_native0.5_2.12 tests_native0.5_2.13 tests_native0.5_3 demo_sjs1_2.12 demo_sjs1_2.13 demo_sjs1_3
           configs-ignore: test scala-tool scala-doc-tool test-internal
diff --git a/.jvmopts b/.jvmopts
@@ -1,6 +1,4 @@
 -Xmx4g
 -Xss4m
--XX:MaxMetaspaceSize=1g
--XX:ReservedCodeCacheSize=512m
--XX:+UseParallelGC
 -Dfile.encoding=UTF8
+-XX:+PrintCommandLineFlags
diff --git a/build.sbt b/build.sbt
@@ -5,6 +5,8 @@ ThisBuild / crossScalaVersions := Seq("2.12.17", scala213, scala3)
 
 ThisBuild / tlBaseVersion := "2.5"
 
+ThisBuild / githubWorkflowBuildMatrixFailFast := Some(false)
+
 val javaDistro = JavaSpec.corretto("11")
 ThisBuild / githubWorkflowJavaVersions := Seq(javaDistro)
 
@@ -23,7 +25,7 @@ ThisBuild / githubWorkflowBuildMatrixInclusions +=
   )
 
 val tzdbVersion             = "2019c"
-val scalajavaLocalesVersion = "1.5.1"
+val scalajavaLocalesVersion = "1.5.4"
 Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val downloadFromZip: TaskKey[Unit] =
@@ -142,7 +144,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .settings(commonSettings)
   .settings(
     name := "scala-java-time",
-    libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.2")
+    libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.3")
       .cross(CrossVersion.for3Use2_13)
   )
   .jsSettings(
@@ -160,6 +162,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
     )
   )
   .nativeSettings(
+    scalacOptions += "-P:scalanative:genStaticForwardersForNonTopLevelObjects",
     Compile / sourceGenerators += Def.task {
       val srcDirs        = (Compile / sourceDirectories).value
       val destinationDir = (Compile / sourceManaged).value
@@ -175,9 +178,9 @@ lazy val tzdb = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .in(file("tzdb"))
   .settings(commonSettings)
   .settings(
-    name            := "scala-java-time-tzdb",
-    includeTTBP     := true,
-    dbVersion       := TzdbPlugin.Version(tzdbVersion),
+    name        := "scala-java-time-tzdb",
+    includeTTBP := true,
+    dbVersion   := TzdbPlugin.Version(tzdbVersion)
   )
   .jsSettings(
     Compile / sourceGenerators += Def.task {
@@ -209,7 +212,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
     name               := "tests",
     Keys.`package`     := file(""),
     libraryDependencies +=
-      "org.scalatest" %%% "scalatest" % "3.2.14" % Test,
+      "org.scalatest" %%% "scalatest" % "3.2.18" % Test,
     scalacOptions ~= (_.filterNot(
       Set("-Wnumeric-widen", "-Ywarn-numeric-widen", "-Ywarn-value-discard", "-Wvalue-discard")
     ))
@@ -246,12 +249,12 @@ lazy val demo = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .dependsOn(core)
   .enablePlugins(TzdbPlugin, NoPublishPlugin)
   .settings(
-    name            := "demo",
-    Keys.`package`  := file(""),
-    zonesFilter     := zonesFilterFn,
-    dbVersion       := TzdbPlugin.Version(tzdbVersion),
+    name           := "demo",
+    Keys.`package` := file(""),
+    zonesFilter    := zonesFilterFn,
+    dbVersion      := TzdbPlugin.Version(tzdbVersion),
     // delegate test to run, so that it is invoked during test step in ci
-    Test / test     := (Compile / run).toTask("").value
+    Test / test    := (Compile / run).toTask("").value
   )
   .jsSettings(
     scalaJSUseMainModuleInitializer := true

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -8,4 +8,4 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.1")
 
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.3")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.1")

		addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

		addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
		addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.3")