diff --git a/CHANGELOG.md b/CHANGELOG.md index ee312797e49..82809ebd42f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## XX.XX.XX - 2023-XX-XX +Dependencies updated in [8381](https://github.com/stripe/stripe-android/pull/8381): +* Bumped Play Services Wallet from 19.2.1 to 19.3.0. + ## 20.41.1 - 2024-04-22 ### PaymentSheet diff --git a/dependencies.gradle b/dependencies.gradle index 8d880e3bbdc..d38dd855bcc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -57,7 +57,7 @@ ext.versions = [ places : '3.3.0', playServicesCoroutines : '1.7.3', playServicesTfLite : '16.0.1', - playServicesWallet : '19.2.1', + playServicesWallet : '19.3.0', retrofit : '2.9.0', robolectric : '4.11.1', shot : '5.14.1', diff --git a/example/dependencies/dependencies.txt b/example/dependencies/dependencies.txt index 2e3a8252c83..6ae79a35777 100644 --- a/example/dependencies/dependencies.txt +++ b/example/dependencies/dependencies.txt @@ -705,30 +705,30 @@ | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) -| | | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 -| | | | \--- com.google.android.gms:play-services-basement:18.0.0 +| | | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 +| | | | \--- com.google.android.gms:play-services-basement:18.3.0 | | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) -| | | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) +| | | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) | | +--- com.google.android.material:material:1.11.0 (*) -| | +--- com.google.android.gms:play-services-wallet:19.2.1 +| | +--- com.google.android.gms:play-services-wallet:19.3.0 | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-base:18.0.1 +| | | +--- com.google.android.gms:play-services-base:18.3.0 | | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) -| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) +| | | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) | | | +--- com.google.android.gms:play-services-identity:18.0.1 -| | | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | | | +--- com.google.android.gms:play-services-maps:18.0.2 | | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) | | +--- com.google.android.instantapps:instantapps:1.1.0 | | +--- com.stripe:stripe-3ds2-android:6.1.8 | | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*) @@ -943,9 +943,9 @@ | | | +--- androidx.compose.ui:ui:1.5.0 -> 1.5.4 (*) | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*) | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 -> 1.9.10 (*) -| | +--- com.google.android.gms:play-services-wallet:19.2.1 (*) +| | +--- com.google.android.gms:play-services-wallet:19.3.0 (*) | | +--- com.google.pay.button:compose-pay-button:0.1.3 -| | | +--- com.google.android.gms:play-services-wallet:19.2.1 (*) +| | | +--- com.google.android.gms:play-services-wallet:19.2.1 -> 19.3.0 (*) | | | +--- androidx.compose.ui:ui:1.5.4 (*) | | | +--- androidx.compose.material:material:1.5.4 (*) | | | +--- androidx.core:core-ktx:1.12.0 (*) @@ -1027,7 +1027,7 @@ | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.10 (*) | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.10 (*) +--- com.google.android.material:material:1.11.0 (*) -+--- com.google.android.gms:play-services-wallet:19.2.1 (*) ++--- com.google.android.gms:play-services-wallet:19.3.0 (*) +--- com.squareup.okio:okio:3.7.0 (*) +--- com.squareup.retrofit2:retrofit:2.9.0 | \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.12.0 (*) diff --git a/financial-connections-example/dependencies/dependencies.txt b/financial-connections-example/dependencies/dependencies.txt index baab36db41c..f90c27a1cf2 100644 --- a/financial-connections-example/dependencies/dependencies.txt +++ b/financial-connections-example/dependencies/dependencies.txt @@ -815,30 +815,30 @@ | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) -| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 -| | | \--- com.google.android.gms:play-services-basement:18.0.0 +| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 +| | | \--- com.google.android.gms:play-services-basement:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) -| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) +| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) | +--- com.google.android.material:material:1.11.0 (*) -| +--- com.google.android.gms:play-services-wallet:19.2.1 +| +--- com.google.android.gms:play-services-wallet:19.3.0 | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | +--- com.google.android.gms:play-services-base:18.0.1 +| | +--- com.google.android.gms:play-services-base:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) -| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) +| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +| | +--- com.google.android.gms:play-services-basement:18.3.0 (*) | | +--- com.google.android.gms:play-services-identity:18.0.1 -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | | +--- com.google.android.gms:play-services-maps:18.0.2 | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) | +--- com.google.android.instantapps:instantapps:1.1.0 | +--- com.stripe:stripe-3ds2-android:6.1.8 | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*) diff --git a/link/dependencies/dependencies.txt b/link/dependencies/dependencies.txt index 134b16e92fe..50a777b6a52 100644 --- a/link/dependencies/dependencies.txt +++ b/link/dependencies/dependencies.txt @@ -696,30 +696,30 @@ | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) -| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 -| | | \--- com.google.android.gms:play-services-basement:18.0.0 +| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 +| | | \--- com.google.android.gms:play-services-basement:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) -| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) +| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) | +--- com.google.android.material:material:1.11.0 (*) -| +--- com.google.android.gms:play-services-wallet:19.2.1 +| +--- com.google.android.gms:play-services-wallet:19.3.0 | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | +--- com.google.android.gms:play-services-base:18.0.1 +| | +--- com.google.android.gms:play-services-base:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) -| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) +| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +| | +--- com.google.android.gms:play-services-basement:18.3.0 (*) | | +--- com.google.android.gms:play-services-identity:18.0.1 -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | | +--- com.google.android.gms:play-services-maps:18.0.2 | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) | +--- com.google.android.instantapps:instantapps:1.1.0 | +--- com.stripe:stripe-3ds2-android:6.1.8 | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*) diff --git a/network-testing/dependencies/dependencies.txt b/network-testing/dependencies/dependencies.txt index 1e7495d894b..feb5a86bc19 100644 --- a/network-testing/dependencies/dependencies.txt +++ b/network-testing/dependencies/dependencies.txt @@ -683,30 +683,30 @@ | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) -| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 -| | | \--- com.google.android.gms:play-services-basement:18.0.0 +| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 +| | | \--- com.google.android.gms:play-services-basement:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) -| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) +| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) | +--- com.google.android.material:material:1.11.0 (*) -| +--- com.google.android.gms:play-services-wallet:19.2.1 +| +--- com.google.android.gms:play-services-wallet:19.3.0 | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | +--- com.google.android.gms:play-services-base:18.0.1 +| | +--- com.google.android.gms:play-services-base:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) -| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) +| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +| | +--- com.google.android.gms:play-services-basement:18.3.0 (*) | | +--- com.google.android.gms:play-services-identity:18.0.1 -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | | +--- com.google.android.gms:play-services-maps:18.0.2 | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) | +--- com.google.android.instantapps:instantapps:1.1.0 | +--- com.stripe:stripe-3ds2-android:6.1.8 | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*) diff --git a/payment-method-messaging/dependencies/dependencies.txt b/payment-method-messaging/dependencies/dependencies.txt index 9a1a9e89305..b7a99f0ed8c 100644 --- a/payment-method-messaging/dependencies/dependencies.txt +++ b/payment-method-messaging/dependencies/dependencies.txt @@ -695,30 +695,30 @@ | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) -| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 -| | | \--- com.google.android.gms:play-services-basement:18.0.0 +| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 +| | | \--- com.google.android.gms:play-services-basement:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) -| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) +| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) | +--- com.google.android.material:material:1.11.0 (*) -| +--- com.google.android.gms:play-services-wallet:19.2.1 +| +--- com.google.android.gms:play-services-wallet:19.3.0 | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | +--- com.google.android.gms:play-services-base:18.0.1 +| | +--- com.google.android.gms:play-services-base:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) -| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) +| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +| | +--- com.google.android.gms:play-services-basement:18.3.0 (*) | | +--- com.google.android.gms:play-services-identity:18.0.1 -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | | +--- com.google.android.gms:play-services-maps:18.0.2 | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) | +--- com.google.android.instantapps:instantapps:1.1.0 | +--- com.stripe:stripe-3ds2-android:6.1.8 | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*) diff --git a/payments-core-testing/dependencies/dependencies.txt b/payments-core-testing/dependencies/dependencies.txt index e2846b4132b..39431200c41 100644 --- a/payments-core-testing/dependencies/dependencies.txt +++ b/payments-core-testing/dependencies/dependencies.txt @@ -675,30 +675,30 @@ | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) -| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 -| | | \--- com.google.android.gms:play-services-basement:18.0.0 +| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 +| | | \--- com.google.android.gms:play-services-basement:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) -| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) +| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) | +--- com.google.android.material:material:1.11.0 (*) -| +--- com.google.android.gms:play-services-wallet:19.2.1 +| +--- com.google.android.gms:play-services-wallet:19.3.0 | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | +--- com.google.android.gms:play-services-base:18.0.1 +| | +--- com.google.android.gms:play-services-base:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) -| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) +| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +| | +--- com.google.android.gms:play-services-basement:18.3.0 (*) | | +--- com.google.android.gms:play-services-identity:18.0.1 -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | | +--- com.google.android.gms:play-services-maps:18.0.2 | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) | +--- com.google.android.instantapps:instantapps:1.1.0 | +--- com.stripe:stripe-3ds2-android:6.1.8 | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*) diff --git a/payments-core/dependencies/dependencies.txt b/payments-core/dependencies/dependencies.txt index 27358e2d024..ff9a2aa44da 100644 --- a/payments-core/dependencies/dependencies.txt +++ b/payments-core/dependencies/dependencies.txt @@ -671,30 +671,30 @@ +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) -| +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 -| | \--- com.google.android.gms:play-services-basement:18.0.0 +| +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 +| | \--- com.google.android.gms:play-services-basement:18.3.0 | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) -| | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) +| | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) +--- com.google.android.material:material:1.11.0 (*) -+--- com.google.android.gms:play-services-wallet:19.2.1 ++--- com.google.android.gms:play-services-wallet:19.3.0 | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| +--- com.google.android.gms:play-services-base:18.0.1 +| +--- com.google.android.gms:play-services-base:18.3.0 | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) -| +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | +--- com.google.android.gms:play-services-basement:18.3.0 (*) +| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +| +--- com.google.android.gms:play-services-basement:18.3.0 (*) | +--- com.google.android.gms:play-services-identity:18.0.1 -| | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | \--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | +--- com.google.android.gms:play-services-maps:18.0.2 | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | \--- com.google.android.gms:play-services-basement:18.0.0 (*) -| \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +--- com.google.android.instantapps:instantapps:1.1.0 +--- com.stripe:stripe-3ds2-android:6.1.8 | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*) diff --git a/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayLauncherActivity.kt b/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayLauncherActivity.kt index 41cab64add7..099e3fc5171 100644 --- a/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayLauncherActivity.kt +++ b/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayLauncherActivity.kt @@ -8,9 +8,13 @@ import androidx.core.os.bundleOf import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import com.google.android.gms.tasks.Task +import com.google.android.gms.common.api.CommonStatusCodes import com.google.android.gms.wallet.AutoResolveHelper import com.google.android.gms.wallet.PaymentData +import com.google.android.gms.wallet.contract.ApiTaskResult +import com.google.android.gms.wallet.contract.TaskResultContracts.GetPaymentDataResult +import com.stripe.android.StripePaymentController.Companion.PAYMENT_REQUEST_CODE +import com.stripe.android.StripePaymentController.Companion.SETUP_REQUEST_CODE import com.stripe.android.model.PaymentMethodCreateParams import com.stripe.android.model.StripeIntent import com.stripe.android.payments.core.analytics.ErrorReporter @@ -65,11 +69,15 @@ internal class GooglePayLauncherActivity : AppCompatActivity() { } } + val googlePayLauncher = registerForActivityResult(GetPaymentDataResult()) { + onGooglePayResult(it) + } + lifecycleScope.launch { repeatOnLifecycle(Lifecycle.State.RESUMED) { viewModel.googlePayLaunchTask.collect { task -> if (task != null) { - payWithGoogle(task) + googlePayLauncher.launch(task) viewModel.markTaskAsLaunched() } } @@ -82,82 +90,79 @@ internal class GooglePayLauncherActivity : AppCompatActivity() { fadeOut() } - private fun payWithGoogle(task: Task) { - AutoResolveHelper.resolveTask( - task, - this, - LOAD_PAYMENT_DATA_REQUEST_CODE - ) - } - - @Deprecated("Deprecated in Java") - public override fun onActivityResult( - requestCode: Int, - resultCode: Int, - data: Intent? - ) { - super.onActivityResult(requestCode, resultCode, data) - if (requestCode == LOAD_PAYMENT_DATA_REQUEST_CODE) { - when (resultCode) { - RESULT_OK -> { - onGooglePayResult(data) - } - RESULT_CANCELED -> { - viewModel.updateResult( - GooglePayLauncher.Result.Canceled - ) - } - AutoResolveHelper.RESULT_ERROR -> { - val status = AutoResolveHelper.getStatusFromIntent(data) - val statusMessage = status?.statusMessage.orEmpty() + private fun onGooglePayResult(taskResult: ApiTaskResult) { + when (taskResult.status.statusCode) { + CommonStatusCodes.SUCCESS -> { + val result = taskResult.result + if (result != null) { + val paymentDataJson = JSONObject(result.toJson()) + val params = PaymentMethodCreateParams.createFromGooglePay(paymentDataJson) + val host = AuthActivityStarterHost.create(this) + viewModel.confirmStripeIntent(host, params) + } else { + errorReporter.report(ErrorReporter.UnexpectedErrorEvent.GOOGLE_PAY_MISSING_INTENT_DATA) viewModel.updateResult( GooglePayLauncher.Result.Failed( RuntimeException( - "Google Pay failed with error: $statusMessage" + "Google Pay missing result data." ) ) ) - errorReporter.report( - ErrorReporter.ExpectedErrorEvent.GOOGLE_PAY_FAILED, - additionalNonPiiParams = mapOf("status_message" to statusMessage) - ) } - else -> { - errorReporter.report(ErrorReporter.UnexpectedErrorEvent.GOOGLE_PAY_UNEXPECTED_RESULT_CODE) - viewModel.updateResult( - GooglePayLauncher.Result.Failed( - RuntimeException( - "Google Pay returned an unexpected result code." - ) + } + + CommonStatusCodes.CANCELED -> { + viewModel.updateResult( + GooglePayLauncher.Result.Canceled + ) + } + + AutoResolveHelper.RESULT_ERROR -> { + val status = taskResult.status + val statusMessage = status.statusMessage.orEmpty() + val statusCode = status.statusCode.toString() + errorReporter.report( + ErrorReporter.ExpectedErrorEvent.GOOGLE_PAY_FAILED, + additionalNonPiiParams = mapOf( + "status_message" to statusMessage, + "status_code" to statusCode, + ) + ) + viewModel.updateResult( + GooglePayLauncher.Result.Failed( + RuntimeException( + "Google Pay failed with error $statusCode: $statusMessage" ) ) - } + ) + } + + else -> { + errorReporter.report(ErrorReporter.UnexpectedErrorEvent.GOOGLE_PAY_UNEXPECTED_RESULT_CODE) + viewModel.updateResult( + GooglePayLauncher.Result.Failed( + RuntimeException( + "Google Pay returned an unexpected result code." + ) + ) + ) } - } else { - viewModel.onConfirmResult( - requestCode, - data ?: Intent() - ) } } - private fun onGooglePayResult(data: Intent?) { - val paymentData = data?.let { PaymentData.getFromIntent(it) } - if (paymentData == null) { - errorReporter.report(ErrorReporter.UnexpectedErrorEvent.GOOGLE_PAY_MISSING_INTENT_DATA) - viewModel.updateResult( - GooglePayLauncher.Result.Failed( - IllegalArgumentException("Google Pay data was not available") - ) + @Deprecated("Deprecated in Java") + public override fun onActivityResult( + requestCode: Int, + resultCode: Int, + data: Intent? + ) { + super.onActivityResult(requestCode, resultCode, data) + if (requestCode == PAYMENT_REQUEST_CODE || requestCode == SETUP_REQUEST_CODE) { + viewModel.onConfirmResult( + requestCode, + data ?: Intent() ) - return } - - val paymentDataJson = JSONObject(paymentData.toJson()) - - val params = PaymentMethodCreateParams.createFromGooglePay(paymentDataJson) - val host = AuthActivityStarterHost.create(this) - viewModel.confirmStripeIntent(host, params) } private fun finishWithResult(result: GooglePayLauncher.Result) { @@ -170,9 +175,4 @@ internal class GooglePayLauncherActivity : AppCompatActivity() { ) finish() } - - private companion object { - // the value isn't meaningful / is arbitrary - private const val LOAD_PAYMENT_DATA_REQUEST_CODE = 4444 - } } diff --git a/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayLauncherViewModel.kt b/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayLauncherViewModel.kt index fa6f7b189cf..40b7f4f1f61 100644 --- a/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayLauncherViewModel.kt +++ b/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayLauncherViewModel.kt @@ -72,7 +72,7 @@ internal class GooglePayLauncherViewModel( init { viewModelScope.launch(workContext) { if (!hasLaunched) { - createLoadPaymentDataTask().fold( + resolveLoadPaymentDataTask().fold( onSuccess = { _googlePayLaunchTask.emit(it) }, @@ -180,7 +180,7 @@ internal class GooglePayLauncherViewModel( } } - private suspend fun createLoadPaymentDataTask(): Result> { + private suspend fun resolveLoadPaymentDataTask(): Result> { return runCatching { check(isReadyToPay()) { "Google Pay is unavailable." } }.mapResult { @@ -188,7 +188,7 @@ internal class GooglePayLauncherViewModel( }.mapCatching { json -> PaymentDataRequest.fromJson(json) }.map { request -> - paymentsClient.loadPaymentData(request) + paymentsClient.loadPaymentData(request).awaitTask() } } diff --git a/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncherActivity.kt b/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncherActivity.kt index 789c9b30d1c..96e0ecbdf35 100644 --- a/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncherActivity.kt +++ b/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncherActivity.kt @@ -7,12 +7,16 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf import androidx.lifecycle.lifecycleScope import com.google.android.gms.common.api.CommonStatusCodes -import com.google.android.gms.tasks.Task import com.google.android.gms.wallet.AutoResolveHelper import com.google.android.gms.wallet.PaymentData +import com.google.android.gms.wallet.contract.ApiTaskResult +import com.google.android.gms.wallet.contract.TaskResultContracts.GetPaymentDataResult import com.stripe.android.model.PaymentMethod +import com.stripe.android.payments.core.analytics.ErrorReporter import com.stripe.android.utils.fadeOut +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext /** * [GooglePayPaymentMethodLauncherActivity] is used to return the result of a Google Pay operation. @@ -33,6 +37,10 @@ internal class GooglePayPaymentMethodLauncherActivity : AppCompatActivity() { GooglePayPaymentMethodLauncherViewModel.Factory(args) } + private val errorReporter: ErrorReporter by lazy { + ErrorReporter.createFallbackInstance(context = this) + } + private lateinit var args: GooglePayPaymentMethodLauncherContractV2.Args override fun onCreate(savedInstanceState: Bundle?) { @@ -60,13 +68,19 @@ internal class GooglePayPaymentMethodLauncherActivity : AppCompatActivity() { } } + val googlePayLauncher = registerForActivityResult(GetPaymentDataResult()) { + onGooglePayResult(it) + } + if (!viewModel.hasLaunched) { lifecycleScope.launch { runCatching { - viewModel.createLoadPaymentDataTask() + withContext(Dispatchers.IO) { + viewModel.loadPaymentData() + } }.fold( onSuccess = { - launchGooglePay(it) + googlePayLauncher.launch(it) viewModel.hasLaunched = true }, onFailure = { @@ -87,70 +101,67 @@ internal class GooglePayPaymentMethodLauncherActivity : AppCompatActivity() { setFadeAnimations() } - private fun launchGooglePay(task: Task) { - AutoResolveHelper.resolveTask( - task, - this, - LOAD_PAYMENT_DATA_REQUEST_CODE - ) - } - - @Deprecated("Deprecated in Java") - public override fun onActivityResult( - requestCode: Int, - resultCode: Int, - data: Intent? - ) { - super.onActivityResult(requestCode, resultCode, data) - if (requestCode == LOAD_PAYMENT_DATA_REQUEST_CODE) { - when (resultCode) { - RESULT_OK -> { - onGooglePayResult(data) - } - RESULT_CANCELED -> { - updateResult( - GooglePayPaymentMethodLauncher.Result.Canceled - ) - } - AutoResolveHelper.RESULT_ERROR -> { - val status = AutoResolveHelper.getStatusFromIntent(data) - val statusMessage = status?.statusMessage.orEmpty() + private fun onGooglePayResult(taskResult: ApiTaskResult) { + when (taskResult.status.statusCode) { + CommonStatusCodes.SUCCESS -> { + val result = taskResult.result + if (result != null) { + onGooglePayResult(result) + } else { + errorReporter.report(ErrorReporter.UnexpectedErrorEvent.GOOGLE_PAY_MISSING_INTENT_DATA) updateResult( GooglePayPaymentMethodLauncher.Result.Failed( RuntimeException( - "Google Pay failed with error ${status?.statusCode}: $statusMessage" + "Google Pay failed with missing data." ), - status?.statusCode?.let { - googlePayStatusCodeToErrorCode(it) - } ?: GooglePayPaymentMethodLauncher.INTERNAL_ERROR - ) - ) - } - else -> { - updateResult( - GooglePayPaymentMethodLauncher.Result.Failed( - RuntimeException("Google Pay returned an expected result code."), GooglePayPaymentMethodLauncher.INTERNAL_ERROR ) ) } } + CommonStatusCodes.CANCELED -> { + updateResult( + GooglePayPaymentMethodLauncher.Result.Canceled + ) + } + AutoResolveHelper.RESULT_ERROR -> { + val status = taskResult.status + val statusMessage = status.statusMessage.orEmpty() + val statusCode = status.statusCode + errorReporter.report( + ErrorReporter.ExpectedErrorEvent.GOOGLE_PAY_FAILED, + additionalNonPiiParams = mapOf( + "status_message" to statusMessage, + "status_code" to statusCode.toString(), + ) + ) + updateResult( + GooglePayPaymentMethodLauncher.Result.Failed( + RuntimeException( + "Google Pay failed with error $statusCode: $statusMessage" + ), + googlePayStatusCodeToErrorCode(statusCode) + ) + ) + } + else -> { + errorReporter.report(ErrorReporter.UnexpectedErrorEvent.GOOGLE_PAY_UNEXPECTED_RESULT_CODE) + updateResult( + GooglePayPaymentMethodLauncher.Result.Failed( + RuntimeException("Google Pay returned an unexpected result code."), + GooglePayPaymentMethodLauncher.INTERNAL_ERROR + ) + ) + } } } - private fun onGooglePayResult(data: Intent?) { - data?.let { PaymentData.getFromIntent(it) }?.let { paymentData -> - lifecycleScope.launch { - finishWithResult( - viewModel.createPaymentMethod(paymentData) - ) - } - } ?: updateResult( - GooglePayPaymentMethodLauncher.Result.Failed( - IllegalArgumentException("Google Pay data was not available"), - GooglePayPaymentMethodLauncher.INTERNAL_ERROR + private fun onGooglePayResult(paymentData: PaymentData) { + lifecycleScope.launch { + finishWithResult( + viewModel.createPaymentMethod(paymentData) ) - ) + } } private fun updateResult(result: GooglePayPaymentMethodLauncher.Result) { @@ -180,8 +191,4 @@ internal class GooglePayPaymentMethodLauncherActivity : AppCompatActivity() { else -> GooglePayPaymentMethodLauncher.INTERNAL_ERROR } } - - private companion object { - private const val LOAD_PAYMENT_DATA_REQUEST_CODE = 4444 - } } diff --git a/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncherViewModel.kt b/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncherViewModel.kt index d81335bbebf..077a74c5f3e 100644 --- a/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncherViewModel.kt +++ b/payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncherViewModel.kt @@ -84,13 +84,13 @@ internal class GooglePayPaymentMethodLauncherViewModel @Inject constructor( ) } - suspend fun createLoadPaymentDataTask(): Task { + suspend fun loadPaymentData(): Task { check(isReadyToPay()) { "Google Pay is unavailable." } return paymentsClient.loadPaymentData( PaymentDataRequest.fromJson(createPaymentDataRequest().toString()) - ) + ).awaitTask() } suspend fun createPaymentMethod( diff --git a/payments-core/src/main/java/com/stripe/android/googlepaylauncher/Tasks.kt b/payments-core/src/main/java/com/stripe/android/googlepaylauncher/Tasks.kt new file mode 100644 index 00000000000..36fa081ad33 --- /dev/null +++ b/payments-core/src/main/java/com/stripe/android/googlepaylauncher/Tasks.kt @@ -0,0 +1,31 @@ +package com.stripe.android.googlepaylauncher + +import com.google.android.gms.tasks.CancellationTokenSource +import com.google.android.gms.tasks.Task +import kotlinx.coroutines.suspendCancellableCoroutine +import java.util.concurrent.Executor +import kotlin.coroutines.resume + +internal suspend fun Task.awaitTask(cancellationTokenSource: CancellationTokenSource? = null): Task { + return if (isComplete) { + this + } else { + suspendCancellableCoroutine { cont -> + // Run the callback directly to avoid unnecessarily scheduling on the main thread. + addOnCompleteListener(DirectExecutor, cont::resume) + + cancellationTokenSource?.let { cancellationSource -> + cont.invokeOnCancellation { cancellationSource.cancel() } + } + } + } +} + +/** + * An [Executor] that just directly executes the [Runnable]. + */ +private object DirectExecutor : Executor { + override fun execute(r: Runnable) { + r.run() + } +} diff --git a/payments-core/src/test/java/com/stripe/android/googlepaylauncher/GooglePayLauncherViewModelTest.kt b/payments-core/src/test/java/com/stripe/android/googlepaylauncher/GooglePayLauncherViewModelTest.kt index a1c76a59dab..583dccd22bf 100644 --- a/payments-core/src/test/java/com/stripe/android/googlepaylauncher/GooglePayLauncherViewModelTest.kt +++ b/payments-core/src/test/java/com/stripe/android/googlepaylauncher/GooglePayLauncherViewModelTest.kt @@ -54,7 +54,9 @@ class GooglePayLauncherViewModelTest { private val googlePayRepository = FakeGooglePayRepository(true) private val testDispatcher = StandardTestDispatcher() - private val task = mock>() + private val task = mock>().also { + whenever(it.isComplete).thenReturn(true) + } private val paymentsClient = mock().also { whenever(it.loadPaymentData(any())) .thenReturn(task) diff --git a/payments-ui-core/dependencies/dependencies.txt b/payments-ui-core/dependencies/dependencies.txt index a10b1e82b6c..67b37ef129c 100644 --- a/payments-ui-core/dependencies/dependencies.txt +++ b/payments-ui-core/dependencies/dependencies.txt @@ -675,30 +675,30 @@ | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) -| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 -| | | \--- com.google.android.gms:play-services-basement:18.0.0 +| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 +| | | \--- com.google.android.gms:play-services-basement:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) -| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) +| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) | +--- com.google.android.material:material:1.11.0 (*) -| +--- com.google.android.gms:play-services-wallet:19.2.1 +| +--- com.google.android.gms:play-services-wallet:19.3.0 | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | +--- com.google.android.gms:play-services-base:18.0.1 +| | +--- com.google.android.gms:play-services-base:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) -| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) +| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +| | +--- com.google.android.gms:play-services-basement:18.3.0 (*) | | +--- com.google.android.gms:play-services-identity:18.0.1 -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | | +--- com.google.android.gms:play-services-maps:18.0.2 | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) | +--- com.google.android.instantapps:instantapps:1.1.0 | +--- com.stripe:stripe-3ds2-android:6.1.8 | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*) diff --git a/payments/dependencies/dependencies.txt b/payments/dependencies/dependencies.txt index 8c2619ccab6..1595004043b 100644 --- a/payments/dependencies/dependencies.txt +++ b/payments/dependencies/dependencies.txt @@ -702,30 +702,30 @@ | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) -| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 -| | | \--- com.google.android.gms:play-services-basement:18.0.0 +| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 +| | | \--- com.google.android.gms:play-services-basement:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) -| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) +| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) | +--- com.google.android.material:material:1.11.0 (*) -| +--- com.google.android.gms:play-services-wallet:19.2.1 +| +--- com.google.android.gms:play-services-wallet:19.3.0 | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | +--- com.google.android.gms:play-services-base:18.0.1 +| | +--- com.google.android.gms:play-services-base:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) -| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) +| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +| | +--- com.google.android.gms:play-services-basement:18.3.0 (*) | | +--- com.google.android.gms:play-services-identity:18.0.1 -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | | +--- com.google.android.gms:play-services-maps:18.0.2 | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) | +--- com.google.android.instantapps:instantapps:1.1.0 | +--- com.stripe:stripe-3ds2-android:6.1.8 | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*) @@ -940,9 +940,9 @@ | | +--- androidx.compose.ui:ui:1.5.0 -> 1.5.4 (*) | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*) | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 -> 1.9.10 (*) -| +--- com.google.android.gms:play-services-wallet:19.2.1 (*) +| +--- com.google.android.gms:play-services-wallet:19.3.0 (*) | +--- com.google.pay.button:compose-pay-button:0.1.3 -| | +--- com.google.android.gms:play-services-wallet:19.2.1 (*) +| | +--- com.google.android.gms:play-services-wallet:19.2.1 -> 19.3.0 (*) | | +--- androidx.compose.ui:ui:1.5.4 (*) | | +--- androidx.compose.material:material:1.5.4 (*) | | +--- androidx.core:core-ktx:1.12.0 (*) diff --git a/paymentsheet-example/dependencies/dependencies.txt b/paymentsheet-example/dependencies/dependencies.txt index 3ffd05a3f4c..3096df07ebf 100644 --- a/paymentsheet-example/dependencies/dependencies.txt +++ b/paymentsheet-example/dependencies/dependencies.txt @@ -722,30 +722,30 @@ | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) -| | | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 -| | | | \--- com.google.android.gms:play-services-basement:18.0.0 +| | | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 +| | | | \--- com.google.android.gms:play-services-basement:18.3.0 | | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) -| | | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) +| | | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) | | +--- com.google.android.material:material:1.11.0 (*) -| | +--- com.google.android.gms:play-services-wallet:19.2.1 +| | +--- com.google.android.gms:play-services-wallet:19.3.0 | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-base:18.0.1 +| | | +--- com.google.android.gms:play-services-base:18.3.0 | | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) -| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) +| | | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) | | | +--- com.google.android.gms:play-services-identity:18.0.1 -| | | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | | | +--- com.google.android.gms:play-services-maps:18.0.2 | | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) | | +--- com.google.android.instantapps:instantapps:1.1.0 | | +--- com.stripe:stripe-3ds2-android:6.1.8 | | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*) @@ -982,9 +982,9 @@ | | | +--- androidx.compose.ui:ui:1.5.0 -> 1.5.4 (*) | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*) | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 -> 1.9.10 (*) -| | +--- com.google.android.gms:play-services-wallet:19.2.1 (*) +| | +--- com.google.android.gms:play-services-wallet:19.3.0 (*) | | +--- com.google.pay.button:compose-pay-button:0.1.3 -| | | +--- com.google.android.gms:play-services-wallet:19.2.1 (*) +| | | +--- com.google.android.gms:play-services-wallet:19.2.1 -> 19.3.0 (*) | | | +--- androidx.compose.ui:ui:1.5.4 (*) | | | +--- androidx.compose.material:material:1.5.4 (*) | | | +--- androidx.core:core-ktx:1.12.0 (*) @@ -1281,14 +1281,14 @@ | | \--- com.google.firebase:firebase-encoders-json:16.1.0 | | \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*) | +--- com.google.android.datatransport:transport-runtime:2.2.3 (*) -| +--- com.google.android.gms:play-services-base:18.0.1 (*) -| +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | +--- com.google.android.gms:play-services-location:20.0.0 -| | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| | \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.1.0 (*) | +--- com.google.android.gms:play-services-maps:17.0.0 -> 18.0.2 (*) -| +--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| +--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.1.0 (*) | +--- com.google.auto.value:auto-value-annotations:1.6.2 -> 1.6.3 | +--- com.google.code.gson:gson:2.8.5 | +--- com.squareup.okhttp:okhttp:2.7.2 diff --git a/paymentsheet/dependencies/dependencies.txt b/paymentsheet/dependencies/dependencies.txt index 3baceef2b70..4d2c6b43229 100644 --- a/paymentsheet/dependencies/dependencies.txt +++ b/paymentsheet/dependencies/dependencies.txt @@ -702,30 +702,30 @@ | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) -| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 -| | | \--- com.google.android.gms:play-services-basement:18.0.0 +| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 +| | | \--- com.google.android.gms:play-services-basement:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) -| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) +| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) | +--- com.google.android.material:material:1.11.0 (*) -| +--- com.google.android.gms:play-services-wallet:19.2.1 +| +--- com.google.android.gms:play-services-wallet:19.3.0 | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | +--- com.google.android.gms:play-services-base:18.0.1 +| | +--- com.google.android.gms:play-services-base:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) -| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) +| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +| | +--- com.google.android.gms:play-services-basement:18.3.0 (*) | | +--- com.google.android.gms:play-services-identity:18.0.1 -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | | +--- com.google.android.gms:play-services-maps:18.0.2 | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) | +--- com.google.android.instantapps:instantapps:1.1.0 | +--- com.stripe:stripe-3ds2-android:6.1.8 | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*) @@ -938,9 +938,9 @@ | +--- androidx.compose.ui:ui:1.5.0 -> 1.5.4 (*) | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*) | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 -> 1.9.10 (*) -+--- com.google.android.gms:play-services-wallet:19.2.1 (*) ++--- com.google.android.gms:play-services-wallet:19.3.0 (*) +--- com.google.pay.button:compose-pay-button:0.1.3 -| +--- com.google.android.gms:play-services-wallet:19.2.1 (*) +| +--- com.google.android.gms:play-services-wallet:19.2.1 -> 19.3.0 (*) | +--- androidx.compose.ui:ui:1.5.4 (*) | +--- androidx.compose.material:material:1.5.4 (*) | +--- androidx.core:core-ktx:1.12.0 (*) diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/paymentdatacollection/bacs/BacsMandateConfirmationForm.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/paymentdatacollection/bacs/BacsMandateConfirmationForm.kt index aa2081fcb59..561180a6787 100644 --- a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/paymentdatacollection/bacs/BacsMandateConfirmationForm.kt +++ b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/paymentdatacollection/bacs/BacsMandateConfirmationForm.kt @@ -1,6 +1,7 @@ package com.stripe.android.paymentsheet.paymentdatacollection.bacs import android.content.res.Configuration.UI_MODE_NIGHT_YES +import androidx.annotation.VisibleForTesting import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -28,7 +29,6 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import com.google.android.gms.common.util.VisibleForTesting import com.stripe.android.core.strings.resolvableString import com.stripe.android.paymentsheet.R import com.stripe.android.paymentsheet.utils.PaymentSheetContentPadding diff --git a/stripe-test-e2e/dependencies/dependencies.txt b/stripe-test-e2e/dependencies/dependencies.txt index 4539fd3365b..2805b9827cc 100644 --- a/stripe-test-e2e/dependencies/dependencies.txt +++ b/stripe-test-e2e/dependencies/dependencies.txt @@ -704,30 +704,30 @@ | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) - | | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 - | | | \--- com.google.android.gms:play-services-basement:18.0.0 + | | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 + | | | \--- com.google.android.gms:play-services-basement:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) - | | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) + | | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) | +--- com.google.android.material:material:1.11.0 (*) - | +--- com.google.android.gms:play-services-wallet:19.2.1 + | +--- com.google.android.gms:play-services-wallet:19.3.0 | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) - | | +--- com.google.android.gms:play-services-base:18.0.1 + | | +--- com.google.android.gms:play-services-base:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) - | | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) - | | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) - | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) + | | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) + | | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) + | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) | | +--- com.google.android.gms:play-services-identity:18.0.1 - | | | +--- com.google.android.gms:play-services-base:18.0.1 (*) - | | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) + | | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) + | | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | | +--- com.google.android.gms:play-services-maps:18.0.2 | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) - | | | +--- com.google.android.gms:play-services-base:18.0.1 (*) - | | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) - | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) + | | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) + | | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) + | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) | +--- com.google.android.instantapps:instantapps:1.1.0 | +--- com.stripe:stripe-3ds2-android:6.1.8 | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*) @@ -942,9 +942,9 @@ | | +--- androidx.compose.ui:ui:1.5.0 -> 1.5.4 (*) | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*) | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 -> 1.9.10 (*) - | +--- com.google.android.gms:play-services-wallet:19.2.1 (*) + | +--- com.google.android.gms:play-services-wallet:19.3.0 (*) | +--- com.google.pay.button:compose-pay-button:0.1.3 - | | +--- com.google.android.gms:play-services-wallet:19.2.1 (*) + | | +--- com.google.android.gms:play-services-wallet:19.2.1 -> 19.3.0 (*) | | +--- androidx.compose.ui:ui:1.5.4 (*) | | +--- androidx.compose.material:material:1.5.4 (*) | | +--- androidx.core:core-ktx:1.12.0 (*) diff --git a/wechatpay/dependencies/dependencies.txt b/wechatpay/dependencies/dependencies.txt index e8cf550dc7e..22cecf31c5c 100644 --- a/wechatpay/dependencies/dependencies.txt +++ b/wechatpay/dependencies/dependencies.txt @@ -673,30 +673,30 @@ | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*) | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 (*) -| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.0.1 -| | | \--- com.google.android.gms:play-services-basement:18.0.0 +| | +--- com.google.android.gms:play-services-tasks:16.0.1 -> 18.1.0 +| | | \--- com.google.android.gms:play-services-basement:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) -| | | \--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) +| | | \--- androidx.fragment:fragment:1.1.0 -> 1.6.2 (*) | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.10 (*) | +--- com.google.android.material:material:1.11.0 (*) -| +--- com.google.android.gms:play-services-wallet:19.2.1 +| +--- com.google.android.gms:play-services-wallet:19.3.0 | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | +--- com.google.android.gms:play-services-base:18.0.1 +| | +--- com.google.android.gms:play-services-base:18.3.0 | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) | | | +--- androidx.core:core:1.2.0 -> 1.12.0 (*) | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) -| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.3.0 (*) +| | | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) +| | +--- com.google.android.gms:play-services-basement:18.3.0 (*) | | +--- com.google.android.gms:play-services-identity:18.0.1 -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) | | +--- com.google.android.gms:play-services-maps:18.0.2 | | | +--- androidx.fragment:fragment:1.0.0 -> 1.6.2 (*) -| | | +--- com.google.android.gms:play-services-base:18.0.1 (*) -| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) -| | \--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.3.0 (*) +| | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.3.0 (*) +| | \--- com.google.android.gms:play-services-tasks:18.1.0 (*) | +--- com.google.android.instantapps:instantapps:1.1.0 | +--- com.stripe:stripe-3ds2-android:6.1.8 | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10 -> 1.9.22 (*)