From 040e4dd8f2d4f56b896d5e0b560ad711a76d0c77 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 21 Apr 2020 18:21:31 +0200 Subject: [PATCH 1/6] Update plotly.js to 1.52.2 --- project/WebDeps.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/WebDeps.scala b/project/WebDeps.scala index f42630b..6cb8156 100644 --- a/project/WebDeps.scala +++ b/project/WebDeps.scala @@ -4,7 +4,7 @@ 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" From ccaa176c0382fb78a05caf4551ca574a65a9a2d2 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 21 Apr 2020 18:24:27 +0200 Subject: [PATCH 2/6] Update bootstrap to 3.4.0 --- project/WebDeps.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/WebDeps.scala b/project/WebDeps.scala index 6cb8156..b91dd89 100644 --- a/project/WebDeps.scala +++ b/project/WebDeps.scala @@ -7,7 +7,7 @@ object WebDeps { def plotlyJs = "1.52.2" } - def bootstrap = "org.webjars.bower" % "bootstrap" % "3.3.7" + def bootstrap = "org.webjars.bower" % "bootstrap" % "3.4.0" def jquery = "org.webjars.bower" % "jquery" % "2.2.4" def plotlyJs = "org.webjars.bower" % "plotly.js" % Versions.plotlyJs def prism = "org.webjars.bower" % "prism" % "1.5.1" From 356c8244b5e41ee132714408b818e9c71809f844 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 21 Apr 2020 18:26:34 +0200 Subject: [PATCH 3/6] Update jquery to 3.3.1 --- project/WebDeps.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/WebDeps.scala b/project/WebDeps.scala index b91dd89..6f531c5 100644 --- a/project/WebDeps.scala +++ b/project/WebDeps.scala @@ -8,7 +8,7 @@ object WebDeps { } def bootstrap = "org.webjars.bower" % "bootstrap" % "3.4.0" - def jquery = "org.webjars.bower" % "jquery" % "2.2.4" + 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" From ef02a2397793c26b0c270b5e70ee732df4cc6793 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 21 Apr 2020 18:28:43 +0200 Subject: [PATCH 4/6] Update prism to 1.15.0 --- project/WebDeps.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/WebDeps.scala b/project/WebDeps.scala index 6f531c5..881108e 100644 --- a/project/WebDeps.scala +++ b/project/WebDeps.scala @@ -10,6 +10,6 @@ object WebDeps { 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" } From 9dee5ce2c2dcf68efd40d84e5ab9dcec8ccf049b Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 21 Apr 2020 18:31:08 +0200 Subject: [PATCH 5/6] Clean-up build settings --- build.sbt | 6 +++--- project/Settings.scala | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index 2676edc..95305bb 100644 --- a/build.sbt +++ b/build.sbt @@ -99,7 +99,7 @@ lazy val demo = project .dependsOn(renderJs) .settings( shared, - dontPublish, + skip.in(publish) := true, plotlyPrefix, test in Test := (), testOnly in Test := (), @@ -145,7 +145,7 @@ lazy val tests = project .dependsOn(coreJvm, renderJvm) .settings( shared, - dontPublish, + skip.in(publish) := true, plotlyPrefix, fetchTestData, libraryDependencies ++= Seq( @@ -177,5 +177,5 @@ lazy val `plotly-scala` = project ) .settings( shared, - dontPublish + skip.in(publish) := true, ) diff --git a/project/Settings.scala b/project/Settings.scala index 4a65ce7..2a539f5 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -113,12 +113,6 @@ object Settings { } ) - lazy val dontPublish = Seq( - publish := (), - publishLocal := (), - publishArtifact := false - ) - lazy val plotlyPrefix = { name := "plotly-" + name.value } From cc1aa1aaf33a931ba5b16c5c72e3efcb42381efe Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 21 Apr 2020 18:31:54 +0200 Subject: [PATCH 6/6] Remove unnecessary root project --- build.sbt | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/build.sbt b/build.sbt index 95305bb..f1a3311 100644 --- a/build.sbt +++ b/build.sbt @@ -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, - skip.in(publish) := true, - ) +crossScalaVersions := Nil +skip.in(publish) := true,