From 4b424afef8ea65e618debf24b8eab80536e427e4 Mon Sep 17 00:00:00 2001
From: Edwin Jakobs <edwin@rndr.studio>
Date: Thu, 22 Jul 2021 16:29:50 +0200
Subject: [PATCH] [orx-olive] Fix compatibility with OPENRNDR 0.4

---
 orx-jvm/orx-olive/build.gradle                    | 4 ++--
 orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt | 2 +-
 settings.gradle                                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/orx-jvm/orx-olive/build.gradle b/orx-jvm/orx-olive/build.gradle
index 5d02495c..453ef6f5 100644
--- a/orx-jvm/orx-olive/build.gradle
+++ b/orx-jvm/orx-olive/build.gradle
@@ -9,8 +9,8 @@ sourceSets {
 }
 
 dependencies {
-    implementation project(":orx-file-watcher")
-    implementation project(":orx-kotlin-parser")
+    implementation project(":orx-jvm:orx-file-watcher")
+    implementation project(":orx-jvm:orx-kotlin-parser")
     
     implementation "org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion"
     implementation "org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion"
diff --git a/orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt b/orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt
index 1a2d5972..482a66ce 100644
--- a/orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt
+++ b/orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt
@@ -35,7 +35,7 @@ fun ApplicationBuilder.oliveProgram(scriptHost: OliveScriptHost = OliveScriptHos
         }
     }
     program = object : OliveProgram(sourceLocation, scriptHost, resources) {
-        override fun setup() {
+        override suspend fun setup() {
             super.setup()
             init()
         }
diff --git a/settings.gradle b/settings.gradle
index 4693f197..8e293ccf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -27,7 +27,7 @@ include 'openrndr-demos',
         'orx-no-clear',
         'orx-noise',
         'orx-obj-loader',
-        'orx-olive',
+        'orx-jvm:orx-olive',
         'orx-jvm:orx-osc',
         'orx-palette',
         'orx-jvm:orx-panel',