bump aap-lv2, update actions setup, rename applicationId for consiste…

…ncy.
atsushieno · Jan 20, 2023 · 54c99fb · 54c99fb
1 parent b58fe34
commit 54c99fb
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 48 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -5,95 +5,79 @@ on:
   pull_request:
 
 jobs:
-  linux-init:
-    name: init on linux
-    runs-on: ubuntu-20.04
-    outputs:
-      skip: ${{ steps.ci-skip-step.outputs.ci-skip }}
-      skip-not: ${{ steps.ci-skip-step.outputs.ci-skip-not }}
-    steps:
-    - id: ci-skip-step
-      uses: mstachniuk/ci-skip@v1
-      with:
-        commit-filter: '[ci skip];[CI skip];[CI-skip];[ci-skip];[CI SKIP];[CI-SKIP]'
-        commit-filter-separator: ';'
-
   linux-build:
     name: build on linux
     runs-on: ubuntu-20.04
-    needs: linux-init
     if: ${{ needs.linux-init.outputs.skip == 'false' }}
     steps:
     - name: checkout
       uses: actions/checkout@v1
       with:
         submodules: recursive
-    - name: cache NDK
-      uses: actions/cache@v2
+    - name: cache AVD
+      uses: actions/cache@v3
       env:
-        cache-name: cache-ndk
+        cache-name: cache-avd
       with:
-        path: /usr/local/lib/android/sdk/ndk/21.2.6472646
-        key: ndk_r21c_linux
+        path: /home/runner/.android/gradle/avd
+        key: ${{ runner.os }}-gradle-avd
+    - name: cache gradle caches
+      uses: actions/cache@v3
+      env:
+        cache-name: cache-gradle-caches
+      with:
+        path: /home/runner/.gradle/caches/
+        key: ${{ runner.os }}-gradle-caches
     - name: apt update
       run: |
         sudo apt-get update
     - name: workaround for Actions inability to build AGP 7.0-alpha based projects https://github.com/actions/virtual-environments/pull/2229
       run: echo "yes" | $ANDROID_HOME/tools/bin/sdkmanager "cmake;3.18.1" --channel=3
     - name: set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
         java-version: 11
+        distribution: temurin
     - name: apt install
       run: |
         echo y | sudo apt-get install doxygen libgrpc++-dev libgrpc-dev libprotobuf-dev graphviz cmake ninja-build liblilv-dev
-    - name: stupid NDK setup workaround for GitHub Actions
-      run: sudo chmod 777 /usr/local/lib/android/sdk/ && mkdir -p /usr/local/lib/android/sdk/ndk
     - name: build
       run: make
     - name: upload artifact
       if: success()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: aap-guitarix-debug.apk
         path: ./aap-guitarix/build/outputs/apk/debug/aap-guitarix-debug.apk
 
-  osx-init:
-    name: init on osx
-    runs-on: macos-10.15
-    outputs:
-      skip: ${{ steps.ci-skip-step.outputs.ci-skip }}
-      skip-not: ${{ steps.ci-skip-step.outputs.ci-skip-not }}
-    steps:
-    - id: ci-skip-step
-      uses: mstachniuk/ci-skip@v1
-      with:
-        commit-filter: '[ci skip];[CI skip];[CI-skip];[ci-skip];[CI SKIP];[CI-SKIP]'
-        commit-filter-separator: ';'
-
   osx-build:
     name: build on osx
-    runs-on: macos-10.15
-    needs: osx-init
+    runs-on: macos-12
     if: false
     steps:
     - name: checkout
       uses: actions/checkout@v1
       with:
         submodules: recursive
-    - name: cache NDK
-      uses: actions/cache@v2
+    - name: cache AVD
+      uses: actions/cache@v3
       env:
-        cache-name: cache-ndk
+        cache-name: cache-avd
       with:
-        path: /Users/runner/Library/Android/sdk/ndk/21.2.6472646
-        key: ndk_r21c_osx
-    - name: workaround for Actions inability to build AGP 7.0-alpha based projects https://github.com/actions/virtual-environments/pull/2229
-      run: echo "yes" | $ANDROID_HOME/tools/bin/sdkmanager "cmake;3.18.1" --channel=3
+        path: /Users/runner/.android/gradle/avd
+        key: ${{ runner.os }}-gradle-avd
+    - name: cache gradle caches
+      uses: actions/cache@v3
+      env:
+        cache-name: cache-gradle-caches
+      with:
+        path: /Users/runner/.gradle/caches/
+        key: ${{ runner.os }}-gradle-caches
     - name: set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
         java-version: 11
+        distribution: temurin
     - name: install deps
       run: |
         brew install cmake doxygen ninja graphviz lilv

diff --git a/aap-guitarix/build.gradle b/aap-guitarix/build.gradle
@@ -7,6 +7,7 @@ android {
     compileSdkVersion 33
 
     defaultConfig {
+        applicationId "org.androidaudioplugin.ports.lv2.guitarix"
         minSdkVersion 29
         targetSdkVersion 33
         versionCode 1

diff --git a/aap-guitarix/src/main/AndroidManifest.xml b/aap-guitarix/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.androidaudioplugin.aapguitarix">
+    package="org.androidaudioplugin.ports.lv2.guitarix">
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <application

diff --git a/external/aap-lv2 b/external/aap-lv2
+13 −15		.github/workflows/actions.yml
+1 −0		androidaudioplugin-lv2/src/main/cpp/CMakeLists.txt
+34 −21		androidaudioplugin-lv2/src/main/cpp/src/aap-lv2-extensions.cpp
+321 −0		androidaudioplugin-lv2/src/main/cpp/src/aap-lv2-internal.h
+12 −289		androidaudioplugin-lv2/src/main/cpp/src/android-audio-plugin-lv2-bridge.cpp
+1 −1		external/aap-core
+19 −5		tools/aap-import-lv2-metadata/aap-import-lv2-metadata.cpp