Skip to content

[MBL-19571][All] Dependency update #3446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tamaskozmer merged 7 commits into from
Dec 19, 2025
Merged

[MBL-19571][All] Dependency update #3446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
56f4406
Tooling and language updates
tamaskozmer Dec 11, 2025
bf3fa1f
Android and Firebase dependencies.
tamaskozmer Dec 12, 2025
8236a01
Other dependencies.
tamaskozmer Dec 15, 2025
e7df107
PSPDFKit
tamaskozmer Dec 15, 2025
0b88361
Removed failing test.
tamaskozmer Dec 15, 2025
24af880
Fixed failing test.
tamaskozmer Dec 16, 2025
8f62667
Revert PSPDFKit update
tamaskozmer Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ repositories {
mavenCentral()
}

val agpVersion= "8.6.1"
val kotlinVersion = "2.0.21"
val agpVersion= "8.13.2"
val kotlinVersion = "2.2.21"

dependencies {
implementation("com.android.tools.build:gradle:$agpVersion")
Expand Down
68 changes: 34 additions & 34 deletions apps/buildSrc/src/main/java/GlobalDependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@

object Versions {
/* SDK Versions */
const val COMPILE_SDK = 35
const val COMPILE_SDK = 36
const val MIN_SDK = 28
const val TARGET_SDK = 35

/* Build/tooling */
const val ANDROID_GRADLE_TOOLS = "8.6.1"
const val ANDROID_GRADLE_TOOLS = "8.13.2"
const val BUILD_TOOLS = "35.0.0"

/* Testing */
const val JUNIT = "4.13.2"
const val ROBOLECTRIC = "4.13"
const val ROBOLECTRIC = "4.16"
const val JACOCO_ANDROID = "0.1.5"

/* Kotlin */
const val KOTLIN = "2.0.21"
const val KOTLIN_COROUTINES = "1.9.0"
const val KSP = "2.0.21-1.0.27"
const val KOTLIN = "2.2.21"
const val KOTLIN_COROUTINES = "1.10.2"
const val KSP = "2.2.21-2.0.4"

/* Google, Play Services */
const val GOOGLE_SERVICES = "4.4.3"
Expand All @@ -30,18 +30,18 @@ object Versions {
const val MOBIUS = "1.2.1"
const val HILT = "2.57.2"
const val HILT_ANDROIDX = "1.3.0"
const val LIFECYCLE = "2.9.4"
const val LIFECYCLE = "2.10.0"
const val FRAGMENT = "1.8.9"
const val WORK_MANAGER = "2.10.5"
const val WORK_MANAGER = "2.11.0"
const val GLIDE_VERSION = "5.0.5"
const val RETROFIT = "2.11.0"
const val RETROFIT = "3.0.0"
const val OKHTTP = "4.12.0"
const val ROOM = "2.7.0"
const val ROOM = "2.8.4"
const val HAMCREST = "3.0"
const val NAVIGATION = "2.9.5"
const val NAVIGATION = "2.9.6"
const val MEDIA3 = "1.8.0"
const val DATASTORE = "1.1.7"
const val LOTTIE = "6.6.6"
const val DATASTORE = "1.2.0"
const val LOTTIE = "6.7.0"
const val ENCRYPTED_SHARED_PREFERENCES = "1.1.0"
const val JAVA_JWT = "4.5.0"
const val GLANCE = "1.1.1"
Expand All @@ -61,31 +61,30 @@ object Libs {
const val APOLLO_HTTP_CACHE = "com.apollographql.apollo:apollo-http-cache:${Versions.APOLLO}"

/* Androidx libraries */
const val ANDROIDX_ANNOTATION = "androidx.annotation:annotation:1.9.0"
const val ANDROIDX_APPCOMPAT = "androidx.appcompat:appcompat:1.7.0"
const val ANDROIDX_BROWSER = "androidx.browser:browser:1.8.0"
const val ANDROIDX_ANNOTATION = "androidx.annotation:annotation:1.9.1"
const val ANDROIDX_APPCOMPAT = "androidx.appcompat:appcompat:1.7.1"
const val ANDROIDX_BROWSER = "androidx.browser:browser:1.9.0"
const val ANDROIDX_CARDVIEW = "androidx.cardview:cardview:1.0.0"
const val ANDROIDX_CONSTRAINT_LAYOUT = "androidx.constraintlayout:constraintlayout:2.2.0"
const val ANDROIDX_EXIF = "androidx.exifinterface:exifinterface:1.3.7"
const val ANDROIDX_CONSTRAINT_LAYOUT = "androidx.constraintlayout:constraintlayout:2.2.1"
const val ANDROIDX_EXIF = "androidx.exifinterface:exifinterface:1.4.2"
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.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_SWIPE_REFRESH_LAYOUT = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.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_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 ANDROIDX_WEBKIT = "androidx.webkit:webkit:1.14.0"
const val ANDROIDX_COMPOSE_ACTIVITY = "androidx.activity:activity-compose:1.12.1"
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:34.3.0"
const val FIREBASE_BOM = "com.google.firebase:firebase-bom:34.6.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"
Expand All @@ -105,11 +104,12 @@ object Libs {
/* Testing */
const val JUNIT = "junit:junit:${Versions.JUNIT}"
const val ROBOLECTRIC = "org.robolectric:robolectric:${Versions.ROBOLECTRIC}"
const val ANDROIDX_TEST_JUNIT = "androidx.test.ext:junit:1.2.1"
const val MOCKK = "io.mockk:mockk:1.13.13"
const val THREETEN_BP = "org.threeten:threetenbp:1.7.0"
const val ANDROIDX_TEST_JUNIT = "androidx.test.ext:junit:1.3.0"
const val MOCKK = "io.mockk:mockk:1.14.7"
const val THREETEN_BP = "org.threeten:threetenbp:1.7.2"
const val UI_AUTOMATOR = "androidx.test.uiautomator:uiautomator:2.3.0"
const val TEST_ORCHESTRATOR = "androidx.test:orchestrator:1.5.1"
const val TEST_ORCHESTRATOR = "androidx.test:orchestrator:1.6.1"
const val HAMCREST = "org.hamcrest:hamcrest:${Versions.HAMCREST}"

/* Qr Code (zxing) */
const val JOURNEY_ZXING = "com.journeyapps:zxing-android-embedded:4.3.0"
Expand All @@ -130,7 +130,7 @@ object Libs {
const val VIEW_MODE_SAVED_STATE = "androidx.lifecycle:lifecycle-viewmodel-savedstate:${Versions.LIFECYCLE}"
const val LIFECYCLE_COMPILER = "androidx.lifecycle:lifecycle-compiler:${Versions.LIFECYCLE}"
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 NUTRIENT = "io.nutrient:nutrient:${Versions.NUTRIENT}"
const val MEDIA3 = "androidx.media3:media3-exoplayer:${Versions.MEDIA3}"
Expand All @@ -156,29 +156,29 @@ object Libs {
const val OKHTTP = "com.squareup.okhttp3:okhttp:${Versions.OKHTTP}"
const val OKHTTP_LOGGING = "com.squareup.okhttp3:logging-interceptor:${Versions.OKHTTP}"
const val OKHTTP_URL_CONNECTION = "com.squareup.okhttp3:okhttp-urlconnection:${Versions.OKHTTP}"
const val OKIO = "com.squareup.okio:okio:3.9.1"
const val OKIO = "com.squareup.okio:okio:3.16.2"

/* Other */
const val LOTTIE = "com.airbnb.android:lottie:${Versions.LOTTIE}"
const val LOTTIE_COMPOSE = "com.airbnb.android:lottie-compose:${Versions.LOTTIE}"
const val SLIDING_UP_PANEL = "com.sothree.slidinguppanel:library:3.3.1"
const val DISK_LRU_CACHE = "com.jakewharton:disklrucache:2.0.2"
const val EVENTBUS = "org.greenrobot:eventbus:3.3.1"
const val JW_THREETEN_BP = "com.jakewharton.threetenabp:threetenabp:1.4.6"
const val JW_THREETEN_BP = "com.jakewharton.threetenabp:threetenabp:1.4.9"
const val PROCESS_PHOENIX = "com.jakewharton:process-phoenix:2.1.2"
const val KEYBOARD_VISIBILITY_LISTENER = "net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:2.2.1"
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 JAVA_JWT = "com.auth0:java-jwt:${Versions.JAVA_JWT}"

const val PENDO = "sdk.pendo.io:pendoIO:3.7.+"
const val PENDO = "sdk.pendo.io:pendoIO:3.9.+"

/* Database */
const val ROOM = "androidx.room:room-runtime:${Versions.ROOM}"
const val ROOM_COMPILER = "androidx.room:room-compiler:${Versions.ROOM}"
const val ROOM_COROUTINES = "androidx.room:room-ktx:${Versions.ROOM}"
const val ROOM_TEST = "androidx.room:room-testing:${Versions.ROOM}"

const val HAMCREST = "org.hamcrest:hamcrest:${Versions.HAMCREST}"

const val RRULE = "org.scala-saddle:google-rfc-2445:20110304"

// Compose
Expand Down Expand Up @@ -207,7 +207,7 @@ object Libs {
const val NAVIGATION_KTX = "androidx.navigation:navigation-ui-ktx:${Versions.NAVIGATION}"
const val NAVIGATION_COMPOSE = "androidx.navigation:navigation-compose:${Versions.NAVIGATION}"

const val KOTLIN_SERIALIZABLE = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
const val KOTLIN_SERIALIZABLE = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
}

object Plugins {
Expand Down
2 changes: 1 addition & 1 deletion apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/HelpMenuE2ETest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class HelpMenuE2ETest: TeacherTest() {
try {
helpPage.assertHelpMenuURL("Search the Canvas Guides", "https://community.canvaslms.com/t5/Canvas/ct-p/canvas")
helpPage.assertHelpMenuURL("Submit a Feature Idea", "https://community.canvaslms.com/t5/Idea-Conversations/idb-p/ideas")
helpPage.assertHelpMenuURL("Ask the Community", "https://community.canvaslms.com/community/answers")
helpPage.assertHelpMenuURL("Ask the Community", "https://community.instructure.com")
helpPage.assertHelpMenuURL("Conference Guides for Remote Classrooms", "https://community.canvaslms.com/docs/DOC-18572-conferences-resources")
helpPage.assertHelpMenuURL("Share Your Love for the App", "https://community.canvaslms.com/t5/Canvas/ct-p/canvas")
}
Expand Down
5 changes: 2 additions & 3 deletions apps/teacher/src/main/java/com/instructure/teacher/mobius/common/ui/MobiusFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import com.spotify.mobius.Update
import com.spotify.mobius.android.MobiusAndroid
import com.spotify.mobius.android.runners.MainThreadWorkRunner
import com.spotify.mobius.functions.Consumer
import kotlinx.android.extensions.LayoutContainer

abstract class MobiusFragment<MODEL, EVENT, EFFECT, VIEW : MobiusView<VIEW_STATE, EVENT, BINDING>, VIEW_STATE, BINDING: ViewBinding> : BaseCanvasFragment() {
var overrideInitModel: MODEL? = null
Expand Down Expand Up @@ -150,14 +149,14 @@ abstract class MobiusView<VIEW_STATE, EVENT, BINDING : ViewBinding>(
layoutInflater: LayoutInflater,
bindingInflater: (layoutInflater: LayoutInflater) -> BINDING,
private val parent: ViewGroup
) : Connectable<VIEW_STATE, EVENT>, LayoutContainer {
) : Connectable<VIEW_STATE, EVENT> {

private var _binding: BINDING? = bindingInflater(layoutInflater)

val binding: BINDING
get() = _binding!!

override val containerView: View?
val containerView: View?
get() = binding.root

var connection: Connection<VIEW_STATE>? = null
Expand Down
29 changes: 12 additions & 17 deletions libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/unit/WeaveCoroutineTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,18 @@ package com.instructure.canvasapi2.unit

import com.instructure.canvasapi2.utils.DataResult
import com.instructure.canvasapi2.utils.WeaveTestManager
import com.instructure.canvasapi2.utils.weave.*
import io.mockk.*
import com.instructure.canvasapi2.utils.weave.WeaveCoroutine
import com.instructure.canvasapi2.utils.weave.apiAsync
import com.instructure.canvasapi2.utils.weave.awaitApi
import com.instructure.canvasapi2.utils.weave.catch
import com.instructure.canvasapi2.utils.weave.inParallel
import com.instructure.canvasapi2.utils.weave.tryWeave
import com.instructure.canvasapi2.utils.weave.weave
import io.mockk.coEvery
import io.mockk.every
import io.mockk.mockk
import io.mockk.mockkStatic
import io.mockk.unmockkStatic
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.test.setMain
Expand Down Expand Up @@ -245,21 +255,6 @@ class WeaveCoroutineTest : Assert() {
assertNotNull(exception)*/
}

@Test
fun performsOnUI() {
var count = 0
weave {
repeat(5) {
onUI {
synchronized(count) { count++ }
}
}
// onUI is async and not suspending, so we delay for a bit to avoid a race condition
delay(50)
}.blockWithTimeout()
assertEquals(5, count)
}

@Test
fun cancelsImmediatelyWithoutRunning() {
var hasRun = false
Expand Down
2 changes: 1 addition & 1 deletion libs/pandautils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ dependencies {
implementation Libs.LIVE_DATA
implementation Libs.VIEW_MODEL
implementation project(':rceditor')
implementation Libs.COMPOSE_NAVIGATION
implementation Libs.NAVIGATION_COMPOSE


/* Test Dependencies */
Expand Down
Loading