[MBL-19081][All] Dependency update

apps/build.gradle

@@ -34,6 +34,7 @@ buildscript {
         classpath Plugins.FIREBASE_CRASHLYTICS
         if (project.coverageEnabled) { classpath Plugins.JACOCO_ANDROID }
         classpath Plugins.HILT
+        classpath Plugins.KSP
     }
 }
 
@@ -50,10 +51,40 @@ allprojects {
                 username pspdfMavenUser
                 password pspdfMavenPass
             }
-            url 'https://customers.pspdfkit.com/maven/'
+            url 'https://my.nutrient.io/maven'
         }
         maven { url "https://maven.google.com/" }
     }
+
+    plugins.withType(com.android.build.gradle.BasePlugin) {
+        android {
+            packaging {
+                resources {
+                    pickFirsts += [
+                        'META-INF/INDEX.LIST',
+                        'META-INF/io.netty.versions.properties'
+                    ]
+                    merges += [
+                        'META-INF/LICENSE*',
+                        'META-INF/NOTICE*',
+                        'META-INF/DEPENDENCIES*'
+                    ]
+                    excludes += [
+                        'META-INF/DEPENDENCIES',
+                        'META-INF/LICENSE',
+                        'META-INF/LICENSE.txt',
+                        'META-INF/LICENSE.md',
+                        'META-INF/NOTICE',
+                        'META-INF/NOTICE.txt',
+                        'META-INF/NOTICE.md',
+                        'META-INF/maven/**',
+                        'META-INF/*.kotlin_module',
+                        'META-INF/services/javax.annotation.processing.Processor'
+                    ]
+                }
+            }
+        }
+    }
 }
 
 task assembleAllApps() {
@@ -72,4 +103,3 @@ configurations.all{
         }
     }
 }
-

apps/buildSrc/src/main/java/GlobalDependencies.kt

@@ -8,7 +8,7 @@ object Versions {
 
     /* Build/tooling */
     const val ANDROID_GRADLE_TOOLS = "8.6.1"
-    const val BUILD_TOOLS = "34.0.0"
+    const val BUILD_TOOLS = "35.0.0"
 
     /* Testing */
     const val JUNIT = "4.13.2"
@@ -18,31 +18,31 @@ object Versions {
     /* Kotlin */
     const val KOTLIN = "2.0.21"
     const val KOTLIN_COROUTINES = "1.9.0"
+    const val KSP = "2.0.21-1.0.27"
 
     /* Google, Play Services */
-    const val GOOGLE_SERVICES = "4.4.2"
+    const val GOOGLE_SERVICES = "4.4.3"
 
     /* Others */
-    const val APOLLO = "4.1.1"
-    const val PSPDFKIT = "2024.3.1"
+    const val APOLLO = "4.3.3"
+    const val NUTRIENT = "10.7.0"
     const val PHOTO_VIEW = "2.3.0"
     const val MOBIUS = "1.2.1"
-    const val HILT = "2.52"
-    const val HILT_ANDROIDX = "1.2.0"
-    const val LIFECYCLE = "2.8.6"
-    const val FRAGMENT = "1.8.4"
-    const val WORK_MANAGER = "2.9.1"
-    const val WORK_TEST = "2.9.1"
-    const val GLIDE_VERSION = "4.16.0"
+    const val HILT = "2.57.2"
+    const val HILT_ANDROIDX = "1.3.0"
+    const val LIFECYCLE = "2.9.4"
+    const val FRAGMENT = "1.8.9"
+    const val WORK_MANAGER = "2.10.5"
+    const val GLIDE_VERSION = "5.0.5"
     const val RETROFIT = "2.11.0"
     const val OKHTTP = "4.12.0"
-    const val ROOM = "2.6.1"
-    const val HAMCREST = "2.2"
-    const val NAVIGATION = "2.8.3"
-    const val MEDIA3 = "1.6.1"
-    const val DATASTORE = "1.1.1"
-    const val LOTTIE = "6.5.2"
-    const val ENCRYPTED_SHARED_PREFERENCES = "1.0.0"
+    const val ROOM = "2.7.0"
+    const val HAMCREST = "3.0"
+    const val NAVIGATION = "2.9.5"
+    const val MEDIA3 = "1.8.0"
+    const val DATASTORE = "1.1.7"
+    const val LOTTIE = "6.6.6"
+    const val ENCRYPTED_SHARED_PREFERENCES = "1.1.0"
     const val JAVA_JWT = "4.5.0"
     const val GLANCE = "1.1.1"
     const val LIVEDATA = "1.9.0"
@@ -65,28 +65,27 @@ object Libs {
     const val ANDROIDX_APPCOMPAT = "androidx.appcompat:appcompat:1.7.0"
     const val ANDROIDX_BROWSER = "androidx.browser:browser:1.8.0"
     const val ANDROIDX_CARDVIEW = "androidx.cardview:cardview:1.0.0"
-    const val ANDROIDX_CONSTRAINT_LAYOUT = "androidx.constraintlayout:constraintlayout:2.1.4"
+    const val ANDROIDX_CONSTRAINT_LAYOUT = "androidx.constraintlayout:constraintlayout:2.2.0"
     const val ANDROIDX_EXIF = "androidx.exifinterface:exifinterface:1.3.7"
     const val ANDROIDX_FRAGMENT = "androidx.fragment:fragment:${Versions.FRAGMENT}"
     const val ANDROIDX_FRAGMENT_KTX = "androidx.fragment:fragment-ktx:${Versions.FRAGMENT}"
     const val ANDROIDX_PALETTE = "androidx.palette:palette:1.0.0"
     const val ANDROIDX_PERCENT = "androidx.percentlayout:percentlayout:1.0.0"
-    const val ANDROIDX_RECYCLERVIEW = "androidx.recyclerview:recyclerview:1.3.2"
+    const val ANDROIDX_RECYCLERVIEW = "androidx.recyclerview:recyclerview:1.4.0"
     const val ANDROIDX_VECTOR = "androidx.vectordrawable:vectordrawable:1.2.0"
     const val ANDROIDX_SWIPE_REFRESH_LAYOUT = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     const val ANDROIDX_CORE_TESTING = "androidx.arch.core:core-testing:2.2.0"
     const val ANDROIDX_WORK_MANAGER = "androidx.work:work-runtime:${Versions.WORK_MANAGER}"
     const val ANDROIDX_WORK_MANAGER_KTX = "androidx.work:work-runtime-ktx:${Versions.WORK_MANAGER}"
-    const val ANDROIDX_WORK_TEST = "androidx.work:work-testing:${Versions.WORK_TEST}"
-    const val ANDROIDX_WEBKIT = "androidx.webkit:webkit:1.9.0"
-    const val ANDROIDX_DATABINDING_COMPILER = "androidx.databinding:databinding-compiler:${Versions.ANDROID_GRADLE_TOOLS}" // This is bundled with the gradle plugin so we use the same version
-    const val ANDROIDX_COMPOSE_ACTIVITY = "androidx.activity:activity-compose:1.9.0"
+    const val ANDROIDX_WORK_TEST = "androidx.work:work-testing:${Versions.WORK_MANAGER}"
+    const val ANDROIDX_WEBKIT = "androidx.webkit:webkit:1.12.0"
+    const val ANDROIDX_COMPOSE_ACTIVITY = "androidx.activity:activity-compose:1.10.0"
     const val DATASTORE = "androidx.datastore:datastore-preferences:${Versions.DATASTORE}"
     const val ENCRYPTED_SHARED_PREFERENCES = "androidx.security:security-crypto:${Versions.ENCRYPTED_SHARED_PREFERENCES}"
     const val JAVA_JWT = "com.auth0:java-jwt:${Versions.JAVA_JWT}"
 
     /* Firebase */
-    const val FIREBASE_BOM = "com.google.firebase:firebase-bom:33.4.0"
+    const val FIREBASE_BOM = "com.google.firebase:firebase-bom:34.3.0"
     const val FIREBASE_CRASHLYTICS = "com.google.firebase:firebase-crashlytics"
     const val FIREBASE_MESSAGING = "com.google.firebase:firebase-messaging"
     const val FIREBASE_CONFIG = "com.google.firebase:firebase-config"
@@ -95,7 +94,7 @@ object Libs {
     /* Google Dependencies */
     const val PLAY_IN_APP_UPDATES = "com.google.android.play:app-update:2.1.0"
     const val FLEXBOX_LAYOUT = "com.google.android.flexbox:flexbox:3.0.0"
-    const val MATERIAL_DESIGN = "com.google.android.material:material:1.12.0"
+    const val MATERIAL_DESIGN = "com.google.android.material:material:1.13.0"
 
     /* Mobius */
     const val MOBIUS_CORE = "com.spotify.mobius:mobius-core:${Versions.MOBIUS}"
@@ -133,7 +132,7 @@ object Libs {
     const val COMPOSE_VIEW_MODEL = "androidx.lifecycle:lifecycle-viewmodel-compose:${Versions.LIFECYCLE}"
     const val COMPOSE_NAVIGATION = "androidx.navigation:navigation-compose:2.8.9"
     /* Media and content handling */
-    const val PSPDFKIT = "com.pspdfkit:pspdfkit:${Versions.PSPDFKIT}"
+    const val NUTRIENT = "io.nutrient:nutrient:${Versions.NUTRIENT}"
     const val MEDIA3 = "androidx.media3:media3-exoplayer:${Versions.MEDIA3}"
     const val MEDIA3_UI = "androidx.media3:media3-ui:${Versions.MEDIA3}"
     const val MEDIA3_HLS = "androidx.media3:media3-exoplayer-hls:${Versions.MEDIA3}"
@@ -171,7 +170,7 @@ object Libs {
     const val APACHE_COMMONS_TEXT = "org.apache.commons:commons-text:1.12.0"
     const val CAMERA_VIEW = "com.otaliastudios:cameraview:2.7.2"
 
-    const val PENDO = "sdk.pendo.io:pendoIO:3.6+"
+    const val PENDO = "sdk.pendo.io:pendoIO:3.7.+"
 
     const val ROOM = "androidx.room:room-runtime:${Versions.ROOM}"
     const val ROOM_COMPILER = "androidx.room:room-compiler:${Versions.ROOM}"
@@ -183,19 +182,19 @@ object Libs {
     const val RRULE = "org.scala-saddle:google-rfc-2445:20110304"
 
     // Compose
-    const val COMPOSE_BOM = "androidx.compose:compose-bom:2024.09.02"
+    const val COMPOSE_BOM = "androidx.compose:compose-bom:2025.09.01"
     const val COMPOSE_MATERIAL = "androidx.compose.material:material"
     const val COMPOSE_MATERIAL_ICONS = "androidx.compose.material:material-icons-core"
     const val COMPOSE_PREVIEW = "androidx.compose.ui:ui-tooling-preview"
     const val COMPOSE_TOOLING = "androidx.compose.ui:ui-tooling"
     const val COMPOSE_UI = "androidx.compose.ui:ui-android"
     const val COMPOSE_UI_TEST = "androidx.compose.ui:ui-test-junit4"
     const val COMPOSE_UI_TEST_MANIFEST = "androidx.compose.ui:ui-test-manifest"
-    const val COMPOSE_MATERIAL_3 = "androidx.compose.material3:material3:1.4.0-alpha12"
+    const val COMPOSE_MATERIAL_3 = "androidx.compose.material3:material3:1.4.0"
     const val COMPOSE_ADAPTIVE = "androidx.compose.material3.adaptive:adaptive"
     const val COMPOSE_MATERIAL3_WINDOW_SIZE = "androidx.compose.material3:material3-window-size-class"
-    const val COMPOSE_NAVIGATION_HILT = "androidx.hilt:hilt-navigation-compose:1.2.0"
-    const val COMPOSE_FRAGMENT = "androidx.fragment:fragment-compose:1.8.6"
+    const val COMPOSE_NAVIGATION_HILT = "androidx.hilt:hilt-navigation-compose:1.3.0"
+    const val COMPOSE_FRAGMENT = "androidx.fragment:fragment-compose:1.8.9"
 
     // Glance
     const val GLANCE = "androidx.glance:glance:${Versions.GLANCE}"
@@ -220,4 +219,5 @@ object Plugins {
     const val GOOGLE_SERVICES = "com.google.gms:google-services:${Versions.GOOGLE_SERVICES}"
     const val JACOCO_ANDROID = "com.dicedmelon.gradle:jacoco-android:${Versions.JACOCO_ANDROID}"
     const val HILT = "com.google.dagger:hilt-android-gradle-plugin:${Versions.HILT}"
+    const val KSP = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:${Versions.KSP}"
 }

apps/gradle.properties

@@ -3,4 +3,4 @@ android.enableJetifier=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

apps/parent/build.gradle

@@ -19,7 +19,8 @@ plugins {
     id 'com.android.application'
     id 'com.google.gms.google-services'
     id 'org.jetbrains.kotlin.android'
-    id 'kotlin-kapt'
+    id 'kotlin-kapt'  // Keep kapt for Data Binding
+    id 'com.google.devtools.ksp'
     id 'com.google.firebase.crashlytics'
     id 'dagger.hilt.android.plugin'
     id 'org.jetbrains.kotlin.plugin.compose'
@@ -51,15 +52,23 @@ android {
         PrivateData.merge(project, "parent")
     }
 
-    packagingOptions {
-        exclude 'META-INF/maven/com.google.guava/guava/pom.xml'
-        exclude 'META-INF/maven/com.google.guava/guava/pom.properties'
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/rxjava.properties'
-        exclude 'LICENSE.txt'
+    packaging {
+        resources {
+            pickFirsts += [
+                'META-INF/INDEX.LIST',
+                'META-INF/io.netty.versions.properties'
+            ]
+            excludes += [
+                'META-INF/DEPENDENCIES',
+                'META-INF/LICENSE',
+                'META-INF/LICENSE.txt',
+                'META-INF/NOTICE',
+                'META-INF/NOTICE.txt',
+                'META-INF/maven/com.google.guava/guava/pom.properties',
+                'META-INF/maven/com.google.guava/guava/pom.xml',
+                'META-INF/rxjava.properties'
+            ]
+        }
     }
 
 
@@ -194,14 +203,14 @@ dependencies {
 
     /* DI */
     implementation Libs.HILT
-    kapt Libs.HILT_COMPILER
+    ksp Libs.HILT_COMPILER
     implementation Libs.HILT_ANDROIDX_WORK
-    kapt Libs.HILT_ANDROIDX_COMPILER
+    ksp Libs.HILT_ANDROIDX_COMPILER
     androidTestImplementation Libs.HILT_TESTING
 
     /* ROOM */
     implementation Libs.ROOM
-    kapt Libs.ROOM_COMPILER
+    ksp Libs.ROOM_COMPILER
     implementation Libs.ROOM_COROUTINES
 
     /* Navigation */

apps/parent/proguard-rules.txt

@@ -254,4 +254,19 @@
 -dontwarn java.beans.SimpleBeanInfo
 
 -keep class androidx.navigation.** { *; }
-    -keep interface androidx.navigation.** { *; }
+    -keep interface androidx.navigation.** { *; }
+
+# Netty and BlockHound integration
+-dontwarn reactor.blockhound.integration.BlockHoundIntegration
+-dontwarn io.netty.util.internal.Hidden$NettyBlockHoundIntegration
+-keep class reactor.blockhound.integration.** { *; }
+-keep class io.netty.util.internal.Hidden$NettyBlockHoundIntegration { *; }
+
+# Additional Netty keep rules for R8
+-dontwarn io.netty.**
+-keep class io.netty.** { *; }
+-keepclassmembers class io.netty.** { *; }
+
+# BlockHound related classes
+-dontwarn reactor.blockhound.**
+-keep class reactor.blockhound.** { *; }

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/espresso/TestAppManager.kt

@@ -17,6 +17,7 @@
 
 package com.instructure.parentapp.ui.espresso
 
+import androidx.work.DefaultWorkerFactory
 import androidx.work.WorkerFactory
 import com.instructure.pandautils.features.reminder.AlarmScheduler
 import com.instructure.parentapp.util.BaseAppManager
@@ -26,7 +27,7 @@ open class TestAppManager : BaseAppManager() {
     private var workerFactory: WorkerFactory? = null
 
     override fun getWorkManagerFactory(): WorkerFactory {
-        return workerFactory ?: WorkerFactory.getDefaultWorkerFactory()
+        return workerFactory ?: DefaultWorkerFactory
     }
 
     override fun getScheduler(): AlarmScheduler? {

apps/settings.gradle

@@ -7,7 +7,7 @@ pluginManagement {
             }
         }
         dependencies {
-            classpath("com.android.tools:r8:8.2.47")
+            classpath("com.android.tools:r8:8.13.6")
         }
     }
 }
@@ -29,7 +29,6 @@ include ':pandautils'
 include ':rceditor'
 include ':recyclerview'
 include ':pandares'
-include ':DocumentScanner'
 include ':horizon'
 
 project(':annotations').projectDir = new File(rootProject.projectDir, '/../libs/annotations')
@@ -43,5 +42,4 @@ project(':pandautils').projectDir = new File(rootProject.projectDir, '/../libs/p
 project(':rceditor').projectDir = new File(rootProject.projectDir, '/../libs/rceditor')
 project(':recyclerview').projectDir = new File(rootProject.projectDir, '/../libs/recyclerview')
 project(':pandares').projectDir = new File(rootProject.projectDir, '/../libs/pandares')
-project(':DocumentScanner').projectDir = new File(rootProject.projectDir, '/../libs/DocumentScanner')
 project(':horizon').projectDir = new File(rootProject.projectDir, '/../libs/horizon')