Skip to content

Commit 4379666

Browse files
Merge pull request #46 from alexarchambault/topic/deterministic-ids
Deterministic ids
2 parents 922a12d + ae03031 commit 4379666

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ stages:
1616
jobs:
1717
include:
1818
- scala: 2.11.12
19-
- scala: 2.12.7
19+
- scala: 2.12.8
2020
- stage: release
2121
script: sbt ci-release

almond/src/main/scala/plotly/Almond.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ object Almond {
9595
div0
9696
}
9797

98-
def randomDiv() = "plot-" + math.abs(Random.nextInt().toLong)
98+
def randomDiv(): String =
99+
almond.api.helpers.Display.newDiv("plot-")
99100

100101
def plot(
101102
data: Seq[Trace],

project/Deps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object Deps {
77

88
import Def.setting
99

10-
def almondScalaApi = "sh.almond" % "scala-kernel-api" % "0.1.9" cross CrossVersion.full
10+
def almondScalaApi = "sh.almond" % "scala-kernel-api" % "0.2.1" cross CrossVersion.full
1111
def argonautShapeless = setting("com.github.alexarchambault" %%% "argonaut-shapeless_6.2" % "1.2.0-M8")
1212
def jodaTime = "joda-time" % "joda-time" % "2.9.1"
1313
def rhino = "org.mozilla" % "rhino" % "1.7.10"

project/Settings.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ object Settings {
8585
sourceGenerators.in(Compile) += customSourceGenerators.taskValue
8686
)
8787

88-
private val scala212 = "2.12.7"
88+
private val scala212 = "2.12.8"
8989
private val scala211 = "2.11.12"
9090

9191
lazy val shared = Seq(
@@ -99,7 +99,8 @@ object Settings {
9999
},
100100
resolvers ++= Seq(
101101
"Webjars Bintray" at "https://dl.bintray.com/webjars/maven/",
102-
Resolver.sonatypeRepo("releases")
102+
Resolver.sonatypeRepo("releases"),
103+
"jitpack" at "https://jitpack.io"
103104
)
104105
)
105106

0 commit comments

Comments
 (0)