Skip to content

Commit 89a2c04

Browse files
Merge pull request #181 from alexarchambault/updates
Updates
2 parents f3ec81a + cc1aa1a commit 89a2c04

File tree

3 files changed

+8
-29
lines changed

3 files changed

+8
-29
lines changed

build.sbt

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ lazy val demo = project
9999
.dependsOn(renderJs)
100100
.settings(
101101
shared,
102-
dontPublish,
102+
skip.in(publish) := true,
103103
plotlyPrefix,
104104
test in Test := (),
105105
testOnly in Test := (),
@@ -145,7 +145,7 @@ lazy val tests = project
145145
.dependsOn(coreJvm, renderJvm)
146146
.settings(
147147
shared,
148-
dontPublish,
148+
skip.in(publish) := true,
149149
plotlyPrefix,
150150
fetchTestData,
151151
libraryDependencies ++= Seq(
@@ -162,20 +162,5 @@ lazy val almond = project
162162
libraryDependencies += Deps.almondScalaApi % "provided"
163163
)
164164

165-
166-
lazy val `plotly-scala` = project
167-
.in(file("."))
168-
.aggregate(
169-
coreJvm,
170-
coreJs,
171-
`joda-time`,
172-
renderJvm,
173-
renderJs,
174-
demo,
175-
tests,
176-
almond
177-
)
178-
.settings(
179-
shared,
180-
dontPublish
181-
)
165+
crossScalaVersions := Nil
166+
skip.in(publish) := true,

project/Settings.scala

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,6 @@ object Settings {
113113
}
114114
)
115115

116-
lazy val dontPublish = Seq(
117-
publish := (),
118-
publishLocal := (),
119-
publishArtifact := false
120-
)
121-
122116
lazy val plotlyPrefix = {
123117
name := "plotly-" + name.value
124118
}

project/WebDeps.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import sbt._
44
object WebDeps {
55

66
object Versions {
7-
def plotlyJs = "1.41.3"
7+
def plotlyJs = "1.52.2"
88
}
99

10-
def bootstrap = "org.webjars.bower" % "bootstrap" % "3.3.7"
11-
def jquery = "org.webjars.bower" % "jquery" % "2.2.4"
10+
def bootstrap = "org.webjars.bower" % "bootstrap" % "3.4.0"
11+
def jquery = "org.webjars.bower" % "jquery" % "3.3.1"
1212
def plotlyJs = "org.webjars.bower" % "plotly.js" % Versions.plotlyJs
13-
def prism = "org.webjars.bower" % "prism" % "1.5.1"
13+
def prism = "org.webjars.bower" % "prism" % "1.15.0"
1414

1515
}

0 commit comments

Comments
 (0)