Skip to content

Commit 5c85a4c

Browse files
committed
Use modern dbus-java fork, add experimental D-Bus MediaService
1 parent 97694fe commit 5c85a4c

File tree

161 files changed

+2274
-19375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+2274
-19375
lines changed

app/build.gradle.kts

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
plugins {
22
id("com.android.application")
3+
kotlin("android")
34
}
45

56
android {
6-
compileSdk = 33
7-
buildToolsVersion = "30.0.3"
7+
compileSdk = 34
88

99
defaultConfig {
1010
applicationId = "org.asteroidos.sync"
1111
minSdk = 24
12-
targetSdk = 33
12+
targetSdk = 34
1313
versionCode = 29
1414
versionName = "0.29"
1515
ndk.abiFilters.clear()
1616
ndk.abiFilters.add("arm64-v8a")
17+
ndk.abiFilters.add("armeabi-v7a")
18+
ndk.abiFilters.add("x86")
19+
ndk.abiFilters.add("x86_64")
1720
externalNativeBuild {
1821
cmake {
1922
cppFlags += ""
@@ -39,7 +42,7 @@ android {
3942
srcDir("src/main/lib/powerampapi/poweramp_api_lib/res/")
4043
}
4144
jniLibs {
42-
srcDir("/work/android-root/lib")
45+
srcDir("/tmp/android-root/lib")
4346
}
4447
}
4548
}
@@ -48,6 +51,10 @@ android {
4851
sourceCompatibility = JavaVersion.VERSION_17
4952
targetCompatibility = JavaVersion.VERSION_17
5053
}
54+
kotlinOptions {
55+
jvmTarget = "17"
56+
}
57+
5158
lint {
5259
checkReleaseBuilds = true
5360
disable += "MissingTranslation"
@@ -80,4 +87,11 @@ dependencies {
8087
implementation("no.nordicsemi.android.support.v18:scanner:1.6.0")
8188
implementation("no.nordicsemi.android:ble:2.7.2")
8289
implementation("com.google.guava:guava:33.1.0-android")
90+
implementation("com.github.hypfvieh:dbus-java-core:5.0.0")
91+
implementation("com.github.hypfvieh:dbus-java-transport-tcp:5.0.0")
92+
implementation("androidx.media3:media3-session:1.3.1")
93+
implementation("androidx.media3:media3-common:1.3.1")
94+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1-Beta")
95+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.1-Beta")
96+
8397
}

app/src/main/cpp/build_depends.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ EOF.
118118
+++ meson.build 2024-04-27 11:44:38.569868768 +0200
119119
@@ -2170 +2170 @@
120120
- libiconv = dependency('iconv')
121-
+ libiconv = [cc.find_library('iconv', required : true, dirs : ['/work/android-root/lib'])]
121+
+ libiconv = [cc.find_library('iconv', required : true, dirs : ['${PREFIX}/lib/${ABI}'])]
122122
EOF.
123123

124124

@@ -130,4 +130,4 @@ EOF.
130130
>&2 ninja -C ./_builddir/ install
131131
>&2 echo "All depends ready"
132132

133-
popd
133+
popd

0 commit comments

Comments
 (0)