use curl. Prepare for 0.2.5 release [submodule, libs.versions.toml, a…

…ctions]
atsushieno · Jan 31, 2023 · 11706f8 · 11706f8
1 parent 1ee9b63
commit 11706f8
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 26 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -6,4 +6,4 @@ on:
 
 jobs:
   build-dist:
-    uses: atsushieno/aap-lv2/.github/workflows/build-dist-app.yml@d0ebc0b961ff6051bf52211c977da6e8a29118d8
+    uses: atsushieno/aap-lv2/.github/workflows/build-dist-app.yml@053ae29617d425c1d19c1b85376f51835882f1cc
diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ dependencies/guitarix-deps/dist/stamp: aap-guitarix-binaries.zip
 	touch dependencies/guitarix-deps/dist/stamp
 
 aap-guitarix-binaries.zip:
-	wget https://github.com/atsushieno/android-native-audio-builders/releases/download/r8.3/aap-guitarix-binaries.zip
+	curl -O -L https://github.com/atsushieno/android-native-audio-builders/releases/download/r8.3/aap-guitarix-binaries.zip
 
 # Run importers
 
@@ -38,5 +38,5 @@ import-guitarix-deps:
 ## Build utility
 
 build-java:
-	ANDROID_SDK_ROOT=$(ANDROID_SDK_ROOT) ./gradlew build
+	ANDROID_SDK_ROOT=$(ANDROID_SDK_ROOT) ./gradlew build bundle
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -55,17 +55,16 @@ android {
 }
 
 dependencies {
-    implementation "org.androidaudioplugin:androidaudioplugin-lv2:$aap_lv2_version"
-    implementation "org.androidaudioplugin:androidaudioplugin:$aap_version"
-    implementation "org.androidaudioplugin:androidaudioplugin-ui-compose:$aap_version"
+    implementation libs.aap.lv2
+    implementation libs.aap.core
+    implementation libs.aap.ui.compose
 
-
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation "org.androidaudioplugin:androidaudioplugin:$aap_version"
-    androidTestImplementation "org.androidaudioplugin:androidaudioplugin-testing:$aap_version"
-    androidTestImplementation 'androidx.test:core:1.4.0'
-    androidTestImplementation 'androidx.test:rules:1.4.0'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    testImplementation libs.junit
+    //androidTestImplementation libs.aap.core
+    androidTestImplementation libs.aap.testing
+    androidTestImplementation libs.test.core
+    androidTestImplementation libs.test.rules
+    androidTestImplementation libs.test.runner
+    androidTestImplementation libs.test.ext.junit
 }
 
diff --git a/build.gradle b/build.gradle
@@ -1,31 +1,32 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
-    ext.dokka_version = '1.7.20'
-    ext.compose_version = '1.3.0'
-    ext.aap_version = '0.7.5-pre'
-    ext.aap_lv2_version = '0.2.5-pre'
-    ext.ndk_version = '25.1.8937393'
+    ext.kotlin_version = libs.versions.kotlin.get()
+    ext.compose_version = libs.versions.compose.get()
+    ext.aap_version = libs.versions.aap.core.get()
+    ext.aap_lv2_version = libs.versions.aap.lv2.get()
+    ext.ndk_version = libs.versions.ndk.get()
     ext.enable_asan = false
 
     repositories {
         google()
         mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
+        classpath (libs.tools.build.gradle)
+        classpath (libs.kotlin.gradle.plugin)
+        classpath (libs.dokka.gradle.plugin)
     }
 }
 
 allprojects {
     repositories {
         google()
+        mavenLocal()
         mavenCentral()
         maven { url "https://jitpack.io" }
-        mavenLocal()
     }
 }
 

diff --git a/external/aap-lv2 b/external/aap-lv2
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m
+org.gradle.jvmargs=-Xmx2048m
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,57 @@
+[versions]
+
+aap-core = "0.7.5"
+aap-lv2 = "0.2.5"
+
+agp = "7.3.1"
+kotlin = "1.7.10"
+ndk = "25.1.8937393"
+build-tools = "33.0.1"
+dokka = "1.7.20"
+compose = "1.3.1"
+androidx-test = "1.4.0"
+coroutines = "1.6.4"
+
+[libraries]
+
+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-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" }
+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" }
+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" }
+
+lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.5.1" }
+activity-compose = { module = "androidx.activity:activity-compose", version = "1.6.1" }
+webkit = { module = "androidx.webkit:webkit", version = "1.5.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-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" }
+
+ktmidi = { module = "dev.atsushieno:ktmidi", version = "0.4.0" }
+mugene = { module = "dev.atsushieno:mugene", version = "0.3.0" }
+10 −5		.github/workflows/build-dist-app.yml
+1 −1		external/aap-core
+3 −2		gradle/libs.versions.toml