From 4fc7b91bec992c8d457a7b9420d56f5a55831632 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Mon, 8 Jul 2019 22:25:08 +0300 Subject: [PATCH] Minor build fix --- dataforge-vis-jsroot/build.gradle.kts | 4 +++- dataforge-vis-spatial-js/build.gradle.kts | 4 ++-- .../kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoApp.kt | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dataforge-vis-jsroot/build.gradle.kts b/dataforge-vis-jsroot/build.gradle.kts index 0129a2cf..4cc5e20d 100644 --- a/dataforge-vis-jsroot/build.gradle.kts +++ b/dataforge-vis-jsroot/build.gradle.kts @@ -13,7 +13,6 @@ val kotlinVersion: String by rootProject.extra dependencies { implementation(project(":dataforge-vis-spatial-js")) - implementation("info.laht.threekt:threejs-wrapper:0.106-npm-2") testCompile(kotlin("test-js")) } @@ -22,6 +21,9 @@ configure { configure { dependency("three","0.106.2") + dependency("@hi-level/three-csg") + dependency("style-loader") + dependency("element-resize-event") devDependency("karma") } diff --git a/dataforge-vis-spatial-js/build.gradle.kts b/dataforge-vis-spatial-js/build.gradle.kts index 68be367d..6e008e34 100644 --- a/dataforge-vis-spatial-js/build.gradle.kts +++ b/dataforge-vis-spatial-js/build.gradle.kts @@ -12,8 +12,8 @@ plugins { val kotlinVersion: String by rootProject.extra dependencies { - implementation(project(":dataforge-vis-spatial")) - implementation("info.laht.threekt:threejs-wrapper:0.106-npm-2") + api(project(":dataforge-vis-spatial")) + api("info.laht.threekt:threejs-wrapper:0.106-npm-2") testCompile(kotlin("test-js")) } diff --git a/dataforge-vis-spatial-js/src/main/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoApp.kt b/dataforge-vis-spatial-js/src/main/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoApp.kt index b3397b16..77759c74 100644 --- a/dataforge-vis-spatial-js/src/main/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoApp.kt +++ b/dataforge-vis-spatial-js/src/main/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoApp.kt @@ -3,6 +3,7 @@ package hep.dataforge.vis.spatial.demo import hep.dataforge.context.ContextBuilder import hep.dataforge.meta.number import hep.dataforge.vis.common.Colors +import hep.dataforge.vis.common.color import hep.dataforge.vis.spatial.* import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay