Android 14 support (#256)

SRGSSR · Sep 26, 2023 · 068f3c2 · 068f3c2
1 parent 68f15f8
commit 068f3c2
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 7 deletions.
diff --git a/buildSrc/src/main/java/AppConfig.kt b/buildSrc/src/main/java/AppConfig.kt
@@ -6,7 +6,7 @@ import java.util.*
 
 object AppConfig {
     const val minSdk = 21
-    const val targetSdk = 33
+    const val targetSdk = 34
     const val compileSdk = 34
     // https://developer.android.com/jetpack/androidx/releases/compose-kotlin
     const val composeCompiler = "1.5.1"

diff --git a/pillarbox-analytics/build.gradle.kts b/pillarbox-analytics/build.gradle.kts
@@ -14,7 +14,6 @@ android {
 
     defaultConfig {
         minSdk = AppConfig.minSdk
-        targetSdk = AppConfig.targetSdk
         version = VersionConfig.versionName()
         group = VersionConfig.GROUP
 

diff --git a/pillarbox-core-business/build.gradle.kts b/pillarbox-core-business/build.gradle.kts
@@ -15,7 +15,6 @@ android {
 
     defaultConfig {
         minSdk = AppConfig.minSdk
-        targetSdk = AppConfig.targetSdk
         version = VersionConfig.versionName()
         group = VersionConfig.GROUP
 

diff --git a/pillarbox-demo/src/main/AndroidManifest.xml b/pillarbox-demo/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
     <application
         android:name=".DemoApplication"
         android:allowBackup="true"

diff --git a/pillarbox-player-testutils/build.gradle.kts b/pillarbox-player-testutils/build.gradle.kts
@@ -13,7 +13,6 @@ android {
 
     defaultConfig {
         minSdk = AppConfig.minSdk
-        targetSdk = AppConfig.targetSdk
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/pillarbox-player/build.gradle.kts b/pillarbox-player/build.gradle.kts
@@ -14,7 +14,6 @@ android {
 
     defaultConfig {
         minSdk = AppConfig.minSdk
-        targetSdk = AppConfig.targetSdk
         version = VersionConfig.versionName()
         group = VersionConfig.GROUP
 

diff --git a/pillarbox-player/docs/README.md b/pillarbox-player/docs/README.md
@@ -138,6 +138,12 @@ And enable foreground service in the top of the manifest:
 <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 ```
 
+And since Android 14 (targetApiVersion = 34) a new permission have to be added:
+
+```xml
+<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
+```
+
 Then in the code you have to use `MediaController` to handle playback, not `PillarboxPlayer`. Pillarbox provide an easy way to retrieve that
 `MediaController` with `MediaControllerConnection`.
 

diff --git a/...x-player/src/main/java/ch/srgssr/pillarbox/player/service/PillarboxMediaLibraryService.kt b/...x-player/src/main/java/ch/srgssr/pillarbox/player/service/PillarboxMediaLibraryService.kt
@@ -22,6 +22,7 @@ import ch.srgssr.pillarbox.player.utils.PendingIntentUtils
  *
  * ```xml
  *      <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+ *      <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
  * ```
  * And add your PlaybackService to the application manifest as follow :
  *

diff --git a/...x-player/src/main/java/ch/srgssr/pillarbox/player/service/PillarboxMediaSessionService.kt b/...x-player/src/main/java/ch/srgssr/pillarbox/player/service/PillarboxMediaSessionService.kt
@@ -24,6 +24,8 @@ import ch.srgssr.pillarbox.player.utils.PendingIntentUtils
  *
  * ```xml
  *      <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+ *      <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
+ *
  * ```
  * And add your PlaybackService to the application manifest as follow :
  *

diff --git a/pillarbox-player/src/main/java/ch/srgssr/pillarbox/player/service/PlaybackService.kt b/pillarbox-player/src/main/java/ch/srgssr/pillarbox/player/service/PlaybackService.kt
@@ -25,6 +25,8 @@ import ch.srgssr.pillarbox.player.notification.PillarboxMediaDescriptionAdapter
  *
  * ```xml
  *      <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+ *      <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
+ *
  * ```
  * And add your PlaybackService to the application manifest as follow :
  *

diff --git a/pillarbox-ui/build.gradle.kts b/pillarbox-ui/build.gradle.kts
@@ -15,7 +15,6 @@ android {
 
     defaultConfig {
         minSdk = AppConfig.minSdk
-        targetSdk = AppConfig.targetSdk
         version = VersionConfig.versionName()
         group = VersionConfig.GROUP