Skip to content

Commit

Permalink
Task: Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jarroyoesp committed Dec 3, 2024
1 parent 6687cd7 commit 2ef7430
Show file tree
Hide file tree
Showing 6 changed files with 2,405 additions and 2,386 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/generate-baseline-profile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
if: always()
with:
name: macrobenchmark-build-outputs
path: macrobenchmark/forlago/build/outputs
path: macrobenchmark/

- name: Create Pull Request
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
Expand Down
2,375 changes: 1,191 additions & 1,184 deletions apps/forlago/versions/dependencies/debugRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

2,347 changes: 1,177 additions & 1,170 deletions apps/forlago/versions/dependencies/releaseRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions apps/forlago/versions/mergedManifests/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@
android:value="androidx.startup" />
<meta-data
android:name="com.leinardi.forlago.library.logging.api.initializer.TimberInitializer"
android:value="androidx.startup" /> <!-- This entry makes ApolloInitializer discoverable. -->
<meta-data
android:name="com.apollographql.apollo.cache.normalized.sql.ApolloInitializer"
android:value="androidx.startup" />
<meta-data
android:name="androidx.emoji2.text.EmojiCompatInitializer"
Expand All @@ -113,6 +110,9 @@
android:value="androidx.startup" />
<meta-data
android:name="androidx.profileinstaller.ProfileInstallerInitializer"
android:value="androidx.startup" /> <!-- This entry makes ApolloInitializer discoverable. -->
<meta-data
android:name="com.apollographql.apollo.cache.normalized.sql.ApolloInitializer"
android:value="androidx.startup" />
</provider>

Expand Down Expand Up @@ -212,6 +212,11 @@
android:name="androidx.window.sidecar"
android:required="false" />

<activity
android:name="com.google.android.gms.common.api.GoogleApiActivity"
android:exported="false"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />

<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
Expand Down
52 changes: 26 additions & 26 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# Sharing dependency versions between projects
# https://docs.gradle.org/current/userguide/platforms.html
[versions]
aboutlibraries = "11.2.2"
accompanist = "0.35.1-alpha"
androidx-compose = "1.7.1"
aboutlibraries = "11.2.3"
accompanist = "0.36.0"
androidx-compose = "1.7.5"
androidx-compose-compiler = "1.5.15"
androidx-benchmark="1.3.2"
androidx-benchmark="1.3.3"
androidx-datastore = "1.1.1"
androidx-lifecycle = "2.8.5"
androidx-navigation = "2.8.0"
androidx-lifecycle = "2.8.7"
androidx-navigation = "2.8.4"
androidx-room = "2.6.1"
androidx-test = "1.6.1"
apollo = "4.0.0"
apollo = "4.1.0"
chucker = "4.0.0"
coroutines = "1.9.0-RC"
coroutines = "1.9.0"
dagger = "2.52"
detekt = "1.23.6"
detekt = "1.23.7"
diktat = "1.2.5"
gradle = "8.10.2"
greclipse = "4.19"
Expand All @@ -26,9 +26,9 @@ kotlinpoet = "1.18.1"
# @pin until androidx-compose-compiler supports it
ksp = "1.9.25-1.0.20"
ktlint = "0.43.0"
maps-compose = "6.1.1"
maps-compose = "6.2.0"
maps-ktx = "5.1.1"
material3 = "1.3.0"
material3 = "1.3.1"
mockk = "1.13.12"
okhttp = "4.12.0"
play-app-update = "2.1.0"
Expand All @@ -41,7 +41,7 @@ aboutlibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref
accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
android-mail = "com.sun.mail:android-mail:1.6.7"
androidx-activity-compose = "androidx.activity:activity-compose:1.9.2"
androidx-activity-compose = "androidx.activity:activity-compose:1.9.3"
androidx-appcompat = "androidx.appcompat:appcompat:1.7.0"
androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark" }
androidx-biometric = "androidx.biometric:biometric:1.2.0-alpha05"
Expand All @@ -60,8 +60,8 @@ androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androi
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose" }
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-compose" }
androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "androidx-compose" }
androidx-constraintlayout-compose = "androidx.constraintlayout:constraintlayout-compose:1.1.0-beta01"
androidx-core-ktx = "androidx.core:core-ktx:1.13.1"
androidx-constraintlayout-compose = "androidx.constraintlayout:constraintlayout-compose:1.1.0"
androidx-core-ktx = "androidx.core:core-ktx:1.15.0"
androidx-core-splashscreen = "androidx.core:core-splashscreen:1.0.1"
androidx-customview = "androidx.customview:customview:1.2.0-alpha02"
androidx-customview-poolingcontainer = "androidx.customview:customview-poolingcontainer:1.0.0"
Expand All @@ -78,19 +78,19 @@ androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" }
androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx-navigation" }
androidx-paging = "androidx.paging:paging-compose:3.3.2"
androidx-paging = "androidx.paging:paging-compose:3.3.4"
androidx-palette = "androidx.palette:palette:1.0.0"
androidx-profileinstaller = "androidx.profileinstaller:profileinstaller:1.4.1"
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" }
androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "androidx-room" }
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidx-room" }
androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "androidx-room" }
androidx-security = "androidx.security:security-crypto:1.0.0"
androidx-startup = "androidx.startup:startup-runtime:1.1.1"
androidx-startup = "androidx.startup:startup-runtime:1.2.0"
androidx-test-core = { module = "androidx.test:core-ktx", version.ref = "androidx-test" }
androidx-test-espresso-core = "androidx.test.espresso:espresso-core:3.6.1"
androidx-test-ext-junit = "androidx.test.ext:junit-ktx:1.2.1"
androidx-test-orchestrator = "androidx.test:orchestrator:1.5.0"
androidx-test-orchestrator = "androidx.test:orchestrator:1.5.1"
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
androidx-test-runner = "androidx.test:runner:1.6.2"
androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
Expand All @@ -108,18 +108,18 @@ coil-compose = "io.coil-kt:coil-compose:2.7.0"
composecharts = "io.github.bytebeats:compose-charts:0.2.1"
coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1"
coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0"
dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "dagger" }
dagger-hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "dagger" }
dagger-hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "dagger" }
dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger" }
dagger-hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "dagger" }
desugar = "com.android.tools:desugar_jdk_libs:2.1.2"
desugar = "com.android.tools:desugar_jdk_libs:2.1.3"
detekt = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
detekt-nlopez-compose-rules = "io.nlopez.compose.rules:detekt:0.4.11"
detekt-nlopez-compose-rules = "io.nlopez.compose.rules:detekt:0.4.17"
detekt-rules-compose = "ru.kode:detekt-rules-compose:1.4.0"
firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" }
firebase-bom = "com.google.firebase:firebase-bom:33.3.0"
firebase-bom = "com.google.firebase:firebase-bom:33.6.0"
firebase-config = { module = "com.google.firebase:firebase-config" }
firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
firebase-perf = { module = "com.google.firebase:firebase-perf" }
Expand All @@ -133,16 +133,16 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotl
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinpoet" }
kotlinx-collections-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
kotlinx-collections-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"
# @pin until androidx-compose-compiler supports it
kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
ksp-symbol-processing-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
leakcanary = "com.squareup.leakcanary:leakcanary-android:2.14"
lottie-compose = "com.airbnb.android:lottie-compose:6.5.1"
lottie-compose = "com.airbnb.android:lottie-compose:6.6.0"
maps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "maps-compose" }
maps-compose-utils = { module = "com.google.maps.android:maps-compose-utils", version.ref = "maps-compose" }
maps-ktx = { module = "com.google.maps.android:maps-ktx", version.ref = "maps-ktx" }
maps-utils = "com.google.maps.android:android-maps-utils:3.8.2"
maps-utils = "com.google.maps.android:android-maps-utils:3.9.0"
maps-utils-ktx = { module = "com.google.maps.android:maps-utils-ktx", version.ref = "maps-ktx" }
material = "com.google.android.material:material:1.12.0"
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
Expand All @@ -160,9 +160,9 @@ robolectric = "org.robolectric:robolectric:4.13"
seismic = "com.squareup:seismic:1.0.3"
speeddial = "com.leinardi.android:speed-dial.compose:2.0.0-alpha01"
timber = "com.jakewharton.timber:timber:5.0.1"
tink = "com.google.crypto.tink:tink-android:1.14.1"
tink = "com.google.crypto.tink:tink-android:1.15.0"
turingcomplete-onetimepassword = "dev.turingcomplete:kotlin-onetimepassword:2.4.1"
zoomable = "net.engawapg.lib:zoomable:1.6.1"
zoomable = "net.engawapg.lib:zoomable:1.6.2"

# plugins
plugin-aboutlibraries = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlibraries" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ fun <T> NavHostController.setResult(key: String, value: T): Boolean = previousBa

@Composable
fun <T : NavigationDestination.Result> NavHostController.observeResult(key: String, onResult: (T) -> Unit): Boolean =
currentBackStackEntry?.let { entry ->
entry.savedStateHandle.getLiveData<T>(key).observe(LocalLifecycleOwner.current) { result ->
currentBackStackEntry?.run {
savedStateHandle.getLiveData<T>(key).observe(LocalLifecycleOwner.current) { result ->
if (!result.consumed) {
result.consumed = true
onResult(result)
Expand Down

0 comments on commit 2ef7430

Please sign in to comment.