From 5783cf14300249f4d52599af25754178cfbbfdca Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Thu, 20 Jul 2023 08:58:41 +0300 Subject: [PATCH] Work-around for strange dependency resolution in notebooks --- demo/playground/notebooks/common-demo.ipynb | 34 ++++++++++++++++----- visionforge-jupyter/build.gradle.kts | 4 ++- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/demo/playground/notebooks/common-demo.ipynb b/demo/playground/notebooks/common-demo.ipynb index 2c397a15..165acf2d 100644 --- a/demo/playground/notebooks/common-demo.ipynb +++ b/demo/playground/notebooks/common-demo.ipynb @@ -1,5 +1,16 @@ { "cells": [ + { + "cell_type": "code", + "execution_count": null, + "outputs": [], + "source": [ + "//SessionOptions.resolveMpp = true" + ], + "metadata": { + "collapsed": false + } + }, { "cell_type": "code", "execution_count": null, @@ -10,9 +21,9 @@ "@file:Repository(\"https://repo.kotlin.link\")\n", "@file:Repository(\"https://maven.pkg.jetbrains.space/spc/p/sci/dev\")\n", "@file:DependsOn(\"space.kscience:visionforge-jupyter-common-jvm:0.3.0-dev-11\")\n", - "@file:DependsOn(\"io.ktor:ktor-server-cio-jvm:2.3.0\")\n", - "@file:DependsOn(\"io.ktor:ktor-server-websockets-jvm:2.3.0\")\n", - "@file:DependsOn(\"io.ktor:ktor-server-cors-jvm:2.3.0\")" + "//@file:DependsOn(\"io.ktor:ktor-server-cio-jvm:2.3.0\")\n", + "//@file:DependsOn(\"io.ktor:ktor-server-websockets-jvm:2.3.0\")\n", + "//@file:DependsOn(\"io.ktor:ktor-server-cors-jvm:2.3.0\")" ] }, { @@ -26,10 +37,6 @@ }, "outputs": [], "source": [ - "import io.ktor.server.cio.CIO\n", - "\n", - "println(CIO)\n", - "\n", "vf.startServer()" ] }, @@ -82,7 +89,18 @@ } }, "outputs": [], - "source": [] + "source": [ + "vf.stopServer()" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "outputs": [], + "source": [], + "metadata": { + "collapsed": false + } } ], "metadata": { diff --git a/visionforge-jupyter/build.gradle.kts b/visionforge-jupyter/build.gradle.kts index ed4ab76d..49943631 100644 --- a/visionforge-jupyter/build.gradle.kts +++ b/visionforge-jupyter/build.gradle.kts @@ -13,7 +13,9 @@ kscience { api(projects.visionforgeCore) } dependencies(jvmMain){ - api("io.ktor:ktor-server-cio") + api("io.ktor:ktor-server-cio-jvm") + api("io.ktor:ktor-server-websockets-jvm") + api("io.ktor:ktor-server-cors-jvm") api(projects.visionforgeServer) } }