diff --git a/gradle.properties b/gradle.properties index 2cb4bdbf..dde47c66 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,6 +8,6 @@ org.gradle.jvmargs=-Xmx4G org.jetbrains.compose.experimental.jscanvas.enabled=true -toolsVersion=0.14.9-kotlin-1.9.0-RC-dev-1 +toolsVersion=0.14.9-kotlin-1.9.0 kotlin.experimental.tryK2=true #kscience.wasm.disabled=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae08049..84a0b92f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jupyter/build.gradle.kts b/jupyter/build.gradle.kts index 5808f287..1c32732b 100644 --- a/jupyter/build.gradle.kts +++ b/jupyter/build.gradle.kts @@ -11,7 +11,7 @@ kscience { dependencies { api(projects.visionforgeCore) } - dependencies(jvmMain){ + jvmMain { api(projects.visionforgeServer) } } diff --git a/jupyter/visionforge-jupyter-gdml/build.gradle.kts b/jupyter/visionforge-jupyter-gdml/build.gradle.kts index 5a67459e..65df0c80 100644 --- a/jupyter/visionforge-jupyter-gdml/build.gradle.kts +++ b/jupyter/visionforge-jupyter-gdml/build.gradle.kts @@ -16,16 +16,16 @@ kscience { } } - dependencies{ + commonMain{ implementation(projects.visionforgeSolid) implementation(projects.jupyter) } - dependencies(jvmMain){ + jvmMain{ implementation(projects.visionforgeGdml) } - dependencies(jsMain){ + jsMain{ implementation(projects.visionforgeThreejs) implementation(projects.ui.ring) }