hameno · Oct 10, 2026 · Oct 10, 2026
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -17,10 +17,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v7
-      - name: set up JDK 17
+      - name: set up JDK 21
         uses: actions/setup-java@v6
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v6

diff --git a/CLAUDE.md b/CLAUDE.md
@@ -10,7 +10,7 @@ app filtering by package name/signature/regex, and dark mode.
 
 - **Package**: `de.psdev.devdrawer`
 - **Min SDK**: 26 | **Target/Compile SDK**: 37
-- **Language**: Kotlin | **JVM target**: 17
+- **Language**: Kotlin | **JVM target**: 21 (JDK 21 toolchain; CI uses Temurin 21)
 - **Debug build suffix**: `.debug` (so debug and release can coexist on device)
 
 ## Common Commands

diff --git a/app/build.gradle b/app/build.gradle
@@ -37,16 +37,20 @@ android {
         buildConfig true
     }
     compileOptions {
-        targetCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_21
     }
     kotlin {
         compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
+            jvmTarget = JvmTarget.JVM_21
         }
     }
     testOptions {
         unitTests {
             includeAndroidResources = true
+            all {
+                // Robolectric reaches into FileDescriptor internals, which Java 17+ only allows when opened explicitly.
+                jvmArgs '--add-opens=java.base/java.io=ALL-UNNAMED', '--add-exports=java.base/jdk.internal.access=ALL-UNNAMED'
+            }
         }
     }
     sourceSets {
@@ -106,7 +110,7 @@ android {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 

diff --git a/app/src/test/java/de/psdev/devdrawer/DialogStringResourcesTest.kt b/app/src/test/java/de/psdev/devdrawer/DialogStringResourcesTest.kt
@@ -26,8 +26,7 @@ import org.robolectric.annotation.Config
  * Dialog text comes from string resources, so it is translated: under a German locale every dialog reads German.
  */
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33], qualifiers = "de")
+@Config(qualifiers = "de")
 class DialogStringResourcesTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/GermanTranslationTest.kt b/app/src/test/java/de/psdev/devdrawer/GermanTranslationTest.kt
@@ -9,8 +9,7 @@ import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33], qualifiers = "de")
+@Config(qualifiers = "de")
 class GermanTranslationTest {
 
     private val context: Context = RuntimeEnvironment.getApplication()

diff --git a/app/src/test/java/de/psdev/devdrawer/RobolectricSdkTest.kt b/app/src/test/java/de/psdev/devdrawer/RobolectricSdkTest.kt
@@ -0,0 +1,17 @@
+package de.psdev.devdrawer
+
+import android.os.Build
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/** Guards robolectric.properties: the tests should run on a current Android, not an old fallback. */
+@RunWith(RobolectricTestRunner::class)
+class RobolectricSdkTest {
+
+    @Test
+    fun `given the test setup, when a Robolectric test runs, then it runs on Android 16`() {
+        assertEquals(36, Build.VERSION.SDK_INT)
+    }
+}
diff --git a/app/src/test/java/de/psdev/devdrawer/about/AboutScreenTest.kt b/app/src/test/java/de/psdev/devdrawer/about/AboutScreenTest.kt
@@ -12,12 +12,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows.shadowOf
-import org.robolectric.annotation.Config
 import org.robolectric.shadows.ShadowToast
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class AboutScreenTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/analytics/AnalyticsOptInCardTest.kt b/app/src/test/java/de/psdev/devdrawer/analytics/AnalyticsOptInCardTest.kt
@@ -15,11 +15,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class AnalyticsOptInCardTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/apps/AppMatchingTest.kt b/app/src/test/java/de/psdev/devdrawer/apps/AppMatchingTest.kt
@@ -10,11 +10,8 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class AppMatchingTest {
 
     private val devDrawer = PackageHashInfo("de.psdev.devdrawer", firstInstallTime = 1, lastUpdateTime = 30, signatureHashSha256 = "key-a")

diff --git a/app/src/test/java/de/psdev/devdrawer/appwidget/AppScreensTest.kt b/app/src/test/java/de/psdev/devdrawer/appwidget/AppScreensTest.kt
@@ -11,11 +11,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class AppScreensTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/appwidget/WidgetContentLoaderTest.kt b/app/src/test/java/de/psdev/devdrawer/appwidget/WidgetContentLoaderTest.kt
@@ -12,11 +12,8 @@ import org.junit.Assert.assertNull
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class WidgetContentLoaderTest {
 
     private val zeta = PackageHashInfo("com.example.zeta", firstInstallTime = 1, lastUpdateTime = 30, signatureHashSha256 = "key")

diff --git a/app/src/test/java/de/psdev/devdrawer/appwidget/WidgetDeletionTest.kt b/app/src/test/java/de/psdev/devdrawer/appwidget/WidgetDeletionTest.kt
@@ -20,11 +20,8 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows.shadowOf
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class WidgetDeletionTest {
 
     private val application: Application = ApplicationProvider.getApplicationContext()

diff --git a/app/src/test/java/de/psdev/devdrawer/appwidget/WidgetTapHandlerTest.kt b/app/src/test/java/de/psdev/devdrawer/appwidget/WidgetTapHandlerTest.kt
@@ -14,12 +14,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows.shadowOf
-import org.robolectric.annotation.Config
 import org.robolectric.shadows.ShadowToast
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class WidgetTapHandlerTest {
 
     private val application: Application = ApplicationProvider.getApplicationContext()

diff --git a/app/src/test/java/de/psdev/devdrawer/appwidget/glance/DevDrawerWidgetContentTest.kt b/app/src/test/java/de/psdev/devdrawer/appwidget/glance/DevDrawerWidgetContentTest.kt
@@ -10,11 +10,8 @@ import de.psdev.devdrawer.database.WidgetHeaderColor
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class DevDrawerWidgetContentTest {
 
     private fun state(apps: List<WidgetAppItem>, hiddenAppCount: Int = 0) = WidgetUiState(

diff --git a/app/src/test/java/de/psdev/devdrawer/database/MigrationFrom3To4Test.kt b/app/src/test/java/de/psdev/devdrawer/database/MigrationFrom3To4Test.kt
@@ -9,11 +9,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class MigrationFrom3To4Test {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/profiles/WidgetProfilesViewModelTest.kt b/app/src/test/java/de/psdev/devdrawer/profiles/WidgetProfilesViewModelTest.kt
@@ -28,12 +28,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
-import org.robolectric.annotation.Config
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class WidgetProfilesViewModelTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/profiles/ui/editor/AddAppSignatureFilterSheetTest.kt b/app/src/test/java/de/psdev/devdrawer/profiles/ui/editor/AddAppSignatureFilterSheetTest.kt
@@ -12,11 +12,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class AddAppSignatureFilterSheetTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/profiles/ui/editor/DialogButtonLabelTest.kt b/app/src/test/java/de/psdev/devdrawer/profiles/ui/editor/DialogButtonLabelTest.kt
@@ -9,14 +9,11 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 /**
  * Dialog buttons use the string resources' sentence case ("Cancel"), not upper-cased labels ("CANCEL").
  */
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class DialogButtonLabelTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/profiles/ui/editor/FilterTypeLabelTest.kt b/app/src/test/java/de/psdev/devdrawer/profiles/ui/editor/FilterTypeLabelTest.kt
@@ -10,15 +10,12 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 /**
  * The filter type labels ("Package name", "App signature") are shown in sentence case,
  * neither upper-cased ("PACKAGE NAME") nor lower-cased ("package name").
  */
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class FilterTypeLabelTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/profiles/ui/editor/PackagePatternSheetTest.kt b/app/src/test/java/de/psdev/devdrawer/profiles/ui/editor/PackagePatternSheetTest.kt
@@ -14,11 +14,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class PackagePatternSheetTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/profiles/ui/editor/WidgetProfileEditorScreenTest.kt b/app/src/test/java/de/psdev/devdrawer/profiles/ui/editor/WidgetProfileEditorScreenTest.kt
@@ -9,11 +9,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class WidgetProfileEditorScreenTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/profiles/ui/editor/WidgetProfileEditorViewModelTest.kt b/app/src/test/java/de/psdev/devdrawer/profiles/ui/editor/WidgetProfileEditorViewModelTest.kt
@@ -27,12 +27,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
-import org.robolectric.annotation.Config
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class WidgetProfileEditorViewModelTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/profiles/ui/list/WidgetProfileListScreenTest.kt b/app/src/test/java/de/psdev/devdrawer/profiles/ui/list/WidgetProfileListScreenTest.kt
@@ -8,11 +8,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class WidgetProfileListScreenTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/receivers/PinWidgetSuccessReceiverTest.kt b/app/src/test/java/de/psdev/devdrawer/receivers/PinWidgetSuccessReceiverTest.kt
@@ -9,11 +9,8 @@ import org.junit.Assert.assertNull
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class PinWidgetSuccessReceiverTest {
 
     @After

diff --git a/app/src/test/java/de/psdev/devdrawer/settings/SettingsScreenTest.kt b/app/src/test/java/de/psdev/devdrawer/settings/SettingsScreenTest.kt
@@ -8,11 +8,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class SettingsScreenTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/settings/SortOrderLabelTest.kt b/app/src/test/java/de/psdev/devdrawer/settings/SortOrderLabelTest.kt
@@ -7,11 +7,8 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class SortOrderLabelTest {
 
     @Test

diff --git a/app/src/test/java/de/psdev/devdrawer/ui/theme/ShapeTest.kt b/app/src/test/java/de/psdev/devdrawer/ui/theme/ShapeTest.kt
@@ -8,11 +8,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class ShapeTest {
 
     @get:Rule

diff --git a/app/src/test/java/de/psdev/devdrawer/ui/theme/WidgetHeaderPaletteTest.kt b/app/src/test/java/de/psdev/devdrawer/ui/theme/WidgetHeaderPaletteTest.kt
@@ -8,11 +8,8 @@ import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class WidgetHeaderPaletteTest {
 
     private val fixedColors = WidgetHeaderColor.entries - WidgetHeaderColor.DYNAMIC

diff --git a/app/src/test/java/de/psdev/devdrawer/utils/ColorsKtTest.kt b/app/src/test/java/de/psdev/devdrawer/utils/ColorsKtTest.kt
@@ -9,8 +9,7 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(manifest = Config.NONE, sdk = [33])
+@Config(manifest = Config.NONE)
 class ColorsKtTest {
 
     @Test

diff --git a/app/src/test/java/de/psdev/devdrawer/widgets/ui/editor/WidgetEditorScreenTest.kt b/app/src/test/java/de/psdev/devdrawer/widgets/ui/editor/WidgetEditorScreenTest.kt
@@ -9,11 +9,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-// SDK 36 requires Java 21; use SDK 33 which is compatible with the project's Java 17 toolchain.
-@Config(sdk = [33])
 class WidgetEditorScreenTest {
 
     @get:Rule