bump lots of deps to modern versions, if not latest (still using kotl…

…in 1.7)
atsushieno · Jun 19, 2023 · 806d4ea · 806d4ea
1 parent 7e90e2a
commit 806d4ea
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 build
 alsakt-javacpp/src/main/java/dev/atsushieno/alsakt/javacpp
 local.properties
+.DS_Store
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -1,10 +1,10 @@
 plugins {
-    id("org.jetbrains.compose") version "1.2.0-rc01"
+    id("org.jetbrains.compose") version "1.3.0"
     id("com.android.application")
     kotlin("android")
 }
 
-val ktmidi_version = "0.4.0"
+val ktmidi_version = "0.5.0"
 
 dependencies {
     implementation(project(":common"))

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
-        classpath("com.android.tools.build:gradle:7.2.2")
+        classpath("com.android.tools.build:gradle:7.4.2")
     }
 }
 

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -3,18 +3,16 @@ import org.jetbrains.compose.compose
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
-    id("org.jetbrains.compose") version "1.2.0-rc01"
+    id("org.jetbrains.compose") version "1.3.0"
 }
 
-val ktmidi_version = "0.4.0"
+val ktmidi_version = "0.5.0"
+val mugene_version = "0.4.0"
 
 kotlin {
+    jvmToolchain(11)
     android()
-    jvm("desktop") {
-        compilations.all {
-            kotlinOptions.jvmTarget = "11"
-        }
-    }
+    jvm("desktop")
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -23,16 +21,16 @@ kotlin {
                 api(compose.material)
                 api(compose.ui)
                 implementation("dev.atsushieno:ktmidi:$ktmidi_version")
-                implementation("dev.atsushieno:mugene:0.3.0")
+                implementation("dev.atsushieno:mugene:$mugene_version")
                 implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
-                implementation("io.ktor:ktor-io:2.1.0")
+                implementation("io.ktor:ktor-io:2.3.0")
                 implementation("dev.atsushieno:compose-mpp:0.1.3")
             }
         }
         val commonTest by getting
         val androidMain by getting {
             dependencies {
-                api("androidx.appcompat:appcompat:1.5.1")
+                api("androidx.appcompat:appcompat:1.6.1")
                 api("androidx.core:core-ktx:1.9.0")
             }
         }
@@ -47,10 +45,9 @@ kotlin {
 }
 
 android {
-    compileSdk = 31
+    compileSdk = 33
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 24
-        targetSdk = 31
     }
 }
diff --git a/common/src/commonMain/kotlin/dev/atsushieno/kmmk/Model.kt b/common/src/commonMain/kotlin/dev/atsushieno/kmmk/Model.kt
@@ -241,9 +241,9 @@ class KmmkComponentContext {
         } else {
             // ... in MIDI2 UMP.
             val umpInBytes = mutableListOf<Byte>()
-            UmpFactory.sysex7Process(0, bytes, { p, _ ->
-                umpInBytes.addAll(Ump(p).toPlatformNativeBytes().toTypedArray())
-            }, null)
+            UmpFactory.sysex7Process(0, bytes) { l, _ ->
+                umpInBytes.addAll(Ump(l).toPlatformNativeBytes().toTypedArray())
+            }
             sendToAll(umpInBytes.toByteArray(), 0)
         }
         // S6.6 "After the Initiator sends this Set New Protocol message, it shall switch its

diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
     kotlin("multiplatform")
-    id("org.jetbrains.compose") version "1.2.0-rc01"
+    id("org.jetbrains.compose") version "1.3.0"
 }
 
 repositories {

diff --git a/desktop/src/jvmMain/kotlin/main.kt b/desktop/src/jvmMain/kotlin/main.kt
@@ -21,6 +21,8 @@ fun main(args: Array<String>) = application {
         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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists