Skip to content

Commit

Permalink
Revert "prepare for 0.2.8 release with MavenLocal-based package resol…
Browse files Browse the repository at this point in the history
…ution scheme."

This reverts commit aa5d7cb.

context: atsushieno/aap-core#174 (comment)
  • Loading branch information
atsushieno committed Sep 24, 2023
1 parent aa5d7cb commit b529298
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 3 additions & 1 deletion androidaudioplugin-lv2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ android {
}

dependencies {
implementation (libs.aap.core)
// FIXME: aar from MavenLocal should work, but it does not. https://github.com/atsushieno/aap-core/issues/174
//implementation (libs.aap.core)
implementation (project (":androidaudioplugin"))
implementation (libs.androidx.core.ktx)

testImplementation (libs.junit)
Expand Down
2 changes: 1 addition & 1 deletion external/aap-core
Submodule aap-core updated 33 files
+0 −1 androidaudioplugin-manager/src/main/cpp/AAPMidiEventTranslator.cpp
+0 −6 androidaudioplugin-manager/src/main/cpp/AudioGraph.cpp
+0 −3 androidaudioplugin-manager/src/main/cpp/AudioGraph.h
+8 −17 androidaudioplugin-manager/src/main/cpp/AudioGraphNode.Midi.cpp
+0 −1 androidaudioplugin-manager/src/main/cpp/AudioGraphNode.Plugin.cpp
+3 −2 androidaudioplugin-manager/src/main/cpp/AudioGraphNode.h
+2 −2 androidaudioplugin-manager/src/main/cpp/JNI.cpp
+1 −3 androidaudioplugin-manager/src/main/cpp/PluginPlayer.h
+2 −2 androidaudioplugin-midi-device-service/src/main/cpp/AAPMidiProcessor.cpp
+0 −2 androidaudioplugin-midi-device-service/src/main/cpp/AAPMidiProcessor.h
+3 −1 androidaudioplugin-midi-device-service/src/main/cpp/AAPMidiProcessor_android.cpp
+0 −4 androidaudioplugin/src/main/cpp/CMakeLists.txt
+4 −0 androidaudioplugin/src/main/cpp/android/audio-plugin-host-android-internal.cpp
+0 −19 androidaudioplugin/src/main/cpp/core/extensions/midi-service.cpp
+13 −2 androidaudioplugin/src/main/cpp/core/extensions/midi-service.h
+1 −1 androidaudioplugin/src/main/cpp/core/extensions/parameters-service.h
+1 −1 androidaudioplugin/src/main/cpp/core/extensions/port-config-service.h
+1 −1 androidaudioplugin/src/main/cpp/core/extensions/presets-service.h
+1 −1 androidaudioplugin/src/main/cpp/core/extensions/state-service.h
+0 −91 androidaudioplugin/src/main/cpp/core/hosting/PluginHost.Client.cpp
+0 −15 androidaudioplugin/src/main/cpp/core/hosting/PluginHost.Service.cpp
+0 −121 androidaudioplugin/src/main/cpp/core/hosting/PluginHost.cpp
+0 −5 androidaudioplugin/src/main/cpp/core/hosting/PluginInstance.Remote.cpp
+2 −11 androidaudioplugin/src/main/cpp/core/hosting/aap_midi2_helper.cpp
+204 −0 androidaudioplugin/src/main/cpp/core/hosting/audio-plugin-host.cpp
+2 −2 gradle/libs.versions.toml
+0 −4 include/aap/core/aap_midi2_helper.h
+1 −1 include/aap/core/aapxs/extension-service.h
+1 −1 include/aap/core/host/plugin-connections.h
+0 −3 include/aap/core/host/plugin-instance.h
+120 −120 include/aap/core/host/shared-memory-store.h
+2 −2 include/aap/ext/midi.h
+21 −7 include/aap/unstable/aapxs.h
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]

aap-core = "0.7.8"
aap-lv2 = "0.2.8"
aap-core = "0.7.8-pre"
aap-lv2 = "0.2.8-pre"

accompanist-drawablepainter = "0.30.1"
accompanist-permissions = "0.30.1"
Expand Down
4 changes: 1 addition & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
rootProject.name = "aap-lv2"
include ":androidaudioplugin-lv2", ":aap-ayumi"

/*
include ':androidaudioplugin'
include ':androidaudioplugin-testing'
include ':androidaudioplugin-manager'
Expand All @@ -18,5 +17,4 @@ project(':androidaudioplugin-samples-host-engine').projectDir = new File('extern
project(':androidaudioplugin-ui-web').projectDir = new File('external/aap-core/androidaudioplugin-ui-web')
project(':androidaudioplugin-ui-compose').projectDir = new File('external/aap-core/androidaudioplugin-ui-compose')
project(':androidaudioplugin-ui-compose-app').projectDir = new File('external/aap-core/androidaudioplugin-ui-compose-app')
project(':androidaudioplugin-midi-device-service').projectDir = new File('external/aap-core/androidaudioplugin-midi-device-service')
*/
project(':androidaudioplugin-midi-device-service').projectDir = new File('external/aap-core/androidaudioplugin-midi-device-service')

0 comments on commit b529298

Please sign in to comment.