Target Android SDK 35

Affects: https://ebce-lyrasis.atlassian.net/browse/PP-2693

Author: io7m

README-CHANGES.xml

@@ -675,8 +675,14 @@
         </c:change>
       </c:changes>
     </c:release>
-    <c:release date="2025-06-26T11:22:48+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="1.17.0">
-      <c:changes/>
+    <c:release date="2025-07-02T15:53:58+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="1.17.0">
+      <c:changes>
+        <c:change date="2025-07-02T15:53:58+00:00" summary="Target SDK 35.">
+          <c:tickets>
+            <c:ticket id="PP-2693"/>
+          </c:tickets>
+        </c:change>
+      </c:changes>
     </c:release>
   </c:releases>
   <c:ticket-systems>

gradle.properties

@@ -19,8 +19,8 @@ android.enableJetifier=false
 
 org.gradle.jvmargs=-Xmx4096m
 
-org.thepalaceproject.build.androidSDKCompile=34
-org.thepalaceproject.build.androidSDKTarget=34
+org.thepalaceproject.build.androidSDKCompile=35
+org.thepalaceproject.build.androidSDKTarget=35
 org.thepalaceproject.build.androidSDKMinimum=26
 org.thepalaceproject.build.checkSemanticVersioning=false
 org.thepalaceproject.build.enableKtLint=true

simplified-books-covers/src/main/java/org/nypl/simplified/books/covers/BookCoverBadgePainter.kt

@@ -21,13 +21,11 @@ class BookCoverBadgePainter(
   }
 
   override fun transform(source: Bitmap): Bitmap {
-    val badge = this.badges.badgeForEntry(this.entry)
-    if (badge == null) {
-      return source
-    }
+    val badge = this.badges.badgeForEntry(this.entry) ?: return source
+    val sourceConfig = source.config ?: return source
 
     val workingBitmap = Bitmap.createBitmap(source)
-    val result = workingBitmap.copy(source.config, true)
+    val result = workingBitmap.copy(sourceConfig, true)
     val canvas = Canvas(result)
 
     val left = source.width - badge.width