Bump Scala Native, less mem for JVM

armanbilge · armanbilge · commit 4999aedb44e1 · 2023-03-17T16:05:48.000Z
diff --git a/.jvmopts b/.jvmopts
@@ -1,4 +1,4 @@
--Xmx4g
+-Xmx2g
 -Xss4m
 -XX:MaxMetaspaceSize=1g
 -XX:ReservedCodeCacheSize=512m
diff --git a/build.sbt b/build.sbt
@@ -157,8 +157,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
     }.taskValue,
     libraryDependencies ++= Seq(
       "io.github.cquiroz" %%% "scala-java-locales" % scalajavaLocalesVersion
-    ),
-    Test / loadedTestFrameworks := Map.empty // workaround
+    )
   )
 
 lazy val tzdb = crossProject(JVMPlatform, JSPlatform, NativePlatform)
@@ -254,6 +253,5 @@ lazy val demo = crossProject(JSPlatform, JVMPlatform, NativePlatform)
     tzdbPlatform := TzdbPlugin.Platform.Jvm
   )
   .nativeSettings(
-    tzdbPlatform                := TzdbPlugin.Platform.Native,
-    Test / loadedTestFrameworks := Map.empty // workaround
+    tzdbPlatform := TzdbPlugin.Platform.Native
   )
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -8,4 +8,4 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.17")
 
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
 
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.10")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.11")

Original file line number	Diff line number	Diff line change
`@@ -157,8 +157,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)`
`157`	`157`	`}.taskValue,`
`158`	`158`	`libraryDependencies ++= Seq(`
`159`	`159`	`"io.github.cquiroz" %%% "scala-java-locales" % scalajavaLocalesVersion`
`160`		`- ),`
`161`		`- Test / loadedTestFrameworks := Map.empty // workaround`
	`160`	`+ )`
`162`	`161`	`)`
`163`	`162`
`164`	`163`	`lazy val tzdb = crossProject(JVMPlatform, JSPlatform, NativePlatform)`
`@@ -254,6 +253,5 @@ lazy val demo = crossProject(JSPlatform, JVMPlatform, NativePlatform)`
`254`	`253`	`tzdbPlatform := TzdbPlugin.Platform.Jvm`
`255`	`254`	`)`
`256`	`255`	`.nativeSettings(`
`257`		`- tzdbPlatform := TzdbPlugin.Platform.Native,`
`258`		`- Test / loadedTestFrameworks := Map.empty // workaround`
	`256`	`+ tzdbPlatform := TzdbPlugin.Platform.Native`
`259`	`257`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.17")`
`8`	`8`
`9`	`9`	`addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")`
`10`	`10`
`11`		`-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.10")`
	`11`	`+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.11")`