Prepare for Android 15 (#542)

* Bump Project gradle * Bump dependencies * Bump gradle to 8.7 * Bump gradle properties * Add missing null safety * Fix unresolved color * Use alternative version
rebelonion · Dec 13, 2024 · eac4604 · eac4604
1 parent 1686854
commit eac4604
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,12 +11,12 @@ def gitCommitHash = providers.exec {
 }.standardOutput.asText.get().trim()
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "ani.dantotsu"
         minSdk 21
-        targetSdk 34
+        targetSdk 35
         versionCode((System.currentTimeMillis() / 60000).toInteger())
         versionName "3.1.0"
         versionCode 300100000
@@ -113,7 +113,7 @@ dependencies {
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
 
 //  Exoplayer
-    ext.exo_version = '1.3.1'
+    ext.exo_version = '1.5.0'
     implementation "androidx.media3:media3-exoplayer:$exo_version"
     implementation "androidx.media3:media3-ui:$exo_version"
     implementation "androidx.media3:media3-exoplayer-hls:$exo_version"
@@ -124,7 +124,7 @@ dependencies {
     implementation "androidx.media3:media3-cast:$exo_version"
     implementation "androidx.mediarouter:mediarouter:1.7.0"
 // Media3 extension
-    implementation "com.github.anilbeesetti.nextlib:nextlib-media3ext:v0.7.0"
+    implementation "com.github.anilbeesetti.nextlib:nextlib-media3ext:0.8.3"
 
 //  UI
     implementation 'com.google.android.material:material:1.12.0'

diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt
@@ -513,7 +513,7 @@ internal object ExtensionLoader {
      */
     private fun getSignatureHash(pkgInfo: PackageInfo): String? {
         val signatures = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
-            pkgInfo.signingInfo.signingCertificateHistory
+            pkgInfo.signingInfo?.signingCertificateHistory
         else
             @Suppress("DEPRECATION") pkgInfo.signatures
         return if (signatures != null && signatures.isNotEmpty()) {

diff --git a/app/src/main/res/layout/exo_player_view.xml b/app/src/main/res/layout/exo_player_view.xml
@@ -36,7 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:background="@color/exo_error_message_background_color"
+            android:background="@color/bg"
             android:gravity="center"
             android:padding="16dp"
             android:visibility="gone"
@@ -344,4 +344,4 @@
         android:id="@+id/exo_touch_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-</merge>
+</merge>
diff --git a/build.gradle b/build.gradle
@@ -7,12 +7,12 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     ext {
-        kotlin_version = '1.9.23'
-        ksp_version = '1.9.10-1.0.13'
+        kotlin_version = '2.1.0'
+        ksp_version = '2.1.0-1.0.29'
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.7.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath "com.google.devtools.ksp:symbol-processing-api:$ksp_version"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Aug 30 19:57:04 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists