-
Notifications
You must be signed in to change notification settings - Fork 131
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.
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
Merge 16.2 final into trunk #10207
Merge 16.2 final into trunk #10207
Conversation
…pendencies" This reverts commit edd9f45.
…fest so screenshots can work
Fix READ_EXTERNAL_STORAGE permission
This reverts commit 09fe2f4.
This adds new rules generated by AGP
Fix release builds
📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Release-related changes look good. However, I noticed there are merge conflicts.
-
versionName
rc
number andversionCode
bumps inversion.properties
-
string.xml
updates - Diffs from the PRs that made it into this beta
Leaving this as a token approval to reference on the PR that will address the merge conflicts.
# Conflicts: # WooCommerce/src/main/res/values/strings.xml # WooCommerce/src/test/kotlin/com/woocommerce/android/ui/payments/hub/depositsummary/PaymentsHubDepositSummaryStateMapperTest.kt # build.gradle
Generated by 🚫 dangerJS |
Found 1 violations: The PR caused the following dependency changes:expand
+--- androidx.navigation:navigation-dynamic-features-fragment:2.5.3
| +--- androidx.navigation:navigation-dynamic-features-runtime:2.5.3
| | \--- androidx.navigation:navigation-runtime:2.5.3
| | +--- androidx.activity:activity-ktx:1.5.1 -> 1.8.0
| | | +--- androidx.activity:activity:1.8.0
-| | | | +--- androidx.core:core:1.8.0 -> 1.10.1
-| | | | | +--- androidx.annotation:annotation:1.6.0 (*)
-| | | | | +--- androidx.annotation:annotation-experimental:1.3.0
-| | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.22 (*)
-| | | | | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
-| | | | | +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0
-| | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | | | | \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-| | | | | +--- androidx.interpolator:interpolator:1.0.0
-| | | | | | \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-| | | | | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 -> 2.6.2
-| | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | | | | +--- androidx.arch.core:core-common:2.2.0
-| | | | | | | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | | | | +--- androidx.arch.core:core-runtime:2.2.0
-| | | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | | | | | \--- androidx.arch.core:core-common:2.2.0 (*)
-| | | | | | +--- androidx.lifecycle:lifecycle-common:2.6.2
-| | | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.22 (*)
-| | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4
-| | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4
-| | | | | | | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4
-| | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4
-| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (c)
-| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 (c)
-| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (c)
-| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4 (c)
-| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-rx3:1.6.4 (c)
-| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.6.4 (c)
-| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4 (c)
-| | | | | | | | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.6.4 (c)
-| | | | | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.8.22
-| | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 (*)
-| | | | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.8.21
-| | | | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.8.22 (*)
-| | | | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21
-| | | | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.8.22 (*)
-| | | | | | | +--- androidx.lifecycle:lifecycle-livedata:2.6.2 (c)
-| | | | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.6.2 (c)
-| | | | | | | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.2 (c)
-| | | | | | | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.2 (c)
-| | | | | | | +--- androidx.lifecycle:lifecycle-process:2.6.2 (c)
-| | | | | | | +--- androidx.lifecycle:lifecycle-runtime:2.6.2 (c)
-| | | | | | | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.2 (c)
-| | | | | | | +--- androidx.lifecycle:lifecycle-service:2.6.2 (c)
-| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.6.2 (c)
-| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2 (c)
-| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2 (c)
-| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2 (c)
-| | | | | | | \--- androidx.lifecycle:lifecycle-common-java8:2.6.2 (c)
-| | | | | | +--- androidx.profileinstaller:profileinstaller:1.3.0
-| | | | | | | +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-| | | | | | | +--- androidx.concurrent:concurrent-futures:1.1.0 (*)
-| | | | | | | +--- androidx.startup:startup-runtime:1.1.1
-| | | | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | | | | | | \--- androidx.tracing:tracing:1.0.0
-| | | | | | | | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | | | | | \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-| | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.22 (*)
-| | | | | | +--- androidx.lifecycle:lifecycle-common:2.6.2 (c)
-| | | | | | +--- androidx.lifecycle:lifecycle-livedata:2.6.2 (c)
-| | | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.6.2 (c)
-| | | | | | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.2 (c)
-| | | | | | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.2 (c)
-| | | | | | +--- androidx.lifecycle:lifecycle-process:2.6.2 (c)
-| | | | | | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.2 (c)
-| | | | | | +--- androidx.lifecycle:lifecycle-service:2.6.2 (c)
-| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.6.2 (c)
-| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2 (c)
-| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2 (c)
-| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2 (c)
-| | | | | | \--- androidx.lifecycle:lifecycle-common-java8:2.6.2 (c)
-| | | | | +--- androidx.versionedparcelable:versionedparcelable:1.1.1
-| | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | | | | \--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
-| | | | | \--- androidx.core:core-ktx:1.10.1 (c)
+| | | | +--- androidx.core:core:1.8.0 -> 1.12.0
+| | | | | +--- androidx.annotation:annotation:1.6.0 (*)
+| | | | | +--- androidx.annotation:annotation-experimental:1.3.0
+| | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.22 (*)
+| | | | | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
+| | | | | +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0
+| | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | | | | \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| | | | | +--- androidx.interpolator:interpolator:1.0.0
+| | | | | | \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+| | | | | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 -> 2.6.2
+| | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | | | | +--- androidx.arch.core:core-common:2.2.0
+| | | | | | | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | | | | +--- androidx.arch.core:core-runtime:2.2.0
+| | | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | | | | | \--- androidx.arch.core:core-common:2.2.0 (*)
+| | | | | | +--- androidx.lifecycle:lifecycle-common:2.6.2
+| | | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.22 (*)
+| | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4
+| | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4
+| | | | | | | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4
+| | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4
+| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (c)
+| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 (c)
+| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (c)
+| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4 (c)
+| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-rx3:1.6.4 (c)
+| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.6.4 (c)
+| | | | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4 (c)
+| | | | | | | | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.6.4 (c)
+| | | | | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.8.22
+| | | | | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 (*)
+| | | | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.8.21
+| | | | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.8.22 (*)
+| | | | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21
+| | | | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.8.22 (*)
+| | | | | | | +--- androidx.lifecycle:lifecycle-livedata:2.6.2 (c)
+| | | | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.6.2 (c)
+| | | | | | | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.2 (c)
+| | | | | | | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.2 (c)
+| | | | | | | +--- androidx.lifecycle:lifecycle-process:2.6.2 (c)
+| | | | | | | +--- androidx.lifecycle:lifecycle-runtime:2.6.2 (c)
+| | | | | | | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.2 (c)
+| | | | | | | +--- androidx.lifecycle:lifecycle-service:2.6.2 (c)
+| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.6.2 (c)
+| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2 (c)
+| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2 (c)
+| | | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2 (c)
+| | | | | | | \--- androidx.lifecycle:lifecycle-common-java8:2.6.2 (c)
+| | | | | | +--- androidx.profileinstaller:profileinstaller:1.3.0
+| | | | | | | +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
+| | | | | | | +--- androidx.concurrent:concurrent-futures:1.1.0 (*)
+| | | | | | | +--- androidx.startup:startup-runtime:1.1.1
+| | | | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | | | | | | \--- androidx.tracing:tracing:1.0.0
+| | | | | | | | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | | | | | \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.22 (*)
+| | | | | | +--- androidx.lifecycle:lifecycle-common:2.6.2 (c)
+| | | | | | +--- androidx.lifecycle:lifecycle-livedata:2.6.2 (c)
+| | | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.6.2 (c)
+| | | | | | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.2 (c)
+| | | | | | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.2 (c)
+| | | | | | +--- androidx.lifecycle:lifecycle-process:2.6.2 (c)
+| | | | | | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.2 (c)
+| | | | | | +--- androidx.lifecycle:lifecycle-service:2.6.2 (c)
+| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.6.2 (c)
+| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2 (c)
+| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2 (c)
+| | | | | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2 (c)
+| | | | | | \--- androidx.lifecycle:lifecycle-common-java8:2.6.2 (c)
+| | | | | +--- androidx.versionedparcelable:versionedparcelable:1.1.1
+| | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | | | | \--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
+| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 (*)
+| | | | | \--- androidx.core:core-ktx:1.12.0 (c)
| | | | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 -> 2.6.2
-| | | | \--- androidx.core:core-ktx:1.2.0 -> 1.10.1
-| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | | +--- androidx.core:core:1.10.1 (*)
-| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.22 (*)
-| | | | \--- androidx.core:core:1.10.1 (c)
+| | | | \--- androidx.core:core-ktx:1.2.0 -> 1.12.0
+| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | | +--- androidx.core:core:1.12.0 (*)
+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 (*)
+| | | | \--- androidx.core:core:1.12.0 (c)
-| | | \--- androidx.core:core-ktx:1.9.0 -> 1.10.1 (*)
+| | | \--- androidx.core:core-ktx:1.9.0 -> 1.12.0 (*)
| | \--- androidx.navigation:navigation-common:2.5.3
-| | \--- androidx.core:core-ktx:1.1.0 -> 1.10.1 (*)
+| | \--- androidx.core:core-ktx:1.1.0 -> 1.12.0 (*)
| \--- androidx.navigation:navigation-fragment:2.5.3
| +--- androidx.fragment:fragment-ktx:1.5.4 -> 1.6.1
-| | +--- androidx.core:core-ktx:1.2.0 -> 1.10.1 (*)
+| | +--- androidx.core:core-ktx:1.2.0 -> 1.12.0 (*)
| | \--- androidx.fragment:fragment:1.6.1
-| | +--- androidx.core:core-ktx:1.2.0 -> 1.10.1 (*)
+| | +--- androidx.core:core-ktx:1.2.0 -> 1.12.0 (*)
| | +--- androidx.loader:loader:1.0.0
-| | | \--- androidx.core:core:1.0.0 -> 1.10.1 (*)
+| | | \--- androidx.core:core:1.0.0 -> 1.12.0 (*)
| | \--- androidx.viewpager:viewpager:1.0.0
-| | +--- androidx.core:core:1.0.0 -> 1.10.1 (*)
+| | +--- androidx.core:core:1.0.0 -> 1.12.0 (*)
| | \--- androidx.customview:customview:1.0.0 -> 1.1.0
-| | \--- androidx.core:core:1.3.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.3.0 -> 1.12.0 (*)
| \--- androidx.slidingpanelayout:slidingpanelayout:1.2.0
-| +--- androidx.core:core:1.1.0 -> 1.10.1 (*)
+| +--- androidx.core:core:1.1.0 -> 1.12.0 (*)
| +--- androidx.window:window:1.0.0
-| | \--- androidx.core:core:1.3.2 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.3.2 -> 1.12.0 (*)
| \--- androidx.transition:transition:1.4.1
-| \--- androidx.core:core:1.1.0 -> 1.10.1 (*)
+| \--- androidx.core:core:1.1.0 -> 1.12.0 (*)
+--- com.google.firebase:firebase-messaging-ktx -> 23.0.6
| +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0
-| | \--- androidx.core:core:1.2.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| \--- com.google.firebase:firebase-messaging:23.0.6
| +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0
-| | \--- androidx.core:core:1.2.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| \--- com.google.android.gms:play-services-stats:17.0.2
| \--- androidx.legacy:legacy-support-core-utils:1.0.0
-| \--- androidx.core:core:1.0.0 -> 1.10.1 (*)
+| \--- androidx.core:core:1.0.0 -> 1.12.0 (*)
+--- com.google.firebase:firebase-analytics-ktx -> 21.1.0
| \--- com.google.firebase:firebase-analytics:21.1.0
| \--- com.google.android.gms:play-services-measurement:21.1.0
| \--- com.google.android.gms:play-services-measurement-impl:21.1.0
-| \--- androidx.core:core:1.0.0 -> 1.10.1 (*)
+| \--- androidx.core:core:1.0.0 -> 1.12.0 (*)
-+--- androidx.core:core-ktx:1.8.0 -> 1.10.1 (*)
++--- androidx.core:core-ktx:1.8.0 -> 1.12.0 (*)
+--- androidx.constraintlayout:constraintlayout:2.1.4
| +--- androidx.appcompat:appcompat:1.2.0 -> 1.4.2
-| | +--- androidx.core:core:1.7.0 -> 1.10.1 (*)
+| | +--- androidx.core:core:1.7.0 -> 1.12.0 (*)
| | +--- androidx.appcompat:appcompat-resources:1.4.2
-| | | +--- androidx.core:core:1.0.1 -> 1.10.1 (*)
+| | | +--- androidx.core:core:1.0.1 -> 1.12.0 (*)
| | | \--- androidx.vectordrawable:vectordrawable:1.1.0
-| | | \--- androidx.core:core:1.1.0 -> 1.10.1 (*)
+| | | \--- androidx.core:core:1.1.0 -> 1.12.0 (*)
| | +--- androidx.drawerlayout:drawerlayout:1.0.0 -> 1.1.1
-| | | \--- androidx.core:core:1.2.0 -> 1.10.1 (*)
+| | | \--- androidx.core:core:1.2.0 -> 1.12.0 (*)
| | +--- androidx.emoji2:emoji2:1.0.0 -> 1.3.0
-| | | \--- androidx.core:core:1.3.0 -> 1.10.1 (*)
+| | | \--- androidx.core:core:1.3.0 -> 1.12.0 (*)
| | \--- androidx.emoji2:emoji2-views-helper:1.0.0 -> 1.3.0
-| | \--- androidx.core:core:1.3.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.3.0 -> 1.12.0 (*)
-| \--- androidx.core:core:1.3.2 -> 1.10.1 (*)
+| \--- androidx.core:core:1.3.2 -> 1.12.0 (*)
+--- androidx.recyclerview:recyclerview:1.3.2
-| +--- androidx.core:core:1.7.0 -> 1.10.1 (*)
+| +--- androidx.core:core:1.7.0 -> 1.12.0 (*)
| \--- androidx.customview:customview-poolingcontainer:1.0.0
-| \--- androidx.core:core-ktx:1.5.0 -> 1.10.1 (*)
+| \--- androidx.core:core-ktx:1.5.0 -> 1.12.0 (*)
+--- androidx.recyclerview:recyclerview-selection:1.1.0
-| \--- androidx.core:core:1.1.0 -> 1.10.1 (*)
+| \--- androidx.core:core:1.1.0 -> 1.12.0 (*)
+--- com.google.android.material:material:1.6.1
| +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0
-| | \--- androidx.core:core:1.1.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.1.0 -> 1.12.0 (*)
-| +--- androidx.core:core:1.5.0 -> 1.10.1 (*)
+| +--- androidx.core:core:1.5.0 -> 1.12.0 (*)
| +--- androidx.dynamicanimation:dynamicanimation:1.0.0
-| | \--- androidx.core:core:1.0.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.0.0 -> 1.12.0 (*)
| \--- androidx.viewpager2:viewpager2:1.0.0 -> 1.1.0-beta02
-| \--- androidx.core:core:1.3.2 -> 1.10.1 (*)
+| \--- androidx.core:core:1.3.2 -> 1.12.0 (*)
+--- androidx.browser:browser:1.5.0
-| \--- androidx.core:core:1.1.0 -> 1.10.1 (*)
+| \--- androidx.core:core:1.1.0 -> 1.12.0 (*)
+--- androidx.preference:preference:1.2.0
-| \--- androidx.core:core:1.6.0 -> 1.10.1 (*)
+| \--- androidx.core:core:1.6.0 -> 1.12.0 (*)
+--- androidx.work:work-runtime-ktx:2.7.1
| \--- androidx.work:work-runtime:2.7.1
-| +--- androidx.core:core:1.6.0 -> 1.10.1 (*)
+| +--- androidx.core:core:1.6.0 -> 1.12.0 (*)
-| \--- androidx.core:core:1.1.0 -> 1.10.1 (*)
+| \--- androidx.core:core:1.1.0 -> 1.12.0 (*)
+--- org.wordpress:utils:3.5.0
| +--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
-| | \--- androidx.core:core:1.1.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.1.0 -> 1.12.0 (*)
-| \--- androidx.core:core-ktx:1.5.0 -> 1.10.1 (*)
+| \--- androidx.core:core-ktx:1.5.0 -> 1.12.0 (*)
+--- com.automattic:Automattic-Tracks-Android:3.2.0
| \--- io.sentry:sentry-android -> 6.18.1
| \--- io.sentry:sentry-android-core:6.18.1
-| \--- androidx.core:core:1.3.2 -> 1.10.1 (*)
+| \--- androidx.core:core:1.3.2 -> 1.12.0 (*)
+--- org.wordpress:login:123-74f39081145a26c253b81aee021d40d3cfc0d13f
| +--- androidx.media:media:1.2.1
-| | \--- androidx.core:core:1.3.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.3.0 -> 1.12.0 (*)
| +--- androidx.legacy:legacy-support-v13:1.0.0
| | \--- androidx.legacy:legacy-support-v4:1.0.0
-| | +--- androidx.core:core:1.0.0 -> 1.10.1 (*)
+| | +--- androidx.core:core:1.0.0 -> 1.12.0 (*)
| | \--- androidx.legacy:legacy-support-core-ui:1.0.0
-| | +--- androidx.core:core:1.0.0 -> 1.10.1 (*)
+| | +--- androidx.core:core:1.0.0 -> 1.12.0 (*)
| | \--- androidx.asynclayoutinflater:asynclayoutinflater:1.0.0
-| | \--- androidx.core:core:1.0.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.0.0 -> 1.12.0 (*)
| +--- androidx.gridlayout:gridlayout:1.0.0
-| | \--- androidx.core:core:1.0.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.0.0 -> 1.12.0 (*)
-| \--- androidx.core:core-ktx:1.3.2 -> 1.10.1 (*)
+| \--- androidx.core:core-ktx:1.3.2 -> 1.12.0 (*)
+--- project :libs:cardreader
| \--- com.stripe:stripeterminal-localmobile:2.21.1
-| \--- androidx.core:core-ktx:1.10.1 (*)
+| \--- androidx.core:core-ktx:1.10.1 -> 1.12.0 (*)
+--- com.automattic:about:0.0.6
-| +--- androidx.core:core-ktx:1.7.0 -> 1.10.1 (*)
+| +--- androidx.core:core-ktx:1.7.0 -> 1.12.0 (*)
| +--- androidx.compose.ui:ui:1.0.5 -> 1.4.3
| | +--- androidx.autofill:autofill:1.0.0
-| | | \--- androidx.core:core:1.1.0 -> 1.10.1 (*)
+| | | \--- androidx.core:core:1.1.0 -> 1.12.0 (*)
| | +--- androidx.compose.ui:ui-text:1.4.3
-| | | \--- androidx.core:core:1.7.0 -> 1.10.1 (*)
+| | | \--- androidx.core:core:1.7.0 -> 1.12.0 (*)
-| | \--- androidx.core:core:1.9.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.9.0 -> 1.12.0 (*)
| +--- androidx.compose.ui:ui-tooling:1.0.5 -> 1.4.3
| | \--- androidx.compose.animation:animation:1.4.3
| | \--- androidx.compose.foundation:foundation-layout:1.2.1 -> 1.4.3
-| | \--- androidx.core:core:1.7.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.7.0 -> 1.12.0 (*)
| \--- com.google.android.material:compose-theme-adapter:1.1.1
-| \--- androidx.core:core-ktx:1.3.1 -> 1.10.1 (*)
+| \--- androidx.core:core-ktx:1.3.1 -> 1.12.0 (*)
+--- com.google.android.gms:play-services-code-scanner:16.0.0-beta3
| \--- com.google.mlkit:barcode-scanning-common:17.0.0
| \--- com.google.mlkit:vision-common:17.0.0 -> 17.3.0
| \--- com.google.mlkit:common:18.6.0 -> 18.9.0
-| \--- androidx.core:core:1.0.0 -> 1.10.1 (*)
+| \--- androidx.core:core:1.0.0 -> 1.12.0 (*)
+--- com.zendesk:support:5.0.8
| \--- com.zendesk:guide:1.0.7
| \--- com.zendesk:messaging:5.2.3
| \--- com.zendesk:common-ui:4.0.3
| \--- com.zendesk.belvedere2:belvedere:3.0.0-RC
| +--- com.zendesk.belvedere2:belvedere-core:3.0.0-RC
-| | \--- androidx.core:core:1.3.1 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.3.1 -> 1.12.0 (*)
-| \--- androidx.core:core:1.3.1 -> 1.10.1 (*)
+| \--- androidx.core:core:1.3.1 -> 1.12.0 (*)
-+--- org.wordpress:mediapicker:0.2
-| +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 -> 1.8.21 (*)
-| +--- org.wordpress.mediapicker:domain:0.2
-| | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 -> 1.8.21 (*)
-| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
-| | +--- androidx.core:core-ktx:1.7.0 -> 1.10.1 (*)
-| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.4 (*)
-| +--- androidx.databinding:viewbinding:8.1.0 (*)
-| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
-| +--- com.google.android.material:material:1.5.0 -> 1.6.1 (*)
-| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.4 (*)
-| +--- androidx.navigation:navigation-fragment-ktx:2.3.5 -> 2.5.3 (*)
-| +--- androidx.core:core-ktx:1.7.0 -> 1.10.1 (*)
-| +--- androidx.appcompat:appcompat:1.4.1 -> 1.4.2 (*)
-| +--- androidx.constraintlayout:constraintlayout:2.1.1 -> 2.1.4 (*)
-| +--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 (*)
-| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0 -> 2.6.2 (*)
-| +--- androidx.datastore:datastore-preferences:1.0.0 (*)
-| +--- com.github.bumptech.glide:glide:4.12.0 -> 4.13.2 (*)
-| +--- com.google.dagger:hilt-android:2.42 -> 2.45 (*)
-| +--- com.google.dagger:hilt-android-compiler:2.42
-| | +--- com.google.dagger:dagger:2.42 -> 2.46.1 (*)
-| | +--- com.google.dagger:dagger-compiler:2.42
-| | | +--- com.google.dagger:dagger:2.42 -> 2.46.1 (*)
-| | | +--- com.google.dagger:dagger-producers:2.42
-| | | | +--- com.google.dagger:dagger:2.42 -> 2.46.1 (*)
-| | | | +--- com.google.guava:failureaccess:1.0.1
-| | | | +--- com.google.guava:guava:31.0.1-jre -> 31.1-android (*)
-| | | | +--- javax.inject:javax.inject:1
-| | | | \--- org.checkerframework:checker-compat-qual:2.5.5
-| | | +--- com.google.dagger:dagger-spi:2.42
-| | | | +--- com.google.dagger:dagger:2.42 -> 2.46.1 (*)
-| | | | +--- com.google.dagger:dagger-producers:2.42 (*)
-| | | | +--- com.google.code.findbugs:jsr305:3.0.2
-| | | | +--- com.google.devtools.ksp:symbol-processing-api:1.5.30-1.0.0
-| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30 -> 1.8.21 (*)
-| | | | +--- com.google.guava:failureaccess:1.0.1
-| | | | +--- com.google.guava:guava:31.0.1-jre -> 31.1-android (*)
-| | | | +--- com.squareup:javapoet:1.13.0
-| | | | +--- javax.inject:javax.inject:1
-| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.8.22 (*)
-| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 -> 1.8.21 (*)
-| | | +--- com.google.code.findbugs:jsr305:3.0.2
-| | | +--- com.google.googlejavaformat:google-java-format:1.5
-| | | | +--- com.google.guava:guava:22.0 -> 31.1-android (*)
-| | | | \--- com.google.errorprone:javac-shaded:9-dev-r4023-3
-| | | +--- com.google.guava:failureaccess:1.0.1
-| | | +--- com.google.guava:guava:31.0.1-jre -> 31.1-android (*)
-| | | +--- com.squareup:javapoet:1.13.0
-| | | +--- javax.inject:javax.inject:1
-| | | +--- net.ltgt.gradle.incap:incap:0.2
-| | | +--- org.checkerframework:checker-compat-qual:2.5.5
-| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.8.22 (*)
-| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 -> 1.8.21 (*)
-| | | \--- org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.4.2
-| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.8.22 (*)
-| | +--- com.google.dagger:dagger-spi:2.42 (*)
-| | +--- com.google.code.findbugs:jsr305:3.0.2
-| | +--- com.google.guava:failureaccess:1.0.1
-| | +--- com.google.guava:guava:31.0.1-jre -> 31.1-android (*)
-| | +--- com.squareup:javapoet:1.13.0
-| | +--- javax.annotation:jsr250-api:1.0
-| | +--- javax.inject:javax.inject:1
-| | +--- net.ltgt.gradle.incap:incap:0.2
-| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.8.22 (*)
-| | \--- org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.4.2 (*)
-| \--- com.github.chrisbanes:PhotoView:2.3.0 (*)
++--- org.wordpress:mediapicker:0.3.0
+| +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.8.21 (*)
+| +--- com.google.android.material:material:1.6.1 (*)
+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*)
+| +--- androidx.navigation:navigation-fragment-ktx:2.5.3 (*)
+| +--- androidx.core:core-ktx:1.12.0 (*)
+| +--- androidx.appcompat:appcompat:1.4.2 (*)
+| +--- androidx.constraintlayout:constraintlayout:2.1.4 (*)
+| +--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 (*)
+| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2 (*)
+| +--- androidx.datastore:datastore-preferences:1.0.0 (*)
+| +--- com.github.bumptech.glide:glide:4.13.2 (*)
+| +--- com.google.dagger:hilt-android:2.45 (*)
+| +--- com.google.dagger:hilt-android-compiler:2.45
+| | +--- com.google.dagger:dagger:2.45 -> 2.46.1 (*)
+| | +--- com.google.dagger:dagger-compiler:2.45
+| | | +--- com.google.dagger:dagger:2.45 -> 2.46.1 (*)
+| | | +--- com.google.dagger:dagger-producers:2.45
+| | | | +--- com.google.dagger:dagger:2.45 -> 2.46.1 (*)
+| | | | +--- com.google.guava:failureaccess:1.0.1
+| | | | +--- com.google.guava:guava:31.0.1-jre -> 31.1-android (*)
+| | | | +--- javax.inject:javax.inject:1
+| | | | \--- org.checkerframework:checker-compat-qual:2.5.5
+| | | +--- com.google.dagger:dagger-spi:2.45
+| | | | +--- com.google.dagger:dagger:2.45 -> 2.46.1 (*)
+| | | | +--- com.google.dagger:dagger-producers:2.45 (*)
+| | | | +--- com.google.code.findbugs:jsr305:3.0.2
+| | | | +--- com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6
+| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.0 -> 1.8.22 (*)
+| | | | +--- com.google.guava:failureaccess:1.0.1
+| | | | +--- com.google.guava:guava:31.0.1-jre -> 31.1-android (*)
+| | | | +--- com.squareup:javapoet:1.13.0
+| | | | +--- com.squareup:kotlinpoet:1.11.0
+| | | | | +--- org.jetbrains.kotlin:kotlin-reflect:1.6.10
+| | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.8.22 (*)
+| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
+| | | | +--- javax.inject:javax.inject:1
+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.0 -> 1.8.22 (*)
+| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.0 -> 1.8.21 (*)
+| | | +--- com.google.code.findbugs:jsr305:3.0.2
+| | | +--- com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6 (*)
+| | | +--- com.google.googlejavaformat:google-java-format:1.5
+| | | | +--- com.google.guava:guava:22.0 -> 31.1-android (*)
+| | | | \--- com.google.errorprone:javac-shaded:9-dev-r4023-3
+| | | +--- com.google.guava:failureaccess:1.0.1
+| | | +--- com.google.guava:guava:31.0.1-jre -> 31.1-android (*)
+| | | +--- com.squareup:javapoet:1.13.0
+| | | +--- javax.inject:javax.inject:1
+| | | +--- net.ltgt.gradle.incap:incap:0.2
+| | | +--- org.checkerframework:checker-compat-qual:2.5.5
+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.0 -> 1.8.22 (*)
+| | | \--- org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0
+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.0 -> 1.8.22 (*)
+| | +--- com.google.dagger:dagger-spi:2.45 (*)
+| | +--- com.google.code.findbugs:jsr305:3.0.2
+| | +--- com.google.guava:failureaccess:1.0.1
+| | +--- com.google.guava:guava:31.0.1-jre -> 31.1-android (*)
+| | +--- com.squareup:javapoet:1.13.0
+| | +--- javax.annotation:javax.annotation-api:1.3.2
+| | +--- javax.inject:javax.inject:1
+| | +--- net.ltgt.gradle.incap:incap:0.2
+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.0 -> 1.8.22 (*)
+| | \--- org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0 (*)
+| +--- com.github.chrisbanes:PhotoView:2.3.0 (*)
+| +--- org.wordpress.mediapicker:domain:0.3.0
+| | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.8.21 (*)
+| | +--- androidx.core:core-ktx:1.12.0 (*)
+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*)
+| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 (*)
+| +--- androidx.databinding:viewbinding:8.1.0 (*)
+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 (*)
++--- org.wordpress.mediapicker:source-camera:0.3.0
+| +--- org.wordpress.mediapicker:domain:0.3.0 (*)
+| +--- androidx.core:core-ktx:1.12.0 (*)
+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 (*)
-+--- org.wordpress.mediapicker:source-device:0.2
-| +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 -> 1.8.21 (*)
-| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
-| +--- org.wordpress.mediapicker:domain:0.2 (*)
-| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.4 (*)
-| +--- com.google.dagger:hilt-android:2.42 -> 2.45 (*)
-| \--- com.google.dagger:hilt-android-compiler:2.42 (*)
-+--- org.wordpress.mediapicker:source-wordpress:0.2
-| +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 -> 1.8.21 (*)
-| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
-| +--- org.wordpress.mediapicker:domain:0.2 (*)
-| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.4 (*)
-| +--- com.google.dagger:hilt-android:2.42 -> 2.45 (*)
-| \--- com.google.dagger:hilt-android-compiler:2.42 (*)
++--- org.wordpress.mediapicker:source-wordpress:0.3.0
+| +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.8.21 (*)
+| +--- org.wordpress.mediapicker:domain:0.3.0 (*)
+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*)
+| +--- com.google.dagger:hilt-android:2.45 (*)
+| +--- com.google.dagger:hilt-android-compiler:2.45 (*)
+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 (*)
+--- androidx.compose.ui:ui-text-google-fonts -> 1.4.3
-| \--- androidx.core:core:1.8.0 -> 1.10.1 (*)
+| \--- androidx.core:core:1.8.0 -> 1.12.0 (*)
+--- com.google.accompanist:accompanist-systemuicontroller:0.23.1
-| \--- androidx.core:core-ktx:1.7.0 -> 1.10.1 (*)
+| \--- androidx.core:core-ktx:1.7.0 -> 1.12.0 (*)
+--- io.coil-kt:coil-compose:2.1.0
| \--- io.coil-kt:coil-compose-base:2.1.0
| +--- io.coil-kt:coil-base:2.1.0
-| | \--- androidx.core:core-ktx:1.7.0 -> 1.10.1 (*)
+| | \--- androidx.core:core-ktx:1.7.0 -> 1.12.0 (*)
-| \--- androidx.core:core-ktx:1.7.0 -> 1.10.1 (*)
+| \--- androidx.core:core-ktx:1.7.0 -> 1.12.0 (*)
+--- io.coil-kt:coil-svg:2.1.0
-| \--- androidx.core:core-ktx:1.7.0 -> 1.10.1 (*)
+| \--- androidx.core:core-ktx:1.7.0 -> 1.12.0 (*)
+--- androidx.camera:camera-camera2:1.2.3
| +--- androidx.camera:camera-core:1.2.3
-| | \--- androidx.core:core:1.1.0 -> 1.10.1 (*)
+| | \--- androidx.core:core:1.1.0 -> 1.12.0 (*)
-| \--- androidx.core:core:1.1.0 -> 1.10.1 (*)
+| \--- androidx.core:core:1.1.0 -> 1.12.0 (*)
+--- androidx.camera:camera-lifecycle:1.2.3
-| \--- androidx.core:core:1.1.0 -> 1.10.1 (*)
+| \--- androidx.core:core:1.1.0 -> 1.12.0 (*)
\--- androidx.camera:camera-view:1.2.3
- \--- androidx.core:core:1.3.2 -> 1.10.1 (*)
+ \--- androidx.core:core:1.3.2 -> 1.12.0 (*)
Please review and act accordingly
|
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## trunk #10207 +/- ##
============================================
- Coverage 42.34% 42.31% -0.03%
Complexity 4796 4796
============================================
Files 976 976
Lines 54182 54221 +39
Branches 7128 7131 +3
============================================
+ Hits 22941 22944 +3
- Misses 29249 29285 +36
Partials 1992 1992 ☔ View full report in Codecov by Sentry. |
This PR merges the final changes from 16.2 into
trunk
. Includes: