Skip to content

Commit

Permalink
bump aap-lv2 and apply the workaround for #174
Browse files Browse the repository at this point in the history
  • Loading branch information
atsushieno committed Sep 17, 2023
1 parent 95864c5 commit bbebb74
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 11 deletions.
21 changes: 15 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,23 @@ android {
}

dependencies {
implementation libs.aap.lv2
implementation libs.aap.core
implementation libs.aap.midi.device.service
implementation libs.aap.ui.compose.app
implementation libs.aap.ui.web
// FIXME: the project structure should not be like this, but the buggy build system results in
// this inconsistency: https://github.com/atsushieno/aap-core/issues/172#issuecomment-1716034775
//implementation libs.aap.lv2
//implementation libs.aap.core
//implementation libs.aap.midi.device.service
//implementation libs.aap.ui.compose.app
//implementation libs.aap.ui.web
implementation project(":androidaudioplugin-lv2")
implementation project(":androidaudioplugin")
implementation project(":androidaudioplugin-midi-device-service")
implementation project(":androidaudioplugin-manager")
implementation project(":androidaudioplugin-ui-compose-app")
implementation project(":androidaudioplugin-ui-web")

testImplementation libs.junit
androidTestImplementation libs.aap.testing
//androidTestImplementation libs.aap.testing
implementation project(":androidaudioplugin-testing")
androidTestImplementation libs.test.core
androidTestImplementation libs.test.ext.junit
}
2 changes: 1 addition & 1 deletion external/aap-lv2
26 changes: 22 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
rootProject.name = "aap-lv2-string-machine"
rootProject.name = "aap-lv2-mda"
include ":app"
// Enable these lines if you want to debug androidaudioplugin-lv2
//include ":androidaudioplugin-lv2"
//project(":androidaudioplugin-lv2").projectDir = new File("external/aap-lv2/androidaudioplugin-lv2")

include ":androidaudioplugin-lv2"
project(":androidaudioplugin-lv2").projectDir = new File("external/aap-lv2/androidaudioplugin-lv2")

include ':androidaudioplugin'
include ':androidaudioplugin-testing'
include ':androidaudioplugin-manager'
include ':androidaudioplugin-samples-host-engine'
include ':androidaudioplugin-ui-web'
include ':androidaudioplugin-ui-compose'
include ':androidaudioplugin-ui-compose-app'
include ':androidaudioplugin-midi-device-service'
include ':androidaudioplugin-lv2'
project(':androidaudioplugin').projectDir = new File('external/aap-lv2/external/aap-core/androidaudioplugin')
project(':androidaudioplugin-testing').projectDir = new File('external/aap-lv2/external/aap-core/androidaudioplugin-testing')
project(':androidaudioplugin-manager').projectDir = new File('external/aap-lv2/external/aap-core/androidaudioplugin-manager')
project(':androidaudioplugin-samples-host-engine').projectDir = new File('external/aap-lv2/external/aap-core/androidaudioplugin-samples-host-engine')
project(':androidaudioplugin-ui-web').projectDir = new File('external/aap-lv2/external/aap-core/androidaudioplugin-ui-web')
project(':androidaudioplugin-ui-compose').projectDir = new File('external/aap-lv2/external/aap-core/androidaudioplugin-ui-compose')
project(':androidaudioplugin-ui-compose-app').projectDir = new File('external/aap-lv2/external/aap-core/androidaudioplugin-ui-compose-app')
project(':androidaudioplugin-midi-device-service').projectDir = new File('external/aap-lv2/external/aap-core/androidaudioplugin-midi-device-service')

0 comments on commit bbebb74

Please sign in to comment.