Skip to content

Commit

Permalink
Merge pull request #181 from alexarchambault/updates
Browse files Browse the repository at this point in the history
Updates
  • Loading branch information
alexarchambault authored Apr 21, 2020
2 parents f3ec81a + cc1aa1a commit 89a2c04
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 29 deletions.
23 changes: 4 additions & 19 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ lazy val demo = project
.dependsOn(renderJs)
.settings(
shared,
dontPublish,
skip.in(publish) := true,
plotlyPrefix,
test in Test := (),
testOnly in Test := (),
Expand Down Expand Up @@ -145,7 +145,7 @@ lazy val tests = project
.dependsOn(coreJvm, renderJvm)
.settings(
shared,
dontPublish,
skip.in(publish) := true,
plotlyPrefix,
fetchTestData,
libraryDependencies ++= Seq(
Expand All @@ -162,20 +162,5 @@ lazy val almond = project
libraryDependencies += Deps.almondScalaApi % "provided"
)


lazy val `plotly-scala` = project
.in(file("."))
.aggregate(
coreJvm,
coreJs,
`joda-time`,
renderJvm,
renderJs,
demo,
tests,
almond
)
.settings(
shared,
dontPublish
)
crossScalaVersions := Nil
skip.in(publish) := true,
6 changes: 0 additions & 6 deletions project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,6 @@ object Settings {
}
)

lazy val dontPublish = Seq(
publish := (),
publishLocal := (),
publishArtifact := false
)

lazy val plotlyPrefix = {
name := "plotly-" + name.value
}
Expand Down
8 changes: 4 additions & 4 deletions project/WebDeps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import sbt._
object WebDeps {

object Versions {
def plotlyJs = "1.41.3"
def plotlyJs = "1.52.2"
}

def bootstrap = "org.webjars.bower" % "bootstrap" % "3.3.7"
def jquery = "org.webjars.bower" % "jquery" % "2.2.4"
def bootstrap = "org.webjars.bower" % "bootstrap" % "3.4.0"
def jquery = "org.webjars.bower" % "jquery" % "3.3.1"
def plotlyJs = "org.webjars.bower" % "plotly.js" % Versions.plotlyJs
def prism = "org.webjars.bower" % "prism" % "1.5.1"
def prism = "org.webjars.bower" % "prism" % "1.15.0"

}

0 comments on commit 89a2c04

Please sign in to comment.