From f21052e2ff35c2e876a56cc4083080de5816e6c2 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 9 Nov 2022 01:44:01 +0000 Subject: [PATCH 1/3] Try fixing CI --- build.sbt | 5 ++--- project/plugins.sbt | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 5992277f5..a995730f8 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 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") From ab1372fed5c366d4b1349530a8e33be66107fdbe Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 9 Nov 2022 02:36:53 +0000 Subject: [PATCH 2/3] More fixing --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a995730f8..cd57a59cd 100644 --- a/build.sbt +++ b/build.sbt @@ -299,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) }, From f4fe21ed0153af5b1e6c3167a4a5993c02cb5036 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 8 Nov 2022 20:00:31 -0800 Subject: [PATCH 3/3] More stack --- .jvmopts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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