diff --git a/gradle.properties b/gradle.properties index e3a218ba..f38299f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,5 +6,5 @@ kotlin.incremental.js.ir=true org.gradle.parallel=true org.gradle.jvmargs=-Xmx4G -toolsVersion=0.14.9-kotlin-1.8.20 +toolsVersion=0.14.9-kotlin-1.9.0-Beta org.jetbrains.compose.experimental.jscanvas.enabled=true \ No newline at end of file diff --git a/ui/bootstrap/build.gradle.kts b/ui/bootstrap/build.gradle.kts index c0b980d9..f50ae119 100644 --- a/ui/bootstrap/build.gradle.kts +++ b/ui/bootstrap/build.gradle.kts @@ -1,15 +1,19 @@ plugins { - kotlin("js") - id("space.kscience.gradle.js") + id("space.kscience.gradle.mpp") } val dataforgeVersion: String by rootProject.extra -dependencies { - api(project(":visionforge-solid")) - api(project(":ui:react")) - implementation(npm("file-saver", "2.0.2")) - implementation(npm("bootstrap","4.6.0")) - implementation(npm("jquery","3.5.1")) - implementation(npm("popper.js","1.16.1")) +kscience{ + js() + jsMain{ + dependencies { + api(project(":visionforge-solid")) + api(project(":ui:react")) + implementation(npm("file-saver", "2.0.2")) + implementation(npm("bootstrap","4.6.0")) + implementation(npm("jquery","3.5.1")) + implementation(npm("popper.js","1.16.1")) + } + } } \ No newline at end of file diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts index f04275f3..41714618 100644 --- a/visionforge-threejs/build.gradle.kts +++ b/visionforge-threejs/build.gradle.kts @@ -1,17 +1,23 @@ plugins { - id("space.kscience.gradle.js") + id("space.kscience.gradle.mpp") } kotlin{ explicitApi = org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode.Disabled +} + +kscience{ js{ binaries.library() } + jsMain{ + dependencies { + api(projects.visionforgeSolid) + implementation(npm("three", "0.143.0")) + implementation(npm("three-csg-ts", "3.1.10")) + implementation(npm("three.meshline","1.4.0")) + } + } } -dependencies { - api(projects.visionforgeSolid) - implementation(npm("three", "0.143.0")) - implementation(npm("three-csg-ts", "3.1.10")) - implementation(npm("three.meshline","1.4.0")) -} +