feature/root #69

Merged
altavir merged 23 commits from feature/root into dev 2021-09-11 19:14:21 +03:00
4 changed files with 15 additions and 13 deletions
Showing only changes of commit a748282d63 - Show all commits

View File

@ -5,6 +5,7 @@ plugins {
}
repositories {
jcenter()
mavenCentral()
maven("https://repo.kotlin.link")
}
@ -15,7 +16,6 @@ dependencies {
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
kotlinOptions {
useIR = true
jvmTarget = ru.mipt.npm.gradle.KScienceVersions.JVM_TARGET.toString()
}
}
@ -29,7 +29,7 @@ tasks.withType<Test> {
}
tasks.processJupyterApiResources {
libraryProducers = listOf("space.kscience.dataforge.playground.VisionForgePlayGroundForJupyter")
libraryProducers = listOf("playground.VisionForgePlayGroundForJupyter")
}
tasks.findByName("shadowJar")?.dependsOn("processJupyterApiResources")

View File

@ -1,4 +1,4 @@
package space.kscience.dataforge.playground
package playground
import kotlinx.html.div
import kotlinx.html.id
@ -24,7 +24,7 @@ import space.kscience.visionforge.visionManager
@JupyterLibrary
@DFExperimental
internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
public class VisionForgePlayGroundForJupyter : JupyterIntegration() {
private val context = Context("VisionForge") {
plugin(Solids)

View File

@ -51,25 +51,25 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation(project(":visionforge-solid"))
implementation(project(":visionforge-gdml"))
implementation(project(":visionforge-plotly"))
implementation(projects.visionforge.visionforgeMarkdown)
api(project(":visionforge-solid"))
api(project(":visionforge-gdml"))
api(project(":visionforge-plotly"))
api(projects.visionforge.visionforgeMarkdown)
}
}
val jsMain by getting{
dependencies {
implementation(project(":ui:ring"))
implementation(project(":visionforge-threejs"))
api(project(":ui:ring"))
api(project(":visionforge-threejs"))
}
}
val jvmMain by getting{
dependencies {
implementation(project(":visionforge-server"))
implementation("ch.qos.logback:logback-classic:1.2.3")
implementation("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
api(project(":visionforge-server"))
api("ch.qos.logback:logback-classic:1.2.3")
api("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
}
}
}

View File

@ -3,5 +3,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.mpp.stability.nowarn=true
kotlin.native.enableDependencyPropagation=false
kotlin.jupyter.add.scanner=false
org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
org.gradle.parallel=true