From 0c5fe2d333208d6661f4546cfcf68a63dc4ef0f4 Mon Sep 17 00:00:00 2001
From: Atsushi Eno <atsushieno@gmail.com>
Date: Wed, 5 Jul 2023 20:17:21 +0900
Subject: [PATCH] modernize project to the latest aap-lv2 structure.

- bump aap-lv2
- use Compose native UI
- AGP/Gradle migration with assistant.
---
 Makefile                                 |  7 +----
 app/build.gradle                         |  3 +-
 app/src/main/AndroidManifest.xml         |  3 +-
 external/aap-lv2                         |  2 +-
 gradle.properties                        |  3 ++
 gradle/libs.versions.toml                | 36 +++++++++++++-----------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 7 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 2b94d81..5a2346c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ build-all: \
 	build-native \
 	build-java
 
-build-native: dependencies/stamp-fluidsynth dependencies/stamp-aap-aar
+build-native: dependencies/stamp-fluidsynth
 
 external/fluidsynth/.patch-stamp:
 	cd external/fluidsynth && patch -i ../../fluidsynth-ndk24.patch -p1 && touch .patch-stamp
@@ -31,11 +31,6 @@ make-jniLibsDir:
 		mkdir -p app/src/main/jniLibs/$$a ; \
 	done
 
-dependencies/stamp-aap-aar:
-	cp external/aap-lv2/external/aap-core/androidaudioplugin/build/outputs/aar/androidaudioplugin-release.aar .
-	unzip androidaudioplugin-release.aar -d dependencies/androidaudioplugin-aar
-	touch dependencies/stamp-aap-aar
-
 build-aap-lv2:
 	cd external/aap-lv2 && make build-non-app
 
diff --git a/app/build.gradle b/app/build.gradle
index 30d1d1a..a7fc04b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,7 +52,8 @@ android {
             jniLibs.useLegacyPackaging = true
     }
 
-    aaptOptions {
+    namespace 'org.androidaudioplugin.ports.lv2.aap_fluidsynth'
+    androidResources {
         noCompress 'sf3'
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3ca2aef..cd1ea9f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.androidaudioplugin.ports.lv2.aap_fluidsynth">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <application
diff --git a/external/aap-lv2 b/external/aap-lv2
index eadbaf1..af482ec 160000
--- a/external/aap-lv2
+++ b/external/aap-lv2
@@ -1 +1 @@
-Subproject commit eadbaf1503239d3fe264c1394148fed4508677f0
+Subproject commit af482ecce5aee3235e0ffee01fe69c027739e381
diff --git a/gradle.properties b/gradle.properties
index 825ba8f..c53b26d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,4 +5,7 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 
 android.experimental.androidTest.useUnifiedTestPlatform=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 058f8c2..5fd8d2e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,18 +1,18 @@
 [versions]
 
-aap-core = "0.7.6"
-aap-lv2 = "0.2.6"
+aap-core = "0.7.7-pre"
+aap-lv2 = "0.2.7-pre"
 
-agp = "7.4.2"
+agp = "8.0.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.3"
+dokka = "1.8.10"
+compose = "1.4.3"
 kotlin-compose-compiler-extension = "1.4.3"
 androidx-test = "1.5.0"
-coroutines = "1.6.4"
+coroutines = "1.7.0"
 
 [libraries]
 
@@ -24,13 +24,15 @@ aap-testing = { module = "org.androidaudioplugin:androidaudioplugin-testing", ve
 
 aap-lv2 = { module = "org.androidaudioplugin:androidaudioplugin-lv2", version.ref = "aap-lv2" }
 
+compose-audio-controls = { module = "org.androidaudioplugin:compose-audio-controls", version = "0.1.3" }
+
 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 = "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"}
+compose-bom = { module = "androidx.compose:compose-bom", version = "2023.06.01" }
+navigation-compose = { module = "androidx.navigation:navigation-compose", version = "2.6.0" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.10.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" }
@@ -39,15 +41,16 @@ coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-androi
 
 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.8.0" }
+material = { module = "com.google.android.material:material", version = "1.9.0" }
 
-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.6.0" }
+lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version = "2.6.1" }
+lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.6.1" }
+activity-compose = { module = "androidx.activity:activity-compose", version = "1.7.2" }
+webkit = { module = "androidx.webkit:webkit", version = "1.7.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 = "1.3.1" }
+compose-material = { module = "androidx.compose.material:material", version = "1.4.3" }
 compose-ui-test-junit = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
 
 junit = { module = "junit:junit", version = "4.13.2" }
@@ -57,7 +60,8 @@ 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.1" }
-mugene = { module = "dev.atsushieno:mugene", version = "0.3.0" }
+ktmidi = { module = "dev.atsushieno:ktmidi", version = "0.5.0" }
+mugene = { module = "dev.atsushieno:mugene", version = "0.4.0" }
 
 oboe = { module = "com.google.oboe:oboe", version = "1.7.0" }
+androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version = "2.6.1" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b30707a..462a46b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Dec 18 18:22:22 JST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME