Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dependabot/gradle/gradle-minor-d…
Browse files Browse the repository at this point in the history
…ependencies-21cc5b68d7' into fusionauth-1.52.1

# Conflicts:
#	app/build.gradle.kts
  • Loading branch information
Aaron-Ritter committed Dec 23, 2024
2 parents 61c6d79 + 83522f5 commit 548c0a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ dependencies {
implementation("androidx.constraintlayout:constraintlayout:2.2.0")
implementation("androidx.navigation:navigation-fragment-ktx:2.8.5")
implementation("androidx.navigation:navigation-ui-ktx:2.8.5")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
implementation("androidx.browser:browser:1.8.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
annotationProcessor("androidx.room:room-compiler:2.6.1")
Expand Down
4 changes: 2 additions & 2 deletions library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
implementation("net.openid:appauth:0.11.1")
implementation("androidx.security:security-crypto-ktx:1.1.0-alpha06")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
Expand Down

0 comments on commit 548c0a5

Please sign in to comment.