Add server connectivity to the Android target (#228)

- Implement external server connectivity on Android
- Add ENABLE_EXTERNAL_SERVER_MODE option
- Rename DesktopSettings to ServerSettings
- Move desktop startup command to system category
- Various refactors and organisation changes to PlayerService-related files
- Improve loading splash UI
- Add option to disable audio playback when using external server
- Remove spms submodule
- Don't send Discord webhook in PR CI run

.github/workflows/build-android.yml

@@ -17,18 +17,9 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
-
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-
-    - name: Set up Gradle
-      uses: gradle/gradle-build-action@v3
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
+    - uses: cachix/install-nix-action@v27
+    - uses: DeterminateSystems/magic-nix-cache-action@main
+    - uses: nicknovitski/nix-develop@v1
 
     - name: Build debug APK
       run: ./gradlew androidApp:packageDebug
@@ -54,7 +45,7 @@ jobs:
       uses: discord-actions/message@v2
       env:
         BUILD_NOTIFICATION_DISCORD_WEBHOOK: ${{ secrets.BUILD_NOTIFICATION_DISCORD_WEBHOOK }}
-      if: env.BUILD_NOTIFICATION_DISCORD_WEBHOOK != null
+      if: env.BUILD_NOTIFICATION_DISCORD_WEBHOOK != null && github.event_name != 'pull_request'
       with:
         webhookUrl: ${{ secrets.BUILD_NOTIFICATION_DISCORD_WEBHOOK }}
         message: "${{ github.workflow }} [build](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>) completed for commit - [${{ env.COMMIT_SHA }}](<${{ github.event.head_commit.url }}>) ${{ github.event.head_commit.message }} - [Downloads](https://nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }})"

.github/workflows/build-linux.yml

@@ -18,18 +18,17 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Set up JDK 17
+    - name: Set up JDKs
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
         distribution: 'temurin'
+        java-version: |
+          22
+          21
 
     - name: Set up Gradle
       uses: gradle/gradle-build-action@v3
 
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
     - name: Install desktop-file-utils, appstream
       uses: awalsh128/cache-apt-pkgs-action@latest
       with:

.github/workflows/build-windows.yml

@@ -18,11 +18,13 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Set up JDK 17
+    - name: Set up JDKs
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
         distribution: 'temurin'
+        java-version: |
+          22
+          21
 
     - name: Set up Gradle
       uses: gradle/gradle-build-action@v3

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "spmp-server"]
-	path = spmp-server
-	url = https://github.com/toasterofbread/spmp-server

androidApp/build.gradle.kts

@@ -79,7 +79,7 @@ android {
         versionName = getString("version_string")
 
         applicationId = "com.toasterofbread.spmp"
-        minSdk = 23
+        minSdk = (findProperty("android.minSdk") as String).toInt()
         targetSdk = (findProperty("android.targetSdk") as String).toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -122,8 +122,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_22
+        targetCompatibility = JavaVersion.VERSION_22
         isCoreLibraryDesugaringEnabled = true
     }
 

androidApp/proguard-rules.pro

@@ -39,6 +39,9 @@
 -dontwarn org.jaudiotagger.**
 -keep class org.jaudiotagger.** { *; }
 
+# Ktor
+-dontwarn io.ktor.**
+
 # From proguard-android-optimize.txt
 
 -optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*

androidApp/src/main/AndroidManifest.xml

@@ -58,7 +58,17 @@
         <activity android:name=".ErrorReportActivity" />
 
         <service
-            android:name=".platform.playerservice.PlatformPlayerService"
+            android:name=".platform.playerservice.PlatformInternalPlayerService"
+            android:exported="true"
+            android:foregroundServiceType="mediaPlayback">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+                <action android:name="androidx.media3.session.MediaSessionService" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name=".platform.playerservice.PlatformExternalPlayerService"
             android:exported="true"
             android:foregroundServiceType="mediaPlayback">
             <intent-filter>

androidApp/src/main/java/com/toasterofbread/spmp/MainActivity.kt

@@ -86,17 +86,19 @@ class MainActivity: ComponentActivity() {
             if (intent.action == Intent.ACTION_VIEW) intent.data
             else null
 
+        val launch_arguments: ProgramArguments = ProgramArguments()
+
         setContent {
             val player_coroutine_scope: CoroutineScope = rememberCoroutineScope()
             var player_initialised: Boolean by remember { mutableStateOf(false) }
 
             LaunchedEffect(Unit) {
-                SpMp.initPlayer(player_coroutine_scope)
+                SpMp.initPlayer(launch_arguments, player_coroutine_scope)
                 player_initialised = true
             }
 
             if (player_initialised) {
-                SpMp.App(ProgramArguments(), shortcut_state, open_uri = open_uri?.toString())
+                SpMp.App(launch_arguments, shortcut_state, open_uri = open_uri?.toString())
             }
         }
     }

buildSrc/build.gradle.kts

@@ -9,3 +9,7 @@ repositories {
 dependencies {
     implementation("com.github.gmazzo.buildconfig:plugin:5.3.5")
 }
+
+tasks.withType(JavaCompile::class) {
+    options.release.set(21)
+}

buildSrc/src/main/kotlin/plugins/spmp/Dependencies.kt

@@ -23,6 +23,14 @@ class SpMpDeps(extra: Map<String, Any>) {
 
     val dependencies: Map<String, DependencyInfo> =
         mapOf(
+            "dev.toastbits:spms" to DependencyInfo(
+                version = "0.4.0-alpha2",
+                name = "spmp-server",
+                author = "toasterofbread",
+                url = "https://github.com/toasterofbread/spmp-server",
+                license = "GPL-2.0",
+                license_url = "https://github.com/toasterofbread/spmp-server/blob/6dde651ffc102d604ac7ecd5ac7471b1572fd2e6/LICENSE"
+            ),
             "dev.toastbits.composekit" to DependencyInfo(
                 version = "6788078322",
                 name = "ComposeKit",
@@ -32,7 +40,7 @@ class SpMpDeps(extra: Map<String, Any>) {
                 license_url = "https://github.com/toasterofbread/ComposeKit/blob/136f216e65395660255d3270af9b79c90ae2254c/LICENSE"
             ),
             "dev.toastbits.ytmkt" to DependencyInfo(
-                version = "0.2.0",
+                version = "0.2.2",
                 name = "ytm-kt",
                 author = "toasterofbread",
                 url = "https://github.com/toasterofbread/ytm-kt",
@@ -155,15 +163,15 @@ class SpMpDeps(extra: Map<String, Any>) {
                 fork_url = "https://github.com/marcoc1712/jaudiotagger"
             ),
             "com.github.teamnewpipe:NewPipeExtractor" to DependencyInfo(
-                version = "v0.22.7",
+                version = "v0.24.0",
                 name = "NewPipe Extractor",
                 author = "Team NewPipe",
                 url = "https://github.com/TeamNewPipe/NewPipeExtractor",
                 license = "GPL-3.0",
                 license_url = "https://github.com/TeamNewPipe/NewPipeExtractor/blob/ec3e8378c627c682964f104fc2fb06ea5513b6b7/LICENSE"
             ),
             "org.zeromq:jeromq" to DependencyInfo(
-                version = "0.5.3",
+                version = "0.6.0",
                 name = "JeroMQ",
                 author = "zeromq",
                 url = "https://github.com/zeromq/jeromq",