bump ktmidi to 0.8.2 and compose-audio-controls to 0.5.1 and bump oth…

…er deps.

Those packages have not been successfully published until recently.

.github/workflows/actions.yml

@@ -12,26 +12,26 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: apt update
       run: |
         sudo apt-get update
     - name: set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: temurin
     - name: cache AVD
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: cache-avd
       with:
         path: /home/runner/.android/gradle/avd
         key: ${{ runner.os }}-gradle-avd
     - name: cache gradle caches
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: cache-gradle-caches
       with:
@@ -55,7 +55,7 @@ jobs:
         keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
     - name: upload artifact
       if: success()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: apks and aabs
         path: |

app/build.gradle.kts

@@ -6,8 +6,7 @@ plugins {
 
 android {
     namespace = "org.androidaudioplugin.residentmidikeyboard"
-    //compileSdkPreview = "VanillaIceCream"
-    compileSdk = 34
+    compileSdkPreview = "VanillaIceCream"
 
     defaultConfig {
         applicationId = "org.androidaudioplugin.resident_midi_keyboard"
@@ -27,11 +26,10 @@ android {
         create("stable") {
             dimension = "api"
         }
-        /*
         create("previewAPI") {
             dimension = "api"
             targetSdkPreview = "VanillaIceCream"
-        }*/
+        }
     }
 
     buildTypes {
@@ -55,8 +53,7 @@ android {
         compose = true
     }
     composeOptions {
-        // FIXME: lame direct versioning (but the stable JetBrains versions never work fine)
-        kotlinCompilerExtensionVersion = "1.5.8"
+        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
     packaging {
         resources {
@@ -78,8 +75,11 @@ dependencies {
     implementation(libs.ktmidi)
     implementation(libs.accompanist.permissions)
 
-    implementation(project(":compose-audio-controls"))
-    implementation(project(":compose-audio-controls-midi"))
+    // We would occasionally switch between the released package and the submodules.
+    //implementation(project(":compose-audio-controls"))
+    //implementation(project(":compose-audio-controls-midi"))
+    implementation(libs.compose.audio.controls)
+    implementation(libs.compose.audio.controls.midi)
     implementation(libs.compose.markdown)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.lifecycle.service)

app/src/main/AndroidManifest.xml

@@ -38,7 +38,6 @@
             <meta-data android:name="android.media.midi.MidiDeviceService"
                 android:resource="@xml/midi_device" />
         </service>
-        <!--
         <service android:name=".ResidentKeyboardMidiUmpDeviceService" android:exported="true"
             android:permission="android.permission.BIND_MIDI_DEVICE_SERVICE">
             <intent-filter>
@@ -47,7 +46,6 @@
             <property android:name="android.media.midi.MidiUmpDeviceService"
                 android:resource="@xml/ump_midi_device" />
         </service>
-        -->
     </application>
 
 </manifest>

gradle/libs.versions.toml

@@ -1,23 +1,25 @@
 [versions]
-agp = "8.4.0-alpha13"
+agp = "8.3.2"
 compose-markdown = "0.3.4"
-kotlin = "1.9.22"
-core-ktx = "1.12.0"
+kotlin = "1.9.23"
+core-ktx = "1.13.0"
 junit = "4.13.2"
 androidx-test-ext-junit = "1.1.5"
 espresso-core = "3.5.1"
-kotlinx-coroutines-core = "1.8.0-RC2"
+kotlinx-coroutines-core = "1.8.0"
 lifecycle-runtime-ktx = "2.7.0"
-activity-compose = "1.8.2"
-compose-bom = "2024.02.01"
+activity-compose = "1.9.0"
+compose-bom = "2024.04.01"
+compose-compiler = "1.5.12"
 metalava-gradle = "0.3.5"
 dokka = "1.9.10"
-ktmidi = "0.8.0-pre4"
-compose-audio-controls = "0.4.3" # ourselves
+ktmidi = "0.8.2"
+compose-audio-controls = "0.5.1" # ourselves
 appcompat = "1.6.1"
 lifecycle-service = "2.7.0"
-compose-plugin = "1.6.0"
+compose-plugin = "1.6.2"
 accompanist-permissions = "0.32.0"
+kotlinx-datetime = "0.5.0"
 
 [libraries]
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist-permissions" }
@@ -41,6 +43,9 @@ compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 ktmidi = { group = "dev.atsushieno", name = "ktmidi", version.ref = "ktmidi" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 androidx-lifecycle-service = { group = "androidx.lifecycle", name = "lifecycle-service", version.ref = "lifecycle-service" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
+compose-audio-controls = { module = "org.androidaudioplugin:compose-audio-controls", version.ref = "compose-audio-controls" }
+compose-audio-controls-midi = { module = "org.androidaudioplugin:compose-audio-controls-midi", version.ref = "compose-audio-controls" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }

settings.gradle.kts

@@ -20,8 +20,10 @@ dependencyResolutionManagement {
 rootProject.name = "resident-midi-keyboard"
 val CAC_DIR = "external/compose-audio-controls"
 include(":app")
+// We would occasionally switch between the released package and the submodules.
+/*
 include(":compose-audio-controls")
 include(":compose-audio-controls-midi")
 project(":compose-audio-controls").projectDir = File("$CAC_DIR/compose-audio-controls")
 project(":compose-audio-controls-midi").projectDir = File("$CAC_DIR/compose-audio-controls-midi")
-
+*/