Merge branch 'master' into brnunes/si4

# Conflicts: # payments-core/src/main/java/com/stripe/android/payments/PaymentFlowResultProcessor.kt # payments-core/src/main/java/com/stripe/android/paymentsheet/PaymentSheetViewModel.kt # payments-core/src/main/java/com/stripe/android/paymentsheet/flowcontroller/DefaultFlowController.kt # payments-core/src/main/java/com/stripe/android/paymentsheet/flowcontroller/DefaultFlowControllerInitializer.kt # payments-core/src/main/java/com/stripe/android/paymentsheet/flowcontroller/FlowControllerFactory.kt # payments-core/src/main/java/com/stripe/android/paymentsheet/flowcontroller/InitData.kt # payments-core/src/test/java/com/stripe/android/paymentsheet/PaymentSheetActivityTest.kt # payments-core/src/test/java/com/stripe/android/paymentsheet/PaymentSheetViewModelTest.kt # payments-core/src/test/java/com/stripe/android/paymentsheet/flowcontroller/DefaultFlowControllerTest.kt
stripe · May 27, 2021 · caab8a9 · caab8a9
2 parents f44c52d + 001166f
commit caab8a9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/example/build.gradle b/example/build.gradle
@@ -93,7 +93,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.2'
     androidTestImplementation "androidx.test.ext:truth:$androidTestVersion"
-    androidTestImplementation 'com.google.truth:truth:1.1.2'
+    androidTestImplementation 'com.google.truth:truth:1.1.3'
 
     // Espresso dependencies
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"

diff --git a/payments-core/build.gradle b/payments-core/build.gradle
@@ -50,7 +50,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
     testImplementation "org.jetbrains.kotlin:kotlin-test-annotations-common:$kotlinVersion"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutinesVersion"
-    testImplementation 'com.google.truth:truth:1.1.2'
+    testImplementation 'com.google.truth:truth:1.1.3'
     testImplementation "androidx.arch.core:core-testing:2.1.0"
     testImplementation "androidx.fragment:fragment-testing:$fragmentVersion"
 

diff --git a/paymentsheet/build.gradle b/paymentsheet/build.gradle
@@ -79,7 +79,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
     testImplementation "org.jetbrains.kotlin:kotlin-test-annotations-common:$kotlinVersion"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutinesVersion"
-    testImplementation 'com.google.truth:truth:1.1.2'
+    testImplementation 'com.google.truth:truth:1.1.3'
     testImplementation "androidx.arch.core:core-testing:2.1.0"
     testImplementation "androidx.fragment:fragment-testing:$fragmentVersion"
 

diff --git a/stripe-test-e2e/build.gradle b/stripe-test-e2e/build.gradle
@@ -60,7 +60,7 @@ dependencies {
 
     testImplementation 'org.robolectric:robolectric:4.5.1'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'com.google.truth:truth:1.1.2'
+    testImplementation 'com.google.truth:truth:1.1.3'
     testImplementation "androidx.arch.core:core-testing:2.1.0"
     testImplementation "androidx.test:core:$androidTestVersion"
     testImplementation 'androidx.test.ext:junit-ktx:1.1.2'