Skip to content

Bump com.google.android.gms:play-services-base from 18.6.0 to 18.7.0 #3018

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
FlowCryptRobot merged 6 commits into from
Apr 21, 2025
Merged

Bump com.google.android.gms:play-services-base from 18.6.0 to 18.7.0 #3018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bce64a8
Bump com.google.android.gms:play-services-base from 18.6.0 to 18.7.0
dependabot[bot] Apr 20, 2025
e58e83a
Merge branch 'master' into dependabot/gradle/com.google.android.gms-p…
DenBond7 Apr 21, 2025
77ec153
wip
DenBond7 Apr 21, 2025
5d4b45c
Merge branch 'master' into dependabot/gradle/com.google.android.gms-p…
DenBond7 Apr 21, 2025
e6a5cda
wip
DenBond7 Apr 21, 2025
52b5086
wip
DenBond7 Apr 21, 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
5 changes: 4 additions & 1 deletion FlowCrypt/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ android {
}

compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
Expand Down Expand Up @@ -397,6 +398,8 @@ dependencies {
ksp("dev.zacsweers.autoservice:auto-service-ksp:1.2.0")
ksp("com.google.auto.service:auto-service:1.1.1")

coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")

devDebugImplementation("com.squareup.leakcanary:leakcanary-android:2.14")
//uiTests is the build type for testing.
//noinspection FragmentGradleConfiguration
Expand Down Expand Up @@ -463,7 +466,7 @@ dependencies {
implementation("androidx.navigation:navigation-runtime-ktx:2.8.9")
implementation("androidx.webkit:webkit:1.13.0")

implementation("com.google.android.gms:play-services-base:18.6.0")
implementation("com.google.android.gms:play-services-base:18.7.0")
implementation("com.google.android.gms:play-services-auth:21.3.0")
implementation("com.google.android.material:material:1.12.0")
implementation("com.google.android.flexbox:flexbox:3.0.0")
Expand Down
4 changes: 2 additions & 2 deletions FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseSignTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
* Contributors: DenBond7
* Contributors: denbond7
*/

package com.flowcrypt.email.ui.base
Expand Down Expand Up @@ -35,7 +35,7 @@ abstract class BaseSignTest : BaseTest() {

protected fun setupAndClickSignInButton(signInAccountJson: String) {
val intent = Intent()
intent.putExtra("googleSignInAccount", GoogleSignInAccount.zab(signInAccountJson))
intent.putExtra("googleSignInAccount", GoogleSignInAccount.zaa(signInAccountJson))

val signInIntent = GoogleSignIn.getClient(
getTargetContext(),
Expand Down