diff --git a/.jvmopts b/.jvmopts index 26e6a558b..e24c9fe86 100644 --- a/.jvmopts +++ b/.jvmopts @@ -1,5 +1,5 @@ -Xmx4g --Xss2m +-Xss4m -XX:MaxMetaspaceSize=1g -XX:ReservedCodeCacheSize=512m -XX:+UseParallelGC diff --git a/build.sbt b/build.sbt index 5992277f5..cd57a59cd 100644 --- a/build.sbt +++ b/build.sbt @@ -214,10 +214,10 @@ lazy val tzdb = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings(commonSettings) .settings( name := "scala-java-time-tzdb", - includeTTBP := true + includeTTBP := true, + dbVersion := TzdbPlugin.Version(tzdbVersion) ) .jsSettings( - dbVersion := TzdbPlugin.Version(tzdbVersion), Compile / sourceGenerators += Def.task { val srcDirs = (Compile / sourceManaged).value val destinationDir = (Compile / sourceManaged).value @@ -225,7 +225,6 @@ lazy val tzdb = crossProject(JVMPlatform, JSPlatform, NativePlatform) }.taskValue ) .nativeSettings( - dbVersion := TzdbPlugin.Version(tzdbVersion), tzdbPlatform := TzdbPlugin.Platform.Native, Compile / sourceGenerators += Def.task { val srcDirs = (Compile / sourceManaged).value @@ -300,7 +299,8 @@ lazy val demo = crossProject(JSPlatform, JVMPlatform, NativePlatform) name := "demo", publish / skip := true, Keys.`package` := file(""), - zonesFilter := zonesFilterFn + zonesFilter := zonesFilterFn, + dbVersion := TzdbPlugin.Version(tzdbVersion) ) .jsSettings( // scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.ESModule) }, diff --git a/project/plugins.sbt b/project/plugins.sbt index 36ad003da..eb0ce4c96 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,3 @@ -addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4") - val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.10.1") @@ -9,7 +7,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0") -addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "3.0.0") +addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "4.0.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")