[orx-jvm] Move panel, gui, dnk3, keyframer, triangulation to orx-jvm

build.gradle

@@ -12,20 +12,22 @@ buildscript {
 
 plugins {
     // remember to update all the versions here when upgrading kotlin version
-    id 'org.jetbrains.kotlin.jvm' version '1.5.10' apply false
+    id 'org.jetbrains.kotlin.jvm' version '1.5.20' apply false
-    id 'org.jetbrains.kotlin.multiplatform' version '1.5.10' apply false
+    id 'org.jetbrains.kotlin.multiplatform' version '1.5.20' apply false
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.5.10' apply false
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.5.20' apply false
 }
 
 def multiplatformModules = [
     "orx-noise",
-    "orx-shader-phrases"
+    "orx-shader-phrases",
+    "orx-parameters",
+    "orx-fx",
 ]
 
 project.ext {
     kotlinApiVersion = '1.4'
     kotlinLanguageVersion = '1.4'
-    kotlinVersion = '1.5.10'
+    kotlinVersion = '1.5.20'
     kotlinLoggingVersion = '2.0.8'
     kotlinxSerializationVersion = '1.1.0'
     spekVersion = '2.0.15'
@@ -44,7 +46,7 @@ ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 project.ext {
     openrndrVersion = openrndrUseSnapshot? "0.5.1-SNAPSHOT" : "0.4.0"
     jvmTarget = "1.8"
-    kotlinVersion = "1.5.10"
+    kotlinVersion = "1.5.20"
     kotlinApiVersion = "1.4"
     spekVersion = "2.0.15"
     libfreenectVersion = "0.5.7-1.5.5"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

openrndr-demos/build.gradle

@@ -13,7 +13,7 @@ dependencies {
     demoImplementation(project(":orx-camera"))
     demoImplementation(project(":orx-parameters"))
     demoImplementation(project(":orx-noise"))
-    demoImplementation(project(":orx-gui"))
+    demoImplementation(project(":orx-jvm:orx-gui"))
     demoImplementation(project(":orx-shader-phrases"))
     demoImplementation("org.slf4j:slf4j-simple:1.7.30")
 

orx-jumpflood/build.gradle

@@ -10,8 +10,9 @@ sourceSets {
 
 dependencies {
     implementation project(":orx-fx")
+    implementation project(":orx-parameters")
     demoImplementation project(":orx-noise")
-    demoImplementation project(":orx-gui")
+    demoImplementation project(":orx-jvm:orx-gui")
     demoImplementation project(":orx-compositor")
     demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
     demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")

orx-jvm/orx-dnk3/build.gradle

@@ -11,7 +11,7 @@ sourceSets {
 dependencies {
     implementation "com.google.code.gson:gson:$gsonVersion"
     implementation(project(":orx-fx"))
-    implementation(project(":orx-keyframer"))
+    implementation(project(":orx-jvm:orx-keyframer"))
     implementation(project(":orx-easing"))
     implementation(project(":orx-shader-phrases"))
     implementation(project(":orx-mesh-generators"))

orx-jvm/orx-gui/build.gradle

@@ -10,7 +10,7 @@ sourceSets {
 
 dependencies {
     api project(":orx-parameters")
-    api project(":orx-panel")
+    api project(":orx-jvm:orx-panel")
     implementation "org.openrndr:openrndr-dialogs:$openrndrVersion"
     implementation "com.google.code.gson:gson:$gsonVersion"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"

orx-jvm/orx-keyframer/build.gradle

@@ -40,7 +40,7 @@ dependencies {
 
     demoImplementation(project(":orx-camera"))
 
-    demoImplementation(project(":orx-panel"))
+    demoImplementation(project(":orx-jvm:orx-panel"))
     demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
     demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
     demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion")