Skip to content

Commit

Permalink
Merge pull request #456 from cquiroz/new-tzdb
Browse files Browse the repository at this point in the history
Use a custom tzdb
  • Loading branch information
cquiroz authored Feb 5, 2018
2 parents 6a65d75 + ef8871b commit f58de67
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
6 changes: 6 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ git.uncommittedSignifier in ThisBuild := Some("UNCOMMITTED")

enablePlugins(GitBranchPrompt)

resolvers in ThisBuild +=
Resolver.sonatypeRepo("snapshots")

//////////////
// Projects
//////////////
Expand Down Expand Up @@ -124,12 +127,15 @@ lazy val edu_gemini_seqexec_web_server = project.in(file("modules/edu.gemini.seq
lazy val edu_gemini_seqexec_web_client = project.in(file("modules/edu.gemini.seqexec.web/edu.gemini.seqexec.web.client"))
.enablePlugins(ScalaJSPlugin)
.enablePlugins(ScalaJSBundlerPlugin)
.enablePlugins(TzdbPlugin)
.enablePlugins(BuildInfoPlugin)
.enablePlugins(AutomateHeaderPlugin)
.enablePlugins(GitBranchPrompt)
.disablePlugins(RevolverPlugin)
.settings(commonJSSettings: _*)
.settings(
wartremoverExcluded += sourceManaged.value / "main" / "java" / "time" / "zone" / "TzdbZoneRulesProvider.scala",
zonesFilter := {(z: String) => z == "America/Santiago" || z == "Pacific/Honolulu"},
// Needed for Monocle macros
addCompilerPlugin(Plugins.paradisePlugin),
webpackBundlingMode := BundlingMode.LibraryOnly(),
Expand Down
2 changes: 1 addition & 1 deletion project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ object Settings {
val scalaCSS = "0.5.4"
val booPickle = "1.2.6"
val diode = "1.1.3"
val javaTimeJS = "2.0.0-M12"
val javaTimeJS = "2.0.0-M13-SNAPSHOT"
val javaLogJS = "0.1.3"
val scalaJQuery = "1.2"
val scalaJSReactVirtualized = "0.0.6"
Expand Down
5 changes: 5 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,10 @@ addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.2.1")
// Use NPM modules rather than webjars
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.10.0")

resolvers +=
Resolver.sonatypeRepo("snapshots")

addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "0.1.0-SNAPSHOT")

// Avoids a warning message when starting sbt-git
libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.21"

0 comments on commit f58de67

Please sign in to comment.