Skip to content
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0816c89
[Infra] Bump kotlin and related deps to 2.0.21
rlazo Jul 3, 2025
fecdf64
Update kapt to a version supporting kotlin2
rlazo Jul 3, 2025
062d564
Bump dagger to the last version supporting kotlin 2.0
rlazo Jul 3, 2025
a0c44ca
Fix issue preveting crashlytics-ndk from compile
rlazo Jul 4, 2025
0d20bd8
Merge branch 'main' into rl.bump.kotlin.2021
rlazo Jul 4, 2025
d4f9752
Fix format
rlazo Jul 4, 2025
b44962d
Fix smoke-tests
rlazo Jul 4, 2025
1be2033
Merge branch 'main' into rl.bump.kotlin.2021
rlazo Jul 4, 2025
f144e57
Fix errors in lint tests
rlazo Jul 5, 2025
aa3df90
Address usage of API 24 within perf
rlazo Jul 5, 2025
0cab42a
Reduce mockk bump to prevent bug in spyk
rlazo Jul 5, 2025
b1707cc
Bump mockito dependencies
rlazo Jul 7, 2025
fa58d50
Bump jacoco dependency
rlazo Jul 7, 2025
f362d77
Remove unnecessary mockito-inline dep
rlazo Jul 7, 2025
46bacc7
Add missing mock dependency in appdistro
rlazo Jul 7, 2025
b6d44df
Address appdistro test bug
rlazo Jul 7, 2025
250dc43
Merge branch 'main' into rl.bump.kotlin.2021
rlazo Jul 7, 2025
5a09fc8
Merge branch 'main' into rl.bump.kotlin.2021
rlazo Jul 7, 2025
18465b6
Reduce dagger version bump
rlazo Jul 7, 2025
d567cc6
Address sessions breakage
rlazo Jul 7, 2025
0dd1816
Undo kapt update
rlazo Jul 8, 2025
a5c5bea
Use non-deprecated reflector in FCM
rlazo Jul 8, 2025
eff1c7d
Replace hardcoded android.annotation declarations with catalog
rlazo Jul 8, 2025
8a2b11f
Fix format
rlazo Jul 8, 2025
2888611
Fix fiam-display test blocking robolectric blocking
rlazo Jul 8, 2025
f9bc4f6
Update sessions to handle null fid correctly
rlazo Jul 8, 2025
0d8bc74
Bump transport deps
rlazo Jul 8, 2025
c214f1c
Remove ktx and unbump robolectric
rlazo Jul 8, 2025
ad4e093
Merge branch 'main' into rl.bump.kotlin.2021
rlazo Jul 8, 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
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ plugins {
alias(libs.plugins.protobuf) apply false
alias(libs.plugins.errorprone)
alias(libs.plugins.crashlytics) apply false
alias(libs.plugins.kapt) apply false
id("PublishingPlugin")
id("firebase-ci")
id("smoke-tests")
Expand Down
2 changes: 1 addition & 1 deletion firebase-sessions/firebase-sessions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
id("firebase-library")
id("firebase-vendor")
id("kotlin-android")
id("kotlin-kapt")
alias(libs.plugins.kapt)
}

firebaseLibrary {
Expand Down
13 changes: 7 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ cardview = "1.0.0"
checkerQual = "2.5.2"
constraintlayout = "2.1.4"
coreKtx = "1.12.0"
coroutines = "1.7.3"
dagger = "2.43.2"
coroutines = "1.9.0"
dagger = "2.55"
datastore = "1.1.3"
dexmaker = "2.28.1"
dexmakerVersion = "1.2"
Expand All @@ -45,16 +45,16 @@ javalite = "3.25.5"
jsonassert = "1.5.0"
kotest = "5.9.0" # Do not use 5.9.1 because it reverts the fix for https://github.com/kotest/kotest/issues/3981
kotestAssertionsCore = "5.8.1"
kotlin = "1.8.22"
ktorVersion = "2.3.2"
kotlin = "2.0.21"
ktorVersion = "3.0.3"
legacySupportV4 = "1.0.0"
lifecycleProcess = "2.3.1"
material = "1.12.0"
mavenResolverApi = "1.9.23"
mavenResolverProvider = "3.9.9"
mockito = "5.2.0"
mockitoAndroid = "3.4.0"
mockk = "1.13.11"
mockk = "1.14.2" # Do not use 1.14.3 or above since it bumps kotlin to 2.1.x
playServicesCloudMessaging = "17.2.0"
playServicesStats = "17.0.2"
playServicesVision = "20.1.3"
Expand All @@ -68,7 +68,7 @@ robolectric = "4.12"
runner = "1.0.2"
rxandroid = "2.0.2"
rxjava = "2.1.14"
serialization = "1.5.1"
serialization = "1.7.3"
slf4jNop = "2.0.9"
spotless = "7.0.4"
testServices = "1.2.0"
Expand Down Expand Up @@ -240,3 +240,4 @@ protobuf = { id = "com.google.protobuf", version.ref = "protobufGradlePlugin" }
errorprone = { id = "net.ltgt.errorprone", version.ref = "gradleErrorpronePlugin" }
google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }
crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsGradle" }
kapt = { id = "org.jetbrains.kotlin.kapt", version = "2.1.20"}
2 changes: 1 addition & 1 deletion subprojects.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ firebase-config:test-app
firebase-config-interop
firebase-crashlytics
firebase-crashlytics:ktx
firebase-crashlytics-ndk
# firebase-crashlytics-ndk
firebase-database
firebase-database:ktx
firebase-database-collection
Expand Down
Loading