Skip to content
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

Update our dependencies to AGP 7.2.1 PRs #6876

Conversation

oguzkocer
Copy link
Contributor

Description

We are updating our projects to AGP 7.2.1. This PR updates these dependency versions from their AGP update PRs, so we can test them all together.

Note that I did not update Aztec version because the current version seems quite a bit behind the latest version and since we don't have composite build support for it in this client, this update would be outside the scope of the AGP update work. We should still try to do this update as a separate PR once we get the AGP updates sorted out.

Testing instructions

Smoke test the app

  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

@oguzkocer oguzkocer added this to the 9.6 milestone Jul 6, 2022
@peril-woocommerce
Copy link

peril-woocommerce bot commented Jul 6, 2022

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@wpmobilebot
Copy link
Collaborator

wpmobilebot commented Jul 6, 2022

You can test the changes on this Pull Request by downloading an installable build, or scanning this QR code:

@oguzkocer oguzkocer marked this pull request as ready for review July 6, 2022 18:05
@oguzkocer oguzkocer requested a review from ParaskP7 July 6, 2022 18:05
@ParaskP7 ParaskP7 self-assigned this Jul 7, 2022
Copy link
Contributor

@ParaskP7 ParaskP7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👋 @oguzkocer !

I reviewed and smoked tested the app, everything LGTM, it is a 👍 from my side and thank you so much for working on this! 💯

Note that I did not update Aztec version because the current version seems quite a bit behind the latest version and since we don't have composite build support for it in this client, this update would be outside the scope of the AGP update work.

👍

We should still try to do this update as a separate PR once we get the AGP updates sorted out.

I totally agree on that! 💯

PS: I also checked the dependency tree diff and the only diff I could spot was Dagger related, which is expectable as some of the libs got updated to dagger-2.42.

@peril-woocommerce
Copy link

Warnings
⚠️ This PR is assigned to a milestone which is closing in less than 4 days Please, make sure to get it merged by then or assign it to a later expiring milestone

Generated by 🚫 dangerJS

@wpmobilebot
Copy link
Collaborator

Found 1 violations:

The PR caused the following dependency changes:

expand

-+--- org.wordpress:utils:2.3.0
++--- org.wordpress:utils:2.6.0
 +--- com.automattic.tracks:experimentation:trunk-f25f5b5e77df8313f19d47d07e7411256d18df79
-|    +--- org.wordpress:fluxc:1.36.0 -> 1.45.1
-|    |    +--- org.wordpress:wellsql:1.7.0
-|    |    |    +--- com.android.support:support-annotations:28.0.0
-|    |    |    \--- org.wordpress.wellsql:wellsql-annotations:1.7.0
-|    |    +--- org.wordpress.fluxc:fluxc-annotations:1.45.1
-|    |    +--- org.greenrobot:eventbus:3.3.1 (*)
-|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.9.3
-|    |    |    +--- com.squareup.okio:okio:2.8.0 -> 3.0.0
-|    |    |    |    \--- com.squareup.okio:okio-jvm:3.0.0
-|    |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.6.10 (*)
-|    |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 -> 1.6.10
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.6.10 (*)
-|    |    +--- com.android.volley:volley:1.1.1 -> 1.2.0
-|    |    +--- androidx.paging:paging-runtime:2.1.2
-|    |    |    +--- androidx.paging:paging-common:2.1.2
-|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
-|    |    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.1.0 (*)
-|    |    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.1.0 (*)
-|    |    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.4.1 (*)
-|    |    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.4.1 (*)
-|    |    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.2.1 (*)
-|    |    +--- com.goterl:lazysodium-android:5.0.2
-|    |    +--- net.java.dev.jna:jna:5.5.0
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.10
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (*)
-|    |    +--- androidx.appcompat:appcompat:1.0.2 -> 1.4.1 (*)
-|    |    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.2.1 (*)
-|    |    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.3
-|    |    |    \--- androidx.annotation:annotation:1.2.0 -> 1.3.0
-|    |    +--- org.wordpress:utils:develop-eebc5d8e91a1d90190919f900f924b39c861a528 -> 2.3.0 (*)
-|    |    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2
-|    |    |    +--- com.squareup.okhttp3:okhttp:4.9.2 -> 4.9.3 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.6.10 (*)
-|    |    +--- com.google.code.gson:gson:2.8.5 -> 2.9.0
-|    |    +--- org.apache.commons:commons-text:1.1 -> 1.8 (*)
-|    |    +--- androidx.room:room-runtime:2.4.2
-|    |    |    +--- androidx.room:room-common:2.4.2
-|    |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.3.0
-|    |    |    +--- androidx.sqlite:sqlite-framework:2.2.0
-|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
-|    |    |    |    \--- androidx.sqlite:sqlite:2.2.0
-|    |    |    |         \--- androidx.annotation:annotation:1.0.0 -> 1.3.0
-|    |    |    +--- androidx.sqlite:sqlite:2.2.0 (*)
-|    |    |    +--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*)
-|    |    |    \--- androidx.annotation:annotation-experimental:1.1.0
-|    |    +--- androidx.room:room-ktx:2.4.2
-|    |    |    +--- androidx.room:room-common:2.4.2 (*)
-|    |    |    +--- androidx.room:room-runtime:2.4.2 (*)
-|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (*)
-|    |    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.1 (*)
-|    |    +--- com.google.dagger:dagger:2.29.1 -> 2.42
-|    |    |    \--- javax.inject:javax.inject:1
-|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.1 (*)
-|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.6.1 (*)
-|    \--- org.wordpress:utils:2.3.0 (*)
+|    \--- org.wordpress:utils:2.3.0 -> 2.6.0 (*)
 +--- com.automattic:Automattic-Tracks-Android:2.2.0
 |    \--- io.sentry:sentry-android-okhttp -> 5.4.3
-|         \--- com.squareup.okhttp3:okhttp -> 4.9.3 (*)
+|         \--- com.squareup.okhttp3:okhttp -> 4.9.3
+|              +--- com.squareup.okio:okio:2.8.0 -> 3.0.0
+|              |    \--- com.squareup.okio:okio-jvm:3.0.0
+|              |         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.6.10 (*)
+|              |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 -> 1.6.10
+|              \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.6.10 (*)
-+--- org.wordpress:fluxc:1.45.1 (*)
++--- org.wordpress:fluxc:trunk-f44a381615f6d850e9c95071469424fbde6daff8
+|    +--- org.wordpress:wellsql:1.7.0
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:1.7.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-f44a381615f6d850e9c95071469424fbde6daff8
+|    +--- org.greenrobot:eventbus:3.3.1 (*)
+|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.9.3 (*)
+|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
+|    +--- androidx.paging:paging-runtime:2.1.2
+|    |    +--- androidx.paging:paging-common:2.1.2
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
+|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.1.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.1.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.4.1 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.4.1 (*)
+|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.2.1 (*)
+|    +--- com.goterl:lazysodium-android:5.0.2
+|    +--- net.java.dev.jna:jna:5.5.0
+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
+|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.10
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (*)
+|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.4.1 (*)
+|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.2.1 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.3
+|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.3.0
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2
+|    |    +--- com.squareup.okhttp3:okhttp:4.9.2 -> 4.9.3 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.6.10 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.9.0
+|    +--- org.apache.commons:commons-text:1.1 -> 1.8 (*)
+|    +--- androidx.room:room-runtime:2.4.2
+|    |    +--- androidx.room:room-common:2.4.2
+|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.3.0
+|    |    +--- androidx.sqlite:sqlite-framework:2.2.0
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
+|    |    |    \--- androidx.sqlite:sqlite:2.2.0
+|    |    |         \--- androidx.annotation:annotation:1.0.0 -> 1.3.0
+|    |    +--- androidx.sqlite:sqlite:2.2.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*)
+|    |    \--- androidx.annotation:annotation-experimental:1.1.0
+|    +--- androidx.room:room-ktx:2.4.2
+|    |    +--- androidx.room:room-common:2.4.2 (*)
+|    |    +--- androidx.room:room-runtime:2.4.2 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (*)
+|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.1 (*)
+|    +--- com.google.dagger:dagger:2.42
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.1 (*)
+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.6.1 (*)
-+--- org.wordpress.fluxc.plugins:woocommerce:1.45.1
-|    +--- org.wordpress:wellsql:1.7.0 (*)
-|    +--- org.wordpress.fluxc:fluxc-annotations:1.45.1
-|    +--- androidx.room:room-ktx:2.4.2 (*)
-|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
-|    +--- org.wordpress:fluxc:1.45.1 (*)
-|    +--- org.apache.commons:commons-lang3:3.7 -> 3.9
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.9.0
-|    +--- com.google.dagger:dagger:2.29.1 -> 2.42 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.6.1 (*)
-|    \--- androidx.room:room-runtime:2.4.2 (*)
++--- org.wordpress.fluxc.plugins:woocommerce:trunk-f44a381615f6d850e9c95071469424fbde6daff8
+|    +--- org.wordpress:wellsql:1.7.0 (*)
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-f44a381615f6d850e9c95071469424fbde6daff8
+|    +--- androidx.room:room-ktx:2.4.2 (*)
+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
+|    +--- org.wordpress:fluxc:trunk-f44a381615f6d850e9c95071469424fbde6daff8 (*)
+|    +--- org.apache.commons:commons-lang3:3.7 -> 3.9
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.9.0
+|    +--- com.google.dagger:dagger:2.42 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.1 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.6.1 (*)
+|    \--- androidx.room:room-runtime:2.4.2 (*)
-+--- org.wordpress:login:0.13.0
-|    +--- com.google.android.gms:play-services-auth:18.1.0 -> 20.2.0 (*)
-|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.6.10 (*)
-|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.4.1 (*)
-|    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
-|    +--- androidx.media:media:1.2.1 (*)
-|    +--- androidx.legacy:legacy-support-v13:1.0.0
-|    |    \--- androidx.legacy:legacy-support-v4:1.0.0 (*)
-|    +--- androidx.gridlayout:gridlayout:1.0.0
-|    |    +--- androidx.core:core:1.0.0 -> 1.7.0 (*)
-|    |    \--- androidx.legacy:legacy-support-core-ui:1.0.0 (*)
-|    +--- androidx.constraintlayout:constraintlayout:2.0.4 -> 2.1.4 (*)
-|    +--- com.google.android.material:material:1.2.1 -> 1.6.1 (*)
-|    +--- androidx.core:core-ktx:1.3.2 -> 1.7.0 (*)
-|    +--- com.github.bumptech.glide:glide:4.12.0 -> 4.13.2
-|    |    +--- com.github.bumptech.glide:gifdecoder:4.13.2
-|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.3.0
-|    |    +--- com.github.bumptech.glide:disklrucache:4.13.2
-|    |    +--- com.github.bumptech.glide:annotations:4.13.2
-|    |    +--- androidx.fragment:fragment:1.3.1 -> 1.4.1 (*)
-|    |    +--- androidx.vectordrawable:vectordrawable-animated:1.0.0 -> 1.1.0 (*)
-|    |    +--- androidx.exifinterface:exifinterface:1.2.0 -> 1.3.3 (*)
-|    |    \--- androidx.tracing:tracing:1.0.0 (*)
-|    +--- com.google.dagger:dagger:2.33 -> 2.42 (*)
-|    \--- com.google.dagger:dagger-android-support:2.33 -> 2.42
-|         +--- com.google.dagger:dagger:2.42 (*)
-|         +--- com.google.dagger:dagger-android:2.42
-|         |    +--- com.google.dagger:dagger:2.42 (*)
-|         |    +--- com.google.dagger:dagger-lint-aar:2.42
-|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.3.0
-|         |    \--- javax.inject:javax.inject:1
-|         +--- com.google.dagger:dagger-lint-aar:2.42
-|         +--- androidx.activity:activity:1.3.1 -> 1.4.0 (*)
-|         +--- androidx.annotation:annotation:1.2.0 -> 1.3.0
-|         +--- androidx.appcompat:appcompat:1.3.1 -> 1.4.1 (*)
-|         +--- androidx.fragment:fragment:1.3.6 -> 1.4.1 (*)
-|         +--- androidx.lifecycle:lifecycle-common:2.3.1 -> 2.4.1 (*)
-|         +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 -> 2.4.1 (*)
-|         +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1 -> 2.4.1 (*)
-|         \--- javax.inject:javax.inject:1
++--- org.wordpress:login:0.15.0
+|    +--- com.google.android.gms:play-services-auth:18.1.0 -> 20.2.0 (*)
+|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.6.10 (*)
+|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.4.1 (*)
+|    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
+|    +--- androidx.media:media:1.2.1 (*)
+|    +--- androidx.legacy:legacy-support-v13:1.0.0
+|    |    \--- androidx.legacy:legacy-support-v4:1.0.0 (*)
+|    +--- androidx.gridlayout:gridlayout:1.0.0
+|    |    +--- androidx.core:core:1.0.0 -> 1.7.0 (*)
+|    |    \--- androidx.legacy:legacy-support-core-ui:1.0.0 (*)
+|    +--- androidx.constraintlayout:constraintlayout:2.0.4 -> 2.1.4 (*)
+|    +--- com.google.android.material:material:1.2.1 -> 1.6.1 (*)
+|    +--- androidx.core:core-ktx:1.3.2 -> 1.7.0 (*)
+|    +--- com.github.bumptech.glide:glide:4.12.0 -> 4.13.2
+|    |    +--- com.github.bumptech.glide:gifdecoder:4.13.2
+|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.3.0
+|    |    +--- com.github.bumptech.glide:disklrucache:4.13.2
+|    |    +--- com.github.bumptech.glide:annotations:4.13.2
+|    |    +--- androidx.fragment:fragment:1.3.1 -> 1.4.1 (*)
+|    |    +--- androidx.vectordrawable:vectordrawable-animated:1.0.0 -> 1.1.0 (*)
+|    |    +--- androidx.exifinterface:exifinterface:1.2.0 -> 1.3.3 (*)
+|    |    \--- androidx.tracing:tracing:1.0.0 (*)
+|    +--- com.google.dagger:dagger:2.42 (*)
+|    \--- com.google.dagger:dagger-android-support:2.42
+|         +--- com.google.dagger:dagger:2.42 (*)
+|         +--- com.google.dagger:dagger-android:2.42
+|         |    +--- com.google.dagger:dagger:2.42 (*)
+|         |    +--- com.google.dagger:dagger-lint-aar:2.42
+|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.3.0
+|         |    \--- javax.inject:javax.inject:1
+|         +--- com.google.dagger:dagger-lint-aar:2.42
+|         +--- androidx.activity:activity:1.3.1 -> 1.4.0 (*)
+|         +--- androidx.annotation:annotation:1.2.0 -> 1.3.0
+|         +--- androidx.appcompat:appcompat:1.3.1 -> 1.4.1 (*)
+|         +--- androidx.fragment:fragment:1.3.6 -> 1.4.1 (*)
+|         +--- androidx.lifecycle:lifecycle-common:2.3.1 -> 2.4.1 (*)
+|         +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 -> 2.4.1 (*)
+|         +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1 -> 2.4.1 (*)
+|         \--- javax.inject:javax.inject:1
-+--- com.automattic:about:0.0.4
++--- com.automattic:about:0.0.6
-+--- org.wordpress:mediapicker:trunk-d0db2634cf27511bec3ef9b837f9cfe27c5ab601
-|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 (*)
-|    +--- org.wordpress.mediapicker:domain:trunk-d0db2634cf27511bec3ef9b837f9cfe27c5ab601
-|    |    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
-|    |    +--- androidx.core:core-ktx:1.7.0 (*)
-|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.1 (*)
-|    +--- androidx.databinding:viewbinding:7.1.1 -> 7.2.1 (*)
-|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
-|    +--- com.google.android.material:material:1.5.0 -> 1.6.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.1 (*)
-|    +--- androidx.navigation:navigation-fragment-ktx:2.3.5 -> 2.4.1 (*)
-|    +--- androidx.core:core-ktx:1.7.0 (*)
-|    +--- androidx.appcompat:appcompat:1.4.1 (*)
-|    +--- androidx.constraintlayout:constraintlayout:2.1.1 -> 2.1.4 (*)
-|    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 (*)
-|    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0 (*)
-|    +--- androidx.datastore:datastore-preferences:1.0.0 (*)
-|    +--- com.github.bumptech.glide:glide:4.12.0 -> 4.13.2 (*)
-|    +--- com.google.dagger:hilt-android:2.40.5 -> 2.42 (*)
-|    +--- com.google.dagger:hilt-android-compiler:2.40.5
-|    |    +--- com.google.dagger:dagger:2.40.5 -> 2.42 (*)
-|    |    +--- com.google.dagger:dagger-compiler:2.40.5
-|    |    |    +--- com.google.dagger:dagger:2.40.5 -> 2.42 (*)
-|    |    |    +--- com.google.dagger:dagger-producers:2.40.5
-|    |    |    |    +--- com.google.dagger:dagger:2.40.5 -> 2.42 (*)
-|    |    |    |    +--- com.google.guava:failureaccess:1.0.1
-|    |    |    |    +--- com.google.guava:guava:31.0.1-jre (*)
-|    |    |    |    +--- javax.inject:javax.inject:1
-|    |    |    |    \--- org.checkerframework:checker-compat-qual:2.5.5
-|    |    |    +--- com.google.dagger:dagger-spi:2.40.5
-|    |    |    |    +--- com.google.dagger:dagger:2.40.5 -> 2.42 (*)
-|    |    |    |    +--- com.google.dagger:dagger-producers:2.40.5 (*)
-|    |    |    |    +--- 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.6.10 (*)
-|    |    |    |    +--- com.google.guava:failureaccess:1.0.1
-|    |    |    |    +--- com.google.guava:guava:31.0.1-jre (*)
-|    |    |    |    +--- com.squareup:javapoet:1.13.0
-|    |    |    |    +--- javax.inject:javax.inject:1
-|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.6.10 (*)
-|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30 -> 1.6.10 (*)
-|    |    |    +--- com.google.code.findbugs:jsr305:3.0.2
-|    |    |    +--- com.google.googlejavaformat:google-java-format:1.5
-|    |    |    |    +--- com.google.guava:guava:22.0 -> 31.0.1-jre (*)
-|    |    |    |    \--- com.google.errorprone:javac-shaded:9-dev-r4023-3
-|    |    |    +--- com.google.guava:failureaccess:1.0.1
-|    |    |    +--- com.google.guava:guava:31.0.1-jre (*)
-|    |    |    +--- 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.5.30 -> 1.6.10 (*)
-|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30 -> 1.6.10 (*)
-|    |    |    \--- org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.3.0
-|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.0 -> 1.6.10 (*)
-|    |    +--- com.google.dagger:dagger-spi:2.40.5 (*)
-|    |    +--- com.google.code.findbugs:jsr305:3.0.2
-|    |    +--- com.google.guava:failureaccess:1.0.1
-|    |    +--- com.google.guava:guava:31.0.1-jre (*)
-|    |    +--- 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.5.30 -> 1.6.10 (*)
-|    |    \--- org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.3.0 (*)
-|    \--- com.github.chrisbanes:PhotoView:2.3.0 (*)
++--- org.wordpress:mediapicker:0.1.0
+|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 (*)
+|    +--- org.wordpress.mediapicker:domain:0.1.0
+|    |    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
+|    |    +--- androidx.core:core-ktx:1.7.0 (*)
+|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.1 (*)
+|    +--- androidx.databinding:viewbinding:7.2.1 (*)
+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
+|    +--- com.google.android.material:material:1.5.0 -> 1.6.1 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.1 (*)
+|    +--- androidx.navigation:navigation-fragment-ktx:2.3.5 -> 2.4.1 (*)
+|    +--- androidx.core:core-ktx:1.7.0 (*)
+|    +--- androidx.appcompat:appcompat:1.4.1 (*)
+|    +--- androidx.constraintlayout:constraintlayout:2.1.1 -> 2.1.4 (*)
+|    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 (*)
+|    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0 (*)
+|    +--- 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 (*)
+|    +--- com.google.dagger:hilt-android-compiler:2.42
+|    |    +--- com.google.dagger:dagger:2.42 (*)
+|    |    +--- com.google.dagger:dagger-compiler:2.42
+|    |    |    +--- com.google.dagger:dagger:2.42 (*)
+|    |    |    +--- com.google.dagger:dagger-producers:2.42
+|    |    |    |    +--- com.google.dagger:dagger:2.42 (*)
+|    |    |    |    +--- com.google.guava:failureaccess:1.0.1
+|    |    |    |    +--- com.google.guava:guava:31.0.1-jre (*)
+|    |    |    |    +--- 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 (*)
+|    |    |    |    +--- 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.6.10 (*)
+|    |    |    |    +--- com.google.guava:failureaccess:1.0.1
+|    |    |    |    +--- com.google.guava:guava:31.0.1-jre (*)
+|    |    |    |    +--- com.squareup:javapoet:1.13.0
+|    |    |    |    +--- javax.inject:javax.inject:1
+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (*)
+|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 -> 1.6.10 (*)
+|    |    |    +--- com.google.code.findbugs:jsr305:3.0.2
+|    |    |    +--- com.google.googlejavaformat:google-java-format:1.5
+|    |    |    |    +--- com.google.guava:guava:22.0 -> 31.0.1-jre (*)
+|    |    |    |    \--- com.google.errorprone:javac-shaded:9-dev-r4023-3
+|    |    |    +--- com.google.guava:failureaccess:1.0.1
+|    |    |    +--- com.google.guava:guava:31.0.1-jre (*)
+|    |    |    +--- 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 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 -> 1.6.10 (*)
+|    |    |    \--- org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.4.2
+|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (*)
+|    |    +--- 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 (*)
+|    |    +--- 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 (*)
+|    |    \--- org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.4.2 (*)
+|    \--- com.github.chrisbanes:PhotoView:2.3.0 (*)
-+--- org.wordpress.mediapicker:source-device:trunk-d0db2634cf27511bec3ef9b837f9cfe27c5ab601
-|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 (*)
-|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
-|    +--- org.wordpress.mediapicker:domain:trunk-d0db2634cf27511bec3ef9b837f9cfe27c5ab601 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.1 (*)
-|    +--- com.google.dagger:hilt-android:2.40.5 -> 2.42 (*)
-|    \--- com.google.dagger:hilt-android-compiler:2.40.5 (*)
++--- org.wordpress.mediapicker:source-device:0.1.0
+|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 (*)
+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
+|    +--- org.wordpress.mediapicker:domain:0.1.0 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.1 (*)
+|    +--- com.google.dagger:hilt-android:2.42 (*)
+|    \--- com.google.dagger:hilt-android-compiler:2.42 (*)
-\--- org.wordpress.mediapicker:source-wordpress:trunk-d0db2634cf27511bec3ef9b837f9cfe27c5ab601
-     +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 (*)
-     +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
-     +--- org.wordpress.mediapicker:domain:trunk-d0db2634cf27511bec3ef9b837f9cfe27c5ab601 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.1 (*)
-     +--- com.google.dagger:hilt-android:2.40.5 -> 2.42 (*)
-     \--- com.google.dagger:hilt-android-compiler:2.40.5 (*)
+\--- org.wordpress.mediapicker:source-wordpress:0.1.0
+     +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 (*)
+     +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
+     +--- org.wordpress.mediapicker:domain:0.1.0 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.1 (*)
+     +--- com.google.dagger:hilt-android:2.42 (*)
+     \--- com.google.dagger:hilt-android-compiler:2.42 (*)

Please review and act accordingly

@oguzkocer
Copy link
Contributor Author

@ParaskP7 FYI I had to make 2 changes to this PR before merging:

@oguzkocer oguzkocer merged commit c4b4b9e into upgrade-gradle-to-7.4.2-agp-to-7.2.1 Jul 7, 2022
@oguzkocer oguzkocer deleted the update-dependencies-to-agp-7.2.1-versions branch July 7, 2022 19:06
@ParaskP7
Copy link
Contributor

ParaskP7 commented Jul 8, 2022

👋 @oguzkocer !

@ParaskP7 FYI I had to make 2 changes to this PR before merging

Thanks you for the comment Oguz, these 2 changes look safe! 👍 🤞

  • In 339adad, I excluded FluxC as a dependency from com.automattic.tracks:experimentation because it was overriding the declared version.

👍

Not sure why that is the case, but yet another instance where it would have been easier to figure out an issue if we always forced Gradle to resolve to declared versions and fail for conflicts.

Yeaaa...

This costed me a few hours unfortunately as the build scan wasn't as clear to me this time and I thought it was a Proguard issue.

😢

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants