From c418c7cc6a3dcfa71ec3688c0f350e82714a8406 Mon Sep 17 00:00:00 2001
From: matejsemancik <matej.semancik@gmail.com>
Date: Fri, 14 Apr 2023 17:49:43 +0200
Subject: [PATCH 1/2] Processing 4.2 compatibility - Update to JDK 17.0.6-tem -
 Remove unused dependencies

---
 .run/PlaygroundApp.run.xml                                | 4 ++--
 .run/VisualsApp.run.xml                                   | 4 ++--
 .sdkmanrc                                                 | 2 +-
 build.gradle.kts                                          | 8 ++------
 buildSrc/src/main/kotlin/ProjectSettings.kt               | 1 +
 .../main/kotlin/dev/matsem/astral/CommonDependencies.kt   | 2 --
 core/build.gradle.kts                                     | 4 ++--
 playground/build.gradle.kts                               | 4 ++--
 .../kotlin/dev/matsem/astral/playground/PlaygroundApp.kt  | 4 ++--
 raspberrypi/build.gradle.kts                              | 4 ++--
 visuals/build.gradle.kts                                  | 4 ++--
 11 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/.run/PlaygroundApp.run.xml b/.run/PlaygroundApp.run.xml
index b82c740e..12256983 100644
--- a/.run/PlaygroundApp.run.xml
+++ b/.run/PlaygroundApp.run.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="PlaygroundApp" type="JetRunConfigurationType" nameIsGenerated="true">
-    <option name="ALTERNATIVE_JRE_PATH" value="azul-11" />
+    <option name="ALTERNATIVE_JRE_PATH" value="temurin-17" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="dev.matsem.astral.playground.PlaygroundApp" />
     <module name="astral-visuals.playground.main" />
     <option name="PROGRAM_PARAMETERS" value="--sketch-path=$PROJECT_DIR$" />
     <shortenClasspath name="NONE" />
-    <option name="VM_PARAMETERS" value="-Djava.library.path=/Applications/Processing.app/Contents/Java/core/library/macos-x86_64" />
+    <option name="VM_PARAMETERS" value="-Djava.library.path=/Applications/Processing.app/Contents/Java/core/library/macos-aarch64" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/VisualsApp.run.xml b/.run/VisualsApp.run.xml
index 8d3c64e3..09bb3d81 100644
--- a/.run/VisualsApp.run.xml
+++ b/.run/VisualsApp.run.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="VisualsApp" type="JetRunConfigurationType" nameIsGenerated="true">
-    <option name="ALTERNATIVE_JRE_PATH" value="azul-11" />
+    <option name="ALTERNATIVE_JRE_PATH" value="temurin-17" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="dev.matsem.astral.visuals.VisualsApp" />
     <module name="astral-visuals.visuals.main" />
     <option name="PROGRAM_PARAMETERS" value="--sketch-path=$PROJECT_DIR$" />
     <shortenClasspath name="NONE" />
-    <option name="VM_PARAMETERS" value="-Djava.library.path=/Applications/Processing.app/Contents/Java/core/library/macos-x86_64" />
+    <option name="VM_PARAMETERS" value="-Djava.library.path=/Applications/Processing.app/Contents/Java/core/library/macos-aarch64" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.sdkmanrc b/.sdkmanrc
index 2f9c84af..849a27e9 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=11.0.11-zulu
+java=17.0.6-tem
diff --git a/build.gradle.kts b/build.gradle.kts
index 5caf88f8..f196786d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,16 +13,12 @@ repositories {
     jcenter()
 }
 
-dependencies {
-    implementation(kotlin("stdlib-jdk8"))
-}
-
 tasks {
     compileKotlin {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = ProjectSettings.jvmTarget
     }
     compileTestKotlin {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = ProjectSettings.jvmTarget
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/ProjectSettings.kt b/buildSrc/src/main/kotlin/ProjectSettings.kt
index 651f0883..806ff229 100644
--- a/buildSrc/src/main/kotlin/ProjectSettings.kt
+++ b/buildSrc/src/main/kotlin/ProjectSettings.kt
@@ -1,4 +1,5 @@
 object ProjectSettings {
     const val version = "2.2.0"
     const val group = "dev.matsem"
+    const val jvmTarget = "17"
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/dev/matsem/astral/CommonDependencies.kt b/buildSrc/src/main/kotlin/dev/matsem/astral/CommonDependencies.kt
index 8e86f85e..b0a2a0a5 100644
--- a/buildSrc/src/main/kotlin/dev/matsem/astral/CommonDependencies.kt
+++ b/buildSrc/src/main/kotlin/dev/matsem/astral/CommonDependencies.kt
@@ -21,8 +21,6 @@ internal fun Project.configureCommonDependencies() {
     val processingLibsDir = props["processing.libs.jars"]
 
     dependencies {
-        add("implementation", kotlin("bom"))
-        add("implementation", kotlin("stdlib-jdk8"))
         add("implementation", Dependencies.koin)
         add("implementation", Dependencies.coroutines)
         add(
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 9bde4cf2..12ffcbe5 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -19,9 +19,9 @@ version = ProjectSettings.version
 
 tasks {
     compileKotlin {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = ProjectSettings.jvmTarget
     }
     compileTestKotlin {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = ProjectSettings.jvmTarget
     }
 }
\ No newline at end of file
diff --git a/playground/build.gradle.kts b/playground/build.gradle.kts
index 89500609..983711e1 100644
--- a/playground/build.gradle.kts
+++ b/playground/build.gradle.kts
@@ -33,9 +33,9 @@ version = ProjectSettings.version
 
 tasks {
     compileKotlin {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = ProjectSettings.jvmTarget
     }
     compileTestKotlin {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = ProjectSettings.jvmTarget
     }
 }
\ No newline at end of file
diff --git a/playground/src/main/kotlin/dev/matsem/astral/playground/PlaygroundApp.kt b/playground/src/main/kotlin/dev/matsem/astral/playground/PlaygroundApp.kt
index 701c10ec..c06bde9a 100644
--- a/playground/src/main/kotlin/dev/matsem/astral/playground/PlaygroundApp.kt
+++ b/playground/src/main/kotlin/dev/matsem/astral/playground/PlaygroundApp.kt
@@ -1,7 +1,7 @@
 package dev.matsem.astral.playground
 
 import dev.matsem.astral.core.di.coreModule
-import dev.matsem.astral.playground.sketches.Sem008
+import dev.matsem.astral.playground.sketches.Blank
 import org.koin.core.KoinComponent
 import org.koin.core.context.startKoin
 import org.koin.core.inject
@@ -27,7 +27,7 @@ class PlaygroundApp : KoinComponent {
     fun run(processingArgs: Array<String>) {
         startKoin {
             printLogger(Level.ERROR)
-            modules(coreModule + playgroundModule { Sem008() })
+            modules(coreModule + playgroundModule { Blank() })
         }
 
         PApplet.runSketch(processingArgs + arrayOf("ProcessingPlayground"), sketch)
diff --git a/raspberrypi/build.gradle.kts b/raspberrypi/build.gradle.kts
index df53c61c..ed83958f 100644
--- a/raspberrypi/build.gradle.kts
+++ b/raspberrypi/build.gradle.kts
@@ -34,10 +34,10 @@ version = ProjectSettings.version
 
 tasks {
     compileKotlin {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = ProjectSettings.jvmTarget
     }
     compileTestKotlin {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = ProjectSettings.jvmTarget
     }
 }
 
diff --git a/visuals/build.gradle.kts b/visuals/build.gradle.kts
index bee03a4a..937600e0 100644
--- a/visuals/build.gradle.kts
+++ b/visuals/build.gradle.kts
@@ -33,9 +33,9 @@ version = ProjectSettings.version
 
 tasks {
     compileKotlin {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = ProjectSettings.jvmTarget
     }
     compileTestKotlin {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = ProjectSettings.jvmTarget
     }
 }
\ No newline at end of file

From aa3ef520db46300bdb23f69c081fa230526ec44e Mon Sep 17 00:00:00 2001
From: matejsemancik <matej.semancik@gmail.com>
Date: Fri, 14 Apr 2023 18:42:51 +0200
Subject: [PATCH 2/2] Update README.md and bump version to 2.2.1

---
 README.md                                   | 23 +++++++++++++++------
 buildSrc/src/main/kotlin/ProjectSettings.kt |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 07e05448..9ee9db6b 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,10 @@ val processingLibs = listOf(
 The Raspberry Pi app can be installed using `./gradlew raspberrypi:installDist` task and zipped using `./gradlew raspberrypi:distZip` task.
 See the [Application Plugin](https://docs.gradle.org/current/userguide/application_plugin.html) docs for more info.
 
+### JDK
+
+Project must be built using JDK 17. You can use [SDKMAN!](https://sdkman.io/) with provided `.sdkmanrc` file to use correct JDK version.
+
 ## How to run
 
 You can run the project with Gradle `run` task. Be sure to include the `--sketch-path` argument so sketches can properly resolve the data folder containing resources needed by some Sketches.
@@ -71,10 +75,7 @@ You can run the project with Gradle `run` task. Be sure to include the `--sketch
 ./gradlew visuals:run --args='--sketch-path=/path/to/project/'
 ```
 
-There are also IntelliJ Run configurations in `.run` folder which you can use to run the app from IDE. Just be sure to edit their configuration to match your setup. 
-
-Note: Due to the fragileness of Processing dependencies (namely JogAmp), the project currently works only with some JDK versions, specifically `11.0.11-zulu`. You can find `.sdkmanrc` file in project folder
-that sets up the current SDK for you if you use [SDKMAN!](https://sdkman.io/). (`11.0.12` does not work yet, causing [this](https://github.com/processing/processing4/issues/249) issue).
+There are also IntelliJ Run configurations in `.run` folder which you can use to run the app from IDE. Just be sure to edit their configuration to match your setup.
 
 ## Remote control
 Currently, the project supports 3 remote control options:
@@ -108,5 +109,15 @@ private var fader1: Float by oscFaderDelegate("/1/fader1", defaultValue = 0.5f)
 
 Most of the delegated properties support value assign, so, if for example you create the fader variable and at some point in time you assign the value into it, the corresponding control in TouchOSC app will reflect that change.
 
-## Known bugs after Processing4 migration
-- movie library does not work (issues with linking native libs)
+## Troubleshooting
+
+### App crashes on sketches which are using `movie` library
+
+Movie library stopped working after migration to Processing 4. Related issue: [#56](https://github.com/matejsemancik/astral-visuals/issues/56)
+
+### App crashes with `Instance creation error : could not create instance for [Single:'dev.matsem.astral.core.tools.audio.AudioProcessor']`
+
+It's probably one of these things:
+- Your system has no audio input devices. Make sure to have at least one audio input device, as it's required by audio processing toolchain.
+- Your system has no audio input devices compatible with `minim` library. (Might happen on newer macOS versions). Happens on my M2 Pro Mac. You can use a virtual audio input device to mitigate this.
+- If you're on macOS, make sure to grant microphone permissions for your Processing installation. The simplest way to do this is to run some Processing sample from `sound` library. The system will ask you to grant microphone permission.
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/ProjectSettings.kt b/buildSrc/src/main/kotlin/ProjectSettings.kt
index 806ff229..3e573324 100644
--- a/buildSrc/src/main/kotlin/ProjectSettings.kt
+++ b/buildSrc/src/main/kotlin/ProjectSettings.kt
@@ -1,5 +1,5 @@
 object ProjectSettings {
-    const val version = "2.2.0"
+    const val version = "2.2.1"
     const val group = "dev.matsem"
     const val jvmTarget = "17"
 }
\ No newline at end of file