Skip to content

Commit

Permalink
[FC] Removes mavericks dependency (#8160)
Browse files Browse the repository at this point in the history 
* Migrates more screens out of mavs.

* Migrates partner auth.

* Removes active auth session field.

* Updates tests.

* Updates attach payment viewmodel.

* PR feedback.

* Api dump.

* Migrates missing viewmodels.

* Updates dependencies.

* Removes mavericks dependency.

* Merge with integration.

* Uses collect.

* Updates dependencies
  • Loading branch information
@carlosmuvi-stripe
carlosmuvi-stripe authored Mar 27, 2024
1 parent e85e1d2 commit d079d6e
Show file tree
Hide file tree
Showing 23 changed files with 130 additions and 278 deletions.
4 changes: 0 additions & 4 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ ext.versions = [
kotlinSerializationConverter: '1.0.0',
ktlint : '0.48.2',
leakCanary : '2.13',
mavericks : '3.0.9',
material : '1.11.0',
mockito : '5.10.0',
mockitoInline : '5.2.0',
Expand Down Expand Up @@ -162,8 +161,6 @@ ext.libs = [
leakCanary : "com.squareup.leakcanary:leakcanary-android:${versions.leakCanary}",
loggingInterceptor : "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}",
material : "com.google.android.material:material:${versions.material}",
mavericks : "com.airbnb.android:mavericks:${versions.mavericks}",
mavericksCompose : "com.airbnb.android:mavericks-compose:${versions.mavericks}",
microblinkCapture : "com.microblink:capture-core:${versions.microblinkCapture}",
okio : "com.squareup.okio:okio:${versions.okio}",
payButtonCompose : "com.google.pay.button:compose-pay-button:${versions.payButtonCompose}",
Expand Down Expand Up @@ -218,7 +215,6 @@ ext.testLibs = [
junit : "org.jetbrains.kotlin:kotlin-test-junit:${versions.kotlin}",
test : "org.jetbrains.kotlin:kotlin-test:${versions.kotlin}",
],
mavericks : "com.airbnb.android:mavericks-testing:${versions.mavericks}",
mockito : [
android: "org.mockito:mockito-android:${versions.mockito}",
core : "org.mockito:mockito-core:${versions.mockito}",
Expand Down
36 changes: 11 additions & 25 deletions example/dependencies/dependencies.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
| | | | | | | \--- com.google.guava:listenablefuture:1.0
| | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.22 (*)
| | | | | | +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-livedata:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0 (c)
Expand All @@ -86,6 +85,7 @@
| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | | \--- androidx.lifecycle:lifecycle-process:2.7.0 (c)
| | | | | +--- androidx.versionedparcelable:versionedparcelable:1.1.1
| | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
Expand Down Expand Up @@ -117,7 +117,6 @@
| | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.22 (*)
| | | | | +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-livedata:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0 (c)
Expand All @@ -127,6 +126,7 @@
| | | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | \--- androidx.lifecycle:lifecycle-process:2.7.0 (c)
| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.22 (*)
| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.7.3 (*)
Expand All @@ -139,8 +139,8 @@
| | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
| | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.7.0 (c)
| | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0 (c)
| | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
| | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | \--- androidx.lifecycle:lifecycle-process:2.7.0 (c)
| | | \--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22
| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 (*)
Expand Down Expand Up @@ -169,7 +169,6 @@
| | | | | | | +--- androidx.lifecycle:lifecycle-common:2.7.0 (*)
| | | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.22 (*)
| | | | | | | +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-livedata:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.7.0 (c)
Expand All @@ -179,6 +178,7 @@
| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | | | \--- androidx.lifecycle:lifecycle-process:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.7.0 (*)
| | | | | | +--- androidx.savedstate:savedstate:1.2.1
Expand All @@ -198,8 +198,8 @@
| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | | \--- androidx.lifecycle:lifecycle-process:2.7.0 (c)
| | | | | +--- androidx.profileinstaller:profileinstaller:1.3.0 (*)
| | | | | +--- androidx.savedstate:savedstate:1.2.1 (*)
Expand Down Expand Up @@ -281,7 +281,6 @@
| | | | | | | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0
| | | | | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.7.0 (*)
| | | | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.22 (*)
| | | | | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | | | | +--- androidx.lifecycle:lifecycle-livedata:2.7.0 (c)
| | | | | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.7.0 (c)
| | | | | | | | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.7.0 (c)
Expand All @@ -292,11 +291,11 @@
| | | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
| | | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
| | | | | | | | +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
| | | | | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | | | | \--- androidx.lifecycle:lifecycle-process:2.7.0 (c)
| | | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.22 (*)
| | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.7.3 (*)
| | | | | | | +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.7.0 (c)
Expand All @@ -306,6 +305,7 @@
| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
| | | | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | | | \--- androidx.lifecycle:lifecycle-process:2.7.0 (c)
| | | | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.7.0 (*)
| | | | | +--- androidx.profileinstaller:profileinstaller:1.3.0 (*)
Expand Down Expand Up @@ -353,8 +353,8 @@
| | | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | | \--- androidx.lifecycle:lifecycle-process:2.7.0 (c)
| | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 -> 2.7.0 (*)
| | | | +--- androidx.savedstate:savedstate-ktx:1.2.1
Expand Down Expand Up @@ -743,8 +743,8 @@
| | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
| | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.7.0 (c)
| | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0 (c)
| | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
| | | | +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
| | | | \--- androidx.lifecycle:lifecycle-process:2.7.0 (c)
| | | +--- androidx.core:core-ktx:1.12.0 (*)
| | | +--- androidx.activity:activity-ktx:1.8.2 (*)
Expand Down Expand Up @@ -828,13 +828,13 @@
| | | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-process:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-runtime:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
| | | | | | \--- androidx.lifecycle:lifecycle-process:2.7.0 (c)
| | | | | | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
| | | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (*)
| | | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (*)
| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.22 (*)
Expand Down Expand Up @@ -980,20 +980,6 @@
| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*)
| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 (*)
| +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2 (*)
| +--- com.airbnb.android:mavericks:3.0.9
| | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.8.22 -> 1.9.22 (*)
| | +--- androidx.activity:activity:{require 1.5.1; reject _} -> 1.8.2 (*)
| | +--- androidx.appcompat:appcompat:{require 1.5.0; reject _} -> 1.6.1 (*)
| | +--- androidx.fragment:fragment:{require 1.5.2; reject _} -> 1.6.2 (*)
| | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:{require 2.6.1; reject _} -> 2.7.0 (*)
| | +--- androidx.lifecycle:lifecycle-common-java8:{require 2.6.1; reject _} -> 2.7.0 (*)
| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:{require 2.6.1; reject _} -> 2.7.0 (*)
| | +--- androidx.lifecycle:lifecycle-runtime-ktx:{require 2.6.1; reject _} -> 2.7.0 (*)
| | +--- com.airbnb.android:mavericks-common:3.0.9
| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:{require 1.6.4; reject _} -> 1.7.3 (*)
| | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.10 (*)
| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:{require 1.6.4; reject _} -> 1.7.3 (*)
| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.10 (*)
| \--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22 (*)
+--- com.google.accompanist:accompanist-themeadapter-material:0.32.0 (*)
+--- com.alipay.sdk:alipaysdk-android:15.8.12
Expand Down
Loading

0 comments on commit d079d6e

Please sign in to comment.