diff --git a/app/build.gradle b/app/build.gradle index 57ad243..66703b9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,6 +32,7 @@ android { // FIXME: this should not be required, should be another reason that blocks it from loading. implementation libs.libcxx.provider implementation libs.aap.core + implementation libs.aap.ui.web } externalNativeBuild { @@ -45,6 +46,6 @@ android { prefab true } - ndkVersion "$ndk_version" + ndkVersion libs.versions.ndk.get() } diff --git a/build.gradle b/build.gradle index 7076a6a..4feb063 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = libs.versions.kotlin.get() - ext.compose_version = libs.versions.compose.get() - ext.aap_version = libs.versions.aap.core.get() - ext.ndk_version = libs.versions.ndk.get() + ext.kotlin_version = libs.versions.kotlin + ext.compose_version = libs.versions.compose + ext.aap_version = libs.versions.aap.core + ext.ndk_version = libs.versions.ndk ext.enable_asan = false repositories { diff --git a/external/aap-core b/external/aap-core index 45cc09e..f1b6797 160000 --- a/external/aap-core +++ b/external/aap-core @@ -1 +1 @@ -Subproject commit 45cc09e4c86f20d755a9c3665160c70fc921c741 +Subproject commit f1b67973675e202419f707afff7a96b2f709f8f4 diff --git a/external/aap-juce b/external/aap-juce index 0415341..8ab529a 160000 --- a/external/aap-juce +++ b/external/aap-juce @@ -1 +1 @@ -Subproject commit 04153417e72502588f120f1183df4a4aacbac7c5 +Subproject commit 8ab529aa56d3a18b96aaa778c78977e57452c384 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5dbad1b..058f8c2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,17 @@ [versions] -aap-core = "0.7.6-pre" +aap-core = "0.7.6" +aap-lv2 = "0.2.6" -agp = "7.3.1" -kotlin = "1.7.10" +agp = "7.4.2" +kotlin = "1.8.10" ndk = "25.2.9519653" +cmake = "3.22.1" build-tools = "33.0.1" dokka = "1.7.20" -compose = "1.3.1" -androidx-test = "1.4.0" +compose = "1.3.3" +kotlin-compose-compiler-extension = "1.4.3" +androidx-test = "1.5.0" coroutines = "1.6.4" [libraries] @@ -16,40 +19,45 @@ coroutines = "1.6.4" aap-core = { module = "org.androidaudioplugin:androidaudioplugin", version.ref = "aap-core" } aap-midi-device-service = { module = "org.androidaudioplugin:androidaudioplugin-midi-device-service", version.ref = "aap-core" } aap-ui-compose = { module = "org.androidaudioplugin:androidaudioplugin-ui-compose", version.ref = "aap-core" } +aap-ui-web = { module = "org.androidaudioplugin:androidaudioplugin-ui-web", version.ref = "aap-core" } aap-testing = { module = "org.androidaudioplugin:androidaudioplugin-testing", version.ref = "aap-core" } +aap-lv2 = { module = "org.androidaudioplugin:androidaudioplugin-lv2", version.ref = "aap-lv2" } + tools-build-gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" } kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" } -compose-bom = { module = "androidx.compose:compose-bom", version = "2022.10.00" } +compose-bom = { module = "androidx.compose:compose-bom", version = "2023.01.00" } navigation-compose = { module = "androidx.navigation:navigation-compose", version = "2.5.3" } androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.9.0"} -kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" } -androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.5.1" } +kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } +androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" } startup-runtime = { module = "androidx.startup:startup-runtime", version = "1.1.1" } coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } preference-ktx = { module = "androidx.preference:preference-ktx", version = "1.2.0" } libcxx-provider = { module = "dev.atsushieno:libcxx-provider", version.ref = "ndk" } -material = { module = "com.google.android.material:material", version = "1.7.0" } +material = { module = "com.google.android.material:material", version = "1.8.0" } -lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.5.1" } +lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.6.0" } activity-compose = { module = "androidx.activity:activity-compose", version = "1.6.1" } -webkit = { module = "androidx.webkit:webkit", version = "1.5.0" } +webkit = { module = "androidx.webkit:webkit", version = "1.6.0" } compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" } compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } -compose-material = { module = "androidx.compose.material:material", version.ref = "compose" } +compose-material = { module = "androidx.compose.material:material", version = "1.3.1" } compose-ui-test-junit = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" } junit = { module = "junit:junit", version = "4.13.2" } test-core = { module = "androidx.test:core", version.ref = "androidx-test" } test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" } -test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" } -test-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.4" } -test-espresso-core = { module = "androidx.test.espresso:espresso-core", version = "3.5.0" } +test-runner = { module = "androidx.test:runner", version = "1.5.2" } +test-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.5" } +test-espresso-core = { module = "androidx.test.espresso:espresso-core", version = "3.5.1" } -ktmidi = { module = "dev.atsushieno:ktmidi", version = "0.4.0" } +ktmidi = { module = "dev.atsushieno:ktmidi", version = "0.4.1" } mugene = { module = "dev.atsushieno:mugene", version = "0.3.0" } + +oboe = { module = "com.google.oboe:oboe", version = "1.7.0" }