Merge branch 'fix_stop_foreground' into minor

Author: ryanheise

.gitignore

@@ -47,6 +47,7 @@ gradlew
 gradlew.bat
 local.properties
 **/GeneratedPluginRegistrant.java
+**/.cxx/
 
 # Android Studio will place build artifacts here
 **/android/app/debug

audio_service/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## 0.18.18
 
 * Fix setPlaybackState entitlement issue on iOS.
+* Fix Android stopForeground deprecation warning.
+* Bump compile/target SDK to 35 on Android.
+* Bump minSdk to 19 on Android.
+* bump AGP to 8.5.2.
 
 ## 0.18.17
 

audio_service/android/build.gradle

@@ -1,15 +1,18 @@
-group 'com.ryanheise.audioservice'
-version '1.0-SNAPSHOT'
+group = "com.ryanheise.audioservice"
+version "1.0-SNAPSHOT"
 def args = ["-Xlint:deprecation","-Xlint:unchecked"]
 
 buildscript {
+    ext {
+        agp_version = '8.5.2'
+    }
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath "com.android.tools.build:gradle:$agp_version"
     }
 }
 
@@ -24,29 +27,25 @@ project.getTasks().withType(JavaCompile) {
     options.compilerArgs.addAll(args)
 }
 
-apply plugin: 'com.android.library'
+apply plugin: "com.android.library"
 
 android {
-    // Conditional for compatibility with AGP <4.2.
-    if (project.android.hasProperty("namespace")) {
-        namespace 'com.ryanheise.audioservice'
-    }
-    compileSdkVersion 33
+    namespace "com.ryanheise.audioservice"
+    compileSdk = 35
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 33
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        minSdk = 19
     }
     lintOptions {
         disable 'InvalidPackage'
     }
 }
 
 dependencies {
-    implementation 'androidx.media:media:1.6.0'
+    implementation 'androidx.media:media:1.7.0'
+    implementation 'androidx.core:core:1.13.1'
 }

audio_service/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

audio_service/android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.ryanheise.audioservice">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

audio_service/android/src/main/java/com/ryanheise/audioservice/AudioService.java

@@ -29,6 +29,7 @@
 import android.view.KeyEvent;
 
 import androidx.annotation.RequiresApi;
+import androidx.core.app.ServiceCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.app.NotificationCompat;
 import androidx.media.MediaBrowserServiceCompat;
@@ -371,7 +372,7 @@ public void onDestroy() {
         artBitmapCache.evictAll();
         compactActionIndices = null;
         releaseMediaSession();
-        legacyStopForeground(!config.androidResumeOnClick);
+        ServiceCompat.stopForeground(this, config.androidResumeOnClick ? STOP_FOREGROUND_DETACH : STOP_FOREGROUND_REMOVE);
         // This still does not solve the Android 11 problem.
         // if (notificationCreated) {
         //     NotificationManager notificationManager = getNotificationManager();
@@ -382,18 +383,6 @@ public void onDestroy() {
         notificationCreated = false;
     }
 
-    @SuppressWarnings("deprecation")
-    private void legacyStopForeground(boolean removeNotification) {
-        if (Build.VERSION.SDK_INT >= 24) {
-            // TODO: Consider application of STOP_FOREGROUND_DETACH
-            stopForeground(removeNotification ? STOP_FOREGROUND_REMOVE : 0);
-        } else {
-            // TODO: This API is deprecated and we'll need to eventually
-            // delete this line.
-            stopForeground(removeNotification);
-        }
-    }
-
     public AudioServiceConfig getConfig() {
         return config;
     }
@@ -730,7 +719,7 @@ private void exitPlayingState() {
     }
 
     private void exitForegroundState() {
-        legacyStopForeground(false);
+        ServiceCompat.stopForeground(this, STOP_FOREGROUND_DETACH);
         releaseWakeLock();
     }
 

audio_service/example/android/app/build.gradle

@@ -1,44 +1,29 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id "dev.flutter.flutter-gradle-plugin"
 }
 
-apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    namespace 'com.ryanheise.audioserviceexample'
-    compileSdkVersion 34
+    namespace = "com.ryanheise.audioserviceexample"
+    compileSdk = flutter.compileSdkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
 
-    lintOptions {
-        disable 'InvalidPackage'
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11
     }
 
     defaultConfig {
         applicationId "com.ryanheise.audioserviceexample"
-        minSdkVersion 21
-        targetSdkVersion 34
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
 
     buildTypes {
@@ -49,6 +34,10 @@ android {
             shrinkResources true
         }
     }
+
+    lint {
+        disable = ["InvalidPackage"]
+    }
 }
 
 flutter {

audio_service/example/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ryanheise.audioserviceexample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

audio_service/example/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.ryanheise.audioserviceexample">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>

audio_service/example/android/build.gradle

@@ -1,27 +1,16 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-    }
-}
-
 allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {