Merge pull request #2806 from blundell/update-min-sdk-to-api-21

Update minimum SDK to API 26 (Android 8.0 Oreo)

Author: pyricau

.github/workflows/main.yml

@@ -36,21 +36,10 @@ jobs:
         target: [ google_apis ]
         channel: [ stable ]
         api-level:
-          - 21
-          - 23
           - 26
           - 31
           - 33
           - 34
-        include:
-          - arch: x86
-            api-level: 16
-            target: google_apis
-            channel: stable
-          - arch: x86
-            api-level: 19
-            target: google_apis
-            channel: stable
     steps:
       - name: Enable KVM group perms
         run: |

gradle/libs.versions.toml

@@ -23,7 +23,7 @@ androidXJunit = "1.1.5"
 workManager = "2.7.0"
 detekt = "1.23.8"
 hilt = "2.53"
-androidMinSdk = "14"
+androidMinSdk = "26"
 androidCompileSdk = "35"
 
 [libraries]
@@ -60,7 +60,7 @@ androidX-test-monitor = { module = "androidx.test:monitor", version = "1.6.1" }
 androidX-test-rules = { module = "androidx.test:rules", version.ref = "androidXTest" }
 # Exposed transitively, avoid increasing
 androidX-test-runner = { module = "androidx.test:runner", version = "1.5.2" }
-androidX-test-orchestrator = { module = "androidx.test:orchestrator", version = "1.4.2" } # 1.5.0+ requires API 21+, keeping at 1.4.2 for API 16 compatibility
+androidX-test-orchestrator = { module = "androidx.test:orchestrator", version = "1.5.0" }
 androidX-test-espresso = { module = "androidx.test.espresso:espresso-core", version = "3.5.1" }
 androidX-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidXJunit" }
 androidX-test-junitKtx = { module = "androidx.test.ext:junit-ktx", version.ref = "androidXJunit" }

leakcanary/leakcanary-android-core/src/main/java/leakcanary/LeakCanaryAndroidInternalUtils.kt

@@ -7,8 +7,6 @@ import android.content.Intent
 import android.content.pm.ShortcutInfo.Builder
 import android.content.pm.ShortcutManager
 import android.graphics.drawable.Icon
-import android.os.Build.VERSION
-import android.os.Build.VERSION_CODES
 import com.squareup.leakcanary.core.R
 import shark.SharkLog
 
@@ -18,9 +16,6 @@ internal object LeakCanaryAndroidInternalUtils {
 
   @Suppress("ReturnCount")
   fun addLeakActivityDynamicShortcut(application: Application) {
-    if (VERSION.SDK_INT < VERSION_CODES.N_MR1) {
-      return
-    }
     if (!application.resources.getBoolean(R.bool.leak_canary_add_dynamic_shortcut)) {
       return
     }
@@ -124,6 +119,6 @@ internal object LeakCanaryAndroidInternalUtils {
   }
 
   fun isInstantApp(application: Application): Boolean {
-    return VERSION.SDK_INT >= VERSION_CODES.O && application.packageManager.isInstantApp
+    return application.packageManager.isInstantApp
   }
 }

leakcanary/leakcanary-android-core/src/main/java/leakcanary/NotificationEventListener.kt

@@ -4,7 +4,6 @@ import android.app.Notification
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
-import android.os.Build
 import com.squareup.leakcanary.core.R
 import leakcanary.EventListener.Event
 import leakcanary.EventListener.Event.DumpingHeap
@@ -67,11 +66,7 @@ object NotificationEventListener : EventListener {
         } else {
           appContext.getString(R.string.leak_canary_analysis_failed)
         }
-        val flags = if (Build.VERSION.SDK_INT >= 23) {
-          PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        } else {
-          PendingIntent.FLAG_UPDATE_CURRENT
-        }
+        val flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         val pendingIntent = PendingIntent.getActivity(appContext, 1,  event.showIntent, flags)
         showHeapAnalysisResultNotification(contentTitle,pendingIntent)
       }

leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/LeakCanaryFileProvider.kt

@@ -24,7 +24,6 @@ import android.content.pm.ProviderInfo
 import android.database.Cursor
 import android.database.MatrixCursor
 import android.net.Uri
-import android.os.Build
 import android.os.Environment
 import android.os.ParcelFileDescriptor
 import android.os.StrictMode
@@ -499,7 +498,7 @@ internal class LeakCanaryFileProvider : ContentProvider() {
             if (externalCacheDirs.isNotEmpty()) {
               target = externalCacheDirs[0]
             }
-          } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && TAG_EXTERNAL_MEDIA == tag) {
+          } else if (TAG_EXTERNAL_MEDIA == tag) {
             val externalMediaDirs = context.externalMediaDirs
             if (externalMediaDirs.isNotEmpty()) {
               target = externalMediaDirs[0]
@@ -519,19 +518,11 @@ internal class LeakCanaryFileProvider : ContentProvider() {
       context: Context,
       type: String?
     ): Array<File> {
-      return if (Build.VERSION.SDK_INT >= 19) {
-        context.getExternalFilesDirs(type)
-      } else {
-        arrayOf(context.getExternalFilesDir(type)!!)
-      }
+      return context.getExternalFilesDirs(type)
     }
 
     private fun getExternalCacheDirs(context: Context): Array<File> {
-      return if (Build.VERSION.SDK_INT >= 19) {
-        context.externalCacheDirs
-      } else {
-        arrayOf(context.externalCacheDir!!)
-      }
+      return context.externalCacheDirs
     }
 
     /**

leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/LeakDirectoryProvider.kt

@@ -16,11 +16,8 @@
 package leakcanary.internal
 
 import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-import android.annotation.TargetApi
 import android.content.Context
 import android.content.pm.PackageManager.PERMISSION_GRANTED
-import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES.M
 import android.os.Environment
 import android.os.Environment.DIRECTORY_DOWNLOADS
 import com.squareup.leakcanary.core.R
@@ -79,12 +76,7 @@ internal class LeakDirectoryProvider constructor(
     return File(storageDirectory, fileName)
   }
 
-  @TargetApi(M) fun hasStoragePermission(): Boolean {
-    // Defensive check: @TargetApi doesn't prevent this method from being called on older APIs
-    @Suppress("ObsoleteSdkInt")
-    if (SDK_INT < M) {
-      return true
-    }
+  fun hasStoragePermission(): Boolean {
     // Once true, this won't change for the life of the process so we can cache it.
     if (writeExternalStorageGranted) {
       return true

leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/NotificationReceiver.kt

@@ -4,7 +4,6 @@ import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import leakcanary.internal.NotificationReceiver.Action.CANCEL_NOTIFICATION
 import leakcanary.internal.NotificationReceiver.Action.DUMP_HEAP
 import shark.SharkLog
@@ -40,11 +39,7 @@ internal class NotificationReceiver : BroadcastReceiver() {
     ): PendingIntent {
       val broadcastIntent = Intent(context, NotificationReceiver::class.java)
       broadcastIntent.action = action.name
-      val flags = if (Build.VERSION.SDK_INT >= 23) {
-        PendingIntent.FLAG_IMMUTABLE
-      } else {
-        0
-      }
+      val flags = PendingIntent.FLAG_IMMUTABLE
       return PendingIntent.getBroadcast(context, 0, broadcastIntent, flags)
     }
   }

leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/Notifications.kt

@@ -22,8 +22,6 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES.JELLY_BEAN
-import android.os.Build.VERSION_CODES.O
 import com.squareup.leakcanary.core.R
 import leakcanary.LeakCanary
 import leakcanary.internal.InternalLeakCanary.FormFactor.MOBILE
@@ -90,9 +88,7 @@ internal object Notifications {
       return
     }
 
-    val builder = if (SDK_INT >= O) {
-      Notification.Builder(context, type.name)
-    } else Notification.Builder(context)
+    val builder = Notification.Builder(context, type.name)
 
     builder
       .setContentText(contentText)
@@ -115,26 +111,19 @@ internal object Notifications {
     builder.setSmallIcon(R.drawable.leak_canary_leak)
       .setWhen(System.currentTimeMillis())
 
-    if (SDK_INT >= O) {
-      val notificationManager =
-        context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-      var notificationChannel: NotificationChannel? =
-        notificationManager.getNotificationChannel(type.name)
-      if (notificationChannel == null) {
-        val channelName = context.getString(type.nameResId)
-        notificationChannel =
-          NotificationChannel(type.name, channelName, type.importance)
-        notificationManager.createNotificationChannel(notificationChannel)
-      }
-      builder.setChannelId(type.name)
-      builder.setGroup(type.name)
+    val notificationManager =
+      context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+    var notificationChannel: NotificationChannel? =
+      notificationManager.getNotificationChannel(type.name)
+    if (notificationChannel == null) {
+      val channelName = context.getString(type.nameResId)
+      notificationChannel =
+        NotificationChannel(type.name, channelName, type.importance)
+      notificationManager.createNotificationChannel(notificationChannel)
     }
+    builder.setChannelId(type.name)
+    builder.setGroup(type.name)
 
-    return if (SDK_INT < JELLY_BEAN) {
-      @Suppress("DEPRECATION")
-      builder.notification
-    } else {
-      builder.build()
-    }
+    return builder.build()
   }
 }

leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/RequestPermissionActivity.kt

@@ -15,7 +15,6 @@
  */
 package leakcanary.internal
 
-import android.annotation.TargetApi
 import android.app.Activity
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
@@ -26,12 +25,10 @@ import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Bundle
-import android.os.Build
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import com.squareup.leakcanary.core.R
 
-@TargetApi(Build.VERSION_CODES.M) //
 internal class RequestPermissionActivity : Activity() {
 
   private val targetPermission: String
@@ -84,13 +81,7 @@ internal class RequestPermissionActivity : Activity() {
 
     fun createPendingIntent(context: Context, permission: String): PendingIntent {
       val intent = createIntent(context, permission)
-      // Defensive check: @TargetApi on class doesn't prevent this method from being called on older APIs
-      @Suppress("ObsoleteSdkInt")
-      val flags = if (Build.VERSION.SDK_INT >= 23) {
-        FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
-      } else {
-        FLAG_UPDATE_CURRENT
-      }
+      val flags = FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
       return PendingIntent.getActivity(context, 1, intent, flags)
     }
   }

leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/SquigglySpanRenderer.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Path
-import android.os.Build
 import android.text.Layout
 import com.squareup.leakcanary.core.R
 import kotlin.math.max
@@ -107,7 +106,7 @@ internal abstract class SquigglySpanRenderer(context: Context) {
 
     private fun Layout.getLineBottomWithoutSpacing(line: Int): Int {
       val lineBottom = getLineBottom(line)
-      val lastLineSpacingNotAdded = Build.VERSION.SDK_INT >= 19
+      val lastLineSpacingNotAdded = true
       val isLastLine = line == lineCount - 1
 
       val lineBottomWithoutSpacing: Int