From 232982a8d02788e8aec98e130046cbdea6e3d386 Mon Sep 17 00:00:00 2001 From: Igor Alshannikov Date: Wed, 1 Jul 2020 17:12:39 -0400 Subject: [PATCH 1/2] Upgrade Lets-Plot Kotlin API to v. 0.0.22-SNAPSHOT --- libraries/lets-plot.json | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libraries/lets-plot.json b/libraries/lets-plot.json index 911bf82c6..95f3c6af4 100644 --- a/libraries/lets-plot.json +++ b/libraries/lets-plot.json @@ -1,7 +1,7 @@ { "properties": { - "libraryVersion": "1.4.2", - "apiVersion": "0.0.18-SNAPSHOT", + "api": "0.0.22-SNAPSHOT", + "js": "1.4.2", "isolatedFrame": "" }, "link": "https://github.com/JetBrains/lets-plot-kotlin", @@ -9,19 +9,22 @@ "https://jetbrains.bintray.com/lets-plot-maven" ], "dependencies": [ - "org.jetbrains.lets-plot:lets-plot-kotlin-api:$apiVersion" + "org.jetbrains.lets-plot:lets-plot-kotlin-api:$api" ], "imports": [ "jetbrains.letsPlot.*", "jetbrains.letsPlot.geom.*", - "jetbrains.letsPlot.stat.*" + "jetbrains.letsPlot.stat.*", + "jetbrains.letsPlot.label.*", + "jetbrains.letsPlot.scale.*", + "jetbrains.letsPlot.facet.*" ], "init": [ "import jetbrains.letsPlot.LetsPlot", "import jetbrains.letsPlot.frontend.NotebookFrontendContext", "val isolatedFrameParam = if(\"$isolatedFrame\".isNotEmpty()) \"$isolatedFrame\".toBoolean() else null", - "val frontendContext = LetsPlot.setupNotebook(\"$libraryVersion\", isolatedFrameParam) {DISPLAY(HTML(it))}", - "LetsPlot.apiVersion = \"$apiVersion\"", + "val frontendContext = LetsPlot.setupNotebook(\"$js\", isolatedFrameParam) {DISPLAY(HTML(it))}", + "LetsPlot.apiVersion = \"$api\"", "// Load library JS", "DISPLAY(HTML(frontendContext.getConfigureHtml()))" ], From 5203a4a686e8b3ec2b7fcaf85259f2966f6adc07 Mon Sep 17 00:00:00 2001 From: Igor Alshannikov Date: Wed, 5 Aug 2020 11:35:34 -0400 Subject: [PATCH 2/2] Update to Lets-Plot to 1.5.1-SNAPSHOT. Add 'image export'. --- libraries/lets-plot.json | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libraries/lets-plot.json b/libraries/lets-plot.json index 95f3c6af4..d594b19c9 100644 --- a/libraries/lets-plot.json +++ b/libraries/lets-plot.json @@ -1,7 +1,8 @@ { "properties": { - "api": "0.0.22-SNAPSHOT", - "js": "1.4.2", + "api": "0.0.26-SNAPSHOT", + "lib": "1.5.1-SNAPSHOT", + "js": "1.5.0", "isolatedFrame": "" }, "link": "https://github.com/JetBrains/lets-plot-kotlin", @@ -9,7 +10,9 @@ "https://jetbrains.bintray.com/lets-plot-maven" ], "dependencies": [ - "org.jetbrains.lets-plot:lets-plot-kotlin-api:$api" + "org.jetbrains.lets-plot:lets-plot-kotlin-api-kernel:$api", + "org.jetbrains.lets-plot:lets-plot-common:$lib", + "org.jetbrains.lets-plot:lets-plot-image-export:$lib" ], "imports": [ "jetbrains.letsPlot.*", @@ -17,7 +20,9 @@ "jetbrains.letsPlot.stat.*", "jetbrains.letsPlot.label.*", "jetbrains.letsPlot.scale.*", - "jetbrains.letsPlot.facet.*" + "jetbrains.letsPlot.facet.*", + "jetbrains.letsPlot.sampling.*", + "jetbrains.letsPlot.export.*" ], "init": [ "import jetbrains.letsPlot.LetsPlot",