bump ktmidi to 0.10.0 and use LibreMidiAccess. Bump other deps too.

atsushieno · Sep 7, 2024 · aee2245 · aee2245
1 parent fe1a23b
commit aee2245
Show file tree

Hide file tree

Showing 5 changed files with 218 additions and 447 deletions.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -11,12 +11,12 @@ plugins {
 }
 
 kotlin {
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
-        moduleName = "composeApp"
+        moduleName = "kmmk"
         browser {
             commonWebpackConfig {
-                outputFileName = "composeApp.js"
+                outputFileName = "kmmk.js"
                 devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply {
                     static = (static ?: mutableListOf()).apply {
                         // Serve sources to debug inside browser
@@ -74,6 +74,7 @@ kotlin {
             implementation(compose.desktop.currentOs)
             implementation(libs.ktmidi.jvm.desktop)
             api(libs.rtmidi.javacpp.platform)
+            api(libs.libremidi.javacpp.platform)
         }
     }
 }

diff --git a/composeApp/src/desktopMain/kotlin/main.kt b/composeApp/src/desktopMain/kotlin/main.kt
@@ -6,20 +6,20 @@ import dev.atsushieno.kmmk.App
 import dev.atsushieno.kmmk.KmmkComponentContext
 import dev.atsushieno.ktmidi.AlsaMidiAccess
 import dev.atsushieno.ktmidi.JvmMidiAccess
+import dev.atsushieno.ktmidi.LibreMidiAccess
 import dev.atsushieno.ktmidi.RtMidiAccess
 import java.io.File
 
 fun main(args: Array<String>) = application {
+    val kmmk = KmmkComponentContext()
+    kmmk.midiDeviceManager.midiAccess =
+        if (args.contains("jvm")) JvmMidiAccess()
+        else if (args.contains("alsa")) AlsaMidiAccess()
+        else if (args.contains("rtmidi")) RtMidiAccess()
+        else LibreMidiAccess.create(1)
     Window(onCloseRequest = ::exitApplication,
         title = "Kmmk: Virtual MIDI Keyboard",
         state = rememberWindowState(width = 640.dp, height = 780.dp)) {
-        val kmmk = KmmkComponentContext()
-        kmmk.midiDeviceManager.midiAccess =
-            if (File("/dev/snd/seq").exists()) AlsaMidiAccess()
-            else if (args.contains("jvm")) JvmMidiAccess()
-            //else if (System.getProperty("os.name").contains("Mac OS", true) &&
-            //    System.getProperty("os.arch").contains("aarch64")) JvmMidiAccess()
-            else RtMidiAccess()
         App(kmmk)
     }
 }
diff --git a/composeApp/src/wasmJsMain/resources/index.html b/composeApp/src/wasmJsMain/resources/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <title>Compose App</title>
     <script type="application/javascript" src="skiko.js"></script>
-    <script type="application/javascript" src="composeApp.js"></script>
+    <script type="application/javascript" src="kmmk.js"></script>
 </head>
 <body>
 <canvas id="ComposeTarget"></canvas>

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,21 +3,22 @@ agp = "8.2.2"
 android-compileSdk = "35"
 android-minSdk = "24"
 android-targetSdk = "35"
-androidx-activityCompose = "1.9.1"
+androidx-activityCompose = "1.9.2"
 androidx-appcompat = "1.7.0"
 androidx-constraintlayout = "2.1.4"
 androidx-core-ktx = "1.13.1"
 androidx-espresso-core = "3.6.1"
 androidx-material = "1.12.0"
 androidx-test-junit = "1.2.1"
-compose = "1.6.8"
-compose-plugin = "1.6.10"
+compose = "1.7.0"
+compose-plugin = "1.6.11"
 junit = "4.13.2"
-kotlin = "2.0.0"
+kotlin = "2.0.20"
 
 kotlinx-datetime = "0.6.0"
 rtmidi-javacpp = "0.1.5"
-ktmidi = "0.9.0"
+libremidi-javacpp = "0.1.2"
+ktmidi = "0.10.0"
 ktor-io = "2.3.11"
 mugene = "0.6.0"
 javacpp-platform-plugin = "1.5.10"
@@ -38,6 +39,7 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview"
 
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
 rtmidi-javacpp-platform = { module = "dev.atsushieno:rtmidi-javacpp-platform", version.ref = "rtmidi-javacpp" }
+libremidi-javacpp-platform = { module = "dev.atsushieno:libremidi-javacpp-platform", version.ref = "libremidi-javacpp" }
 ktmidi = { module = "dev.atsushieno:ktmidi", version.ref = "ktmidi" }
 ktmidi-ci = { module = "dev.atsushieno:ktmidi-ci", version.ref = "ktmidi" }
 ktmidi-jvm-desktop = { module = "dev.atsushieno:ktmidi-jvm-desktop", version.ref = "ktmidi" }