Skip to content

Commit ebf78c6

Browse files
authored
Merge pull request #405 from armanbilge/topic/fix-ci
Try fixing CI
2 parents 97d80b0 + f4fe21e commit ebf78c6

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

.jvmopts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-Xmx4g
2-
-Xss2m
2+
-Xss4m
33
-XX:MaxMetaspaceSize=1g
44
-XX:ReservedCodeCacheSize=512m
55
-XX:+UseParallelGC

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,17 @@ lazy val tzdb = crossProject(JVMPlatform, JSPlatform, NativePlatform)
214214
.settings(commonSettings)
215215
.settings(
216216
name := "scala-java-time-tzdb",
217-
includeTTBP := true
217+
includeTTBP := true,
218+
dbVersion := TzdbPlugin.Version(tzdbVersion)
218219
)
219220
.jsSettings(
220-
dbVersion := TzdbPlugin.Version(tzdbVersion),
221221
Compile / sourceGenerators += Def.task {
222222
val srcDirs = (Compile / sourceManaged).value
223223
val destinationDir = (Compile / sourceManaged).value
224224
copyAndReplace(Seq(srcDirs), destinationDir)
225225
}.taskValue
226226
)
227227
.nativeSettings(
228-
dbVersion := TzdbPlugin.Version(tzdbVersion),
229228
tzdbPlatform := TzdbPlugin.Platform.Native,
230229
Compile / sourceGenerators += Def.task {
231230
val srcDirs = (Compile / sourceManaged).value
@@ -300,7 +299,8 @@ lazy val demo = crossProject(JSPlatform, JVMPlatform, NativePlatform)
300299
name := "demo",
301300
publish / skip := true,
302301
Keys.`package` := file(""),
303-
zonesFilter := zonesFilterFn
302+
zonesFilter := zonesFilterFn,
303+
dbVersion := TzdbPlugin.Version(tzdbVersion)
304304
)
305305
.jsSettings(
306306
// scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.ESModule) },

project/plugins.sbt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4")
2-
31
val scalaJSVersion =
42
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.10.1")
53

@@ -9,7 +7,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
97

108
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
119

12-
addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "3.0.0")
10+
addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "4.0.0")
1311

1412
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
1513

0 commit comments

Comments
 (0)