Update to support SDK 36

Tetr4 · Tetr4 · commit eac756f535b4 · 2025-09-01T01:18:08.000+02:00
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: alvrme/alpine-android:android-34-jdk17
+    container: alvrme/alpine-android:android-36-jdk21
     env:
       SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
       KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: alvrme/alpine-android:android-34-jdk17
+    container: alvrme/alpine-android:android-36-jdk21
     env:
       SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
       KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 android {
     namespace = "de.klimek.compass"
-    compileSdk = 34
+    compileSdk = 36
 
     signingConfigs {
         create("release") {
@@ -19,7 +19,7 @@ android {
     defaultConfig {
         applicationId = "de.klimek.compass"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 8
         versionName = "1.4.1"
         proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
@@ -34,7 +34,7 @@ android {
     }
 
     kotlin {
-        jvmToolchain(17)
+        jvmToolchain(21)
     }
 
     dependenciesInfo {
@@ -45,5 +45,5 @@ android {
 }
 
 dependencies {
-    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("androidx.appcompat:appcompat:1.7.1")
 }
diff --git a/app/src/main/java/de/klimek/compass/Foreground.kt b/app/src/main/java/de/klimek/compass/Foreground.kt
@@ -0,0 +1,15 @@
+package de.klimek.compass
+
+import android.app.Notification
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
+import androidx.core.app.ServiceCompat
+
+fun TileService.startForegroundCompat(notificationId: Int, notification: Notification) {
+    if (VERSION.SDK_INT >= VERSION_CODES.Q) {
+        ServiceCompat.startForeground(this, notificationId, notification, FOREGROUND_SERVICE_TYPE_MANIFEST)
+    } else {
+        startForeground(notificationId, notification)
+    }
+}
diff --git a/app/src/main/java/de/klimek/compass/TileService.kt b/app/src/main/java/de/klimek/compass/TileService.kt
@@ -1,14 +1,15 @@
 package de.klimek.compass
 
+import android.app.ForegroundServiceStartNotAllowedException
 import android.app.NotificationManager
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
 import android.graphics.drawable.Icon
 import android.hardware.Sensor
 import android.hardware.SensorEvent
 import android.hardware.SensorEventListener
 import android.hardware.SensorManager
 import android.hardware.display.DisplayManager
-import android.os.Build
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
 import android.service.quicksettings.Tile
 import android.util.Log
 import android.view.Display
@@ -21,9 +22,16 @@ import de.klimek.compass.tile.update
 private const val TAG = "TileService"
 private const val SENSOR_DELAY = SensorManager.SENSOR_DELAY_UI
 
+// Note: Sensor data is only accessible in foreground, so we need to start this service as a foreground service.
+// This is done either on onCreate, onClick or onStartListening, depending on Android version.
+
 // On Android 14 foreground service can not be started in onClick or onStartListening due to a bug:
 // https://issuetracker.google.com/issues/299506164
-private val START_FOREGROUND_IMMEDIATELY = Build.VERSION.SDK_INT == Build.VERSION_CODES.UPSIDE_DOWN_CAKE
+private val START_FOREGROUND_IMMEDIATELY = VERSION.SDK_INT == VERSION_CODES.UPSIDE_DOWN_CAKE
+
+// On Android 15+ foreground service can only be started after user interaction (onClick or sometimes onStartListening):
+// https://developer.android.com/about/versions/15/behavior-changes-15#fgs-hardening
+private val CAN_ONLY_START_FOREGROUND_ON_CLICK = VERSION.SDK_INT >= VERSION_CODES.VANILLA_ICE_CREAM
 
 class TileService : android.service.quicksettings.TileService(), SensorEventListener {
 
@@ -57,7 +65,7 @@ class TileService : android.service.quicksettings.TileService(), SensorEventList
         iconFactory = IconFactory(applicationContext, R.drawable.ic_qs_compass_on)
         notificationManager?.createNotificationChannel(channel())
         if (START_FOREGROUND_IMMEDIATELY) {
-            startForeground(NOTIFICATION_ID, notification(), FOREGROUND_SERVICE_TYPE_MANIFEST)
+            startForegroundCompat(NOTIFICATION_ID, notification())
         }
     }
 
@@ -68,12 +76,14 @@ class TileService : android.service.quicksettings.TileService(), SensorEventList
     }
 
     override fun onStartListening() {
+        Log.i(TAG, "Start listening")
         when (qsTile?.state) {
             Tile.STATE_ACTIVE -> startCompass()
         }
     }
 
     override fun onStopListening() {
+        Log.i(TAG, "Stop listening")
         when (qsTile?.state) {
             Tile.STATE_ACTIVE -> stopCompass()
         }
@@ -109,12 +119,20 @@ class TileService : android.service.quicksettings.TileService(), SensorEventList
     }
 
     private fun startCompass() {
-        Log.i(TAG, "Start")
-        // Sensor data is only accessible in foreground, so we need to start this service as a foreground service.
-        if (!START_FOREGROUND_IMMEDIATELY) {
-            startForeground(NOTIFICATION_ID, notification())
+        try {
+            Log.i(TAG, "Start")
+            if (!START_FOREGROUND_IMMEDIATELY) {
+                startForegroundCompat(NOTIFICATION_ID, notification())
+            }
+            sensorManager?.registerListener(this, sensor, SENSOR_DELAY)
+        } catch (e: Exception) {
+            if (CAN_ONLY_START_FOREGROUND_ON_CLICK && e is ForegroundServiceStartNotAllowedException) {
+                Log.w(TAG, "Foreground service start not allowed", e)
+                setInactive()
+            } else {
+                throw e // Crash on other exceptions
+            }
         }
-        sensorManager?.registerListener(this, sensor, SENSOR_DELAY)
     }
 
     private fun stopCompass() {
diff --git a/app/src/main/java/de/klimek/compass/tile/IconFactory.kt b/app/src/main/java/de/klimek/compass/tile/IconFactory.kt
@@ -1,23 +1,20 @@
 package de.klimek.compass.tile
 
 import android.content.Context
-import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.PorterDuff
 import android.graphics.drawable.Icon
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.createBitmap
 
 /** Factory for creating (and caching) rotated icons. */
 class IconFactory(context: Context, @DrawableRes drawableRes: Int) {
 
     // drawable and bitmap cache for better memory
     private val arrowDrawable = ContextCompat.getDrawable(context, drawableRes)!!
-    private val iconBitmap = Bitmap.createBitmap(
-        arrowDrawable.intrinsicWidth, arrowDrawable.intrinsicHeight,
-        Bitmap.Config.ARGB_8888
-    )
+    private val iconBitmap = createBitmap(arrowDrawable.intrinsicWidth, arrowDrawable.intrinsicHeight)
 
     fun build(degrees: Float): Icon {
         Canvas(iconBitmap).apply {
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     // AGP (https://developer.android.com/build/releases/gradle-plugin)
-    id("com.android.application") version "8.5.2" apply false
+    id("com.android.application") version "8.12.2" apply false
 
     // Kotlin (https://kotlinlang.org/docs/releases.html#release-details)
-    id ("org.jetbrains.kotlin.android") version "2.0.20" apply false
+    id ("org.jetbrains.kotlin.android") version "2.2.10" apply false
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`// AGP (https://developer.android.com/build/releases/gradle-plugin)`
`3`		`- id("com.android.application") version "8.5.2" apply false`
	`3`	`+ id("com.android.application") version "8.12.2" apply false`
`4`	`4`
`5`	`5`	`// Kotlin (https://kotlinlang.org/docs/releases.html#release-details)`
`6`		`- id ("org.jetbrains.kotlin.android") version "2.0.20" apply false`
	`6`	`+ id ("org.jetbrains.kotlin.android") version "2.2.10" apply false`
`7`	`7`	`}`