Skip to content

Update Gradle to 7.4.2 & AGP to 7.2.1#16834

Merged
oguzkocer merged 12 commits intotrunkfrom
upgrade-gradle-to-7.4.2-agp-to-7.2.1
Jul 7, 2022
Merged

Update Gradle to 7.4.2 & AGP to 7.2.1#16834
oguzkocer merged 12 commits intotrunkfrom
upgrade-gradle-to-7.4.2-agp-to-7.2.1

Conversation

@oguzkocer
Copy link
Copy Markdown
Contributor

This PR updates Gradle version to 7.4.2 and Android Gradle Plugin version to 7.2.1.

Since Gradle update is just a patch, it only contains bug fixes. Here are the full release notes: https://docs.gradle.org/7.4.2/release-notes.html


The only major Android Gradle Plugin release since 7.1.1 is 7.2 which includes the following breaking change:

Starting with AGP 7.2, you can no longer share the same source directory across multiple source sets.
For example, you can’t use the same test sources for both unit tests and instrumentation tests. To learn more, see Change the default source sets configurations.

As far as I can tell if this is an issue for us it should result in a build time error, so as long as CI passes I don't think we need to worry about it.

@oguzkocer oguzkocer added this to the 20.3 milestone Jun 28, 2022
@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile bot commented Jun 28, 2022

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

@wpmobilebot
Copy link
Copy Markdown
Contributor

wpmobilebot commented Jun 28, 2022

You can test the WordPress changes on this Pull Request by downloading an installable build (wordpress-installable-build-pr16834-46277dd.apk), or scanning this QR code:

@wpmobilebot
Copy link
Copy Markdown
Contributor

wpmobilebot commented Jun 28, 2022

You can test the Jetpack changes on this Pull Request by downloading an installable build (jetpack-installable-build-pr16834-46277dd.apk), or scanning this QR code:

@ParaskP7 ParaskP7 self-assigned this Jun 29, 2022
Copy link
Copy Markdown
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.

LGTM! 💯

It just that there exist few Lint Failures (ResourceType x 3 and ObsoleteSdkInt x 10) that need addressing.


As far as I can tell if this is an issue for us it should result in a build time error, so as long as CI passes I don't think we need to worry about it.

Yes, I believe you are right! 👍

PS: I also triggered the Optional Tests to verify that nothing is breaking there too.

@peril-wordpress-mobile
Copy link
Copy Markdown

Warnings
⚠️ PR has more than 300 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS

@oguzkocer oguzkocer requested a review from ParaskP7 July 6, 2022 18:12
@wpmobilebot
Copy link
Copy Markdown
Contributor

Found 1 violations:

The PR caused the following dependency changes:

-+--- androidx.databinding:viewbinding:7.1.1
++--- androidx.databinding:viewbinding:7.2.1
-+--- com.automattic:about:0.0.5
++--- com.automattic:about:0.0.6
-+--- com.automattic:stories:1.3.0
-|    +--- androidx.databinding:viewbinding:7.1.1 (*)
-|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.4.20 -> 1.6.10 (*)
-|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20 -> 1.6.10 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc
-|    |    \--- org.jetbrains.kotlinx:kotlinx-serialization-runtime-jvm:1.0-M1-1.4.0-rc
-|    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0-rc -> 1.6.10 (*)
-|    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0-rc -> 1.6.10
-|    +--- org.jetbrains.kotlin:kotlin-reflect:1.4.20
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.10 (*)
-|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
-|    +--- androidx.constraintlayout:constraintlayout:1.1.3 -> 2.0.4 (*)
-|    +--- androidx.core:core-ktx:1.2.0 -> 1.7.0 (*)
-|    +--- androidx.navigation:navigation-fragment-ktx:2.0.0 -> 2.4.2
-|    |    +--- androidx.navigation:navigation-fragment:2.4.2
-|    |    |    +--- androidx.fragment:fragment-ktx:1.4.1
-|    |    |    |    +--- androidx.fragment:fragment:1.4.1 (*)
-|    |    |    |    +--- androidx.activity:activity-ktx:1.2.3 -> 1.3.1 (*)
-|    |    |    |    +--- androidx.core:core-ktx:1.2.0 -> 1.7.0 (*)
-|    |    |    |    +--- androidx.collection:collection-ktx:1.1.0 (*)
-|    |    |    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.1 -> 2.4.1
-|    |    |    |    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.4.1 (*)
-|    |    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.6.10 (*)
-|    |    |    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1 -> 2.4.1 (*)
-|    |    |    |    +--- androidx.savedstate:savedstate-ktx:1.1.0 (*)
-|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 -> 1.6.10 (*)
-|    |    |    +--- androidx.navigation:navigation-runtime:2.4.2 (*)
-|    |    |    +--- androidx.slidingpanelayout:slidingpanelayout:1.2.0
-|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|    |    |    |    +--- androidx.customview:customview:1.1.0 (*)
-|    |    |    |    +--- androidx.core:core:1.1.0 -> 1.7.0 (*)
-|    |    |    |    +--- androidx.window:window:1.0.0
-|    |    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 1.6.10 (*)
-|    |    |    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 (*)
-|    |    |    |    |    +--- androidx.annotation:annotation:1.2.0
-|    |    |    |    |    +--- androidx.collection:collection:1.1.0 (*)
-|    |    |    |    |    \--- androidx.core:core:1.3.2 -> 1.7.0 (*)
-|    |    |    |    \--- androidx.transition:transition:1.4.1 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 1.6.10 (*)
-|    |    \--- androidx.navigation:navigation-runtime-ktx:2.4.2 (*)
-|    +--- androidx.navigation:navigation-ui-ktx:2.0.0 -> 2.4.2
-|    |    +--- androidx.navigation:navigation-ui:2.4.2
-|    |    |    +--- androidx.navigation:navigation-runtime:2.4.2 (*)
-|    |    |    +--- androidx.customview:customview:1.1.0 (*)
-|    |    |    +--- androidx.drawerlayout:drawerlayout:1.1.1 (*)
-|    |    |    +--- com.google.android.material:material:1.4.0-beta01 -> 1.6.0-alpha01 (*)
-|    |    |    +--- androidx.annotation:annotation-experimental:1.1.0
-|    |    |    \--- androidx.transition:transition:1.3.0 -> 1.4.1 (*)
-|    |    \--- androidx.navigation:navigation-runtime-ktx:2.4.2 (*)
-|    +--- androidx.emoji:emoji:1.0.0
-|    |    \--- androidx.core:core:1.0.0 -> 1.7.0 (*)
-|    +--- androidx.recyclerview:recyclerview:1.1.0 (*)
-|    +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
-|    +--- com.github.bumptech.glide:glide:4.10.0 -> 4.11.0
-|    |    +--- com.github.bumptech.glide:gifdecoder:4.11.0
-|    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-|    |    +--- com.github.bumptech.glide:disklrucache:4.11.0
-|    |    +--- com.github.bumptech.glide:annotations:4.11.0
-|    |    +--- androidx.fragment:fragment:1.0.0 -> 1.4.1 (*)
-|    |    +--- androidx.vectordrawable:vectordrawable-animated:1.0.0 -> 1.1.0 (*)
-|    |    \--- androidx.exifinterface:exifinterface:1.0.0 -> 1.1.0-beta01
-|    |         \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|    +--- jp.wasabeef:glide-transformations:4.3.0
-|    |    \--- com.github.bumptech.glide:glide:4.11.0 (*)
-|    +--- org.greenrobot:eventbus:3.3.1
-|    |    \--- org.greenrobot:eventbus-java:3.3.1
-|    +--- com.automattic.stories:photoeditor:1.3.0
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20 -> 1.6.10 (*)
-|    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc (*)
-|    |    +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
-|    |    +--- androidx.core:core-ktx:1.2.0 -> 1.7.0 (*)
-|    |    +--- androidx.camera:camera-core:1.0.0-alpha06
-|    |    |    +--- com.google.auto.value:auto-value-annotations:1.6.3
-|    |    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-|    |    |    +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.4.1 (*)
-|    |    |    +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.4.1 (*)
-|    |    |    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.1.0-beta01 (*)
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-|    |    |    +--- androidx.core:core:1.1.0 -> 1.7.0 (*)
-|    |    |    \--- androidx.concurrent:concurrent-futures:1.0.0-alpha03 -> 1.0.0 (*)
-|    |    +--- androidx.camera:camera-camera2:1.0.0-alpha06
-|    |    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-|    |    |    +--- androidx.camera:camera-core:1.0.0-alpha06 (*)
-|    |    |    +--- androidx.core:core:1.1.0 -> 1.7.0 (*)
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-|    |    |    \--- androidx.concurrent:concurrent-futures:1.0.0-alpha03 -> 1.0.0 (*)
-|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.5.2 (*)
-|    |    +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
-|    |    +--- com.github.bumptech.glide:glide:4.10.0 -> 4.11.0 (*)
-|    |    +--- jp.wasabeef:glide-transformations:4.3.0 (*)
-|    |    +--- com.github.chrisbanes:PhotoView:2.3.0
-|    |    |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.3.1 (*)
-|    |    +--- com.automattic.stories:mp4compose:1.3.0
-|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20 -> 1.6.10 (*)
-|    |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.11.0 (*)
-|    |    \--- androidx.emoji:emoji:1.0.0 (*)
-|    +--- androidx.lifecycle:lifecycle-common-java8:2.2.0 -> 2.4.1 (*)
-|    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -> 2.4.1 (*)
-|    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 -> 2.4.1
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.4.1 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.4.1 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.6.10 (*)
-|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 -> 1.5.2 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.5.2 (*)
-|    \--- com.github.chrisbanes:PhotoView:2.3.0 (*)
++--- com.automattic:stories:1.4.0
+|    +--- androidx.databinding:viewbinding:7.2.1 (*)
+|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.4.20 -> 1.6.10 (*)
+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20 -> 1.6.10 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc
+|    |    \--- org.jetbrains.kotlinx:kotlinx-serialization-runtime-jvm:1.0-M1-1.4.0-rc
+|    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0-rc -> 1.6.10 (*)
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0-rc -> 1.6.10
+|    +--- org.jetbrains.kotlin:kotlin-reflect:1.4.20
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.10 (*)
+|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
+|    +--- androidx.constraintlayout:constraintlayout:1.1.3 -> 2.0.4 (*)
+|    +--- androidx.core:core-ktx:1.2.0 -> 1.7.0 (*)
+|    +--- androidx.navigation:navigation-fragment-ktx:2.0.0 -> 2.4.2
+|    |    +--- androidx.navigation:navigation-fragment:2.4.2
+|    |    |    +--- androidx.fragment:fragment-ktx:1.4.1
+|    |    |    |    +--- androidx.fragment:fragment:1.4.1 (*)
+|    |    |    |    +--- androidx.activity:activity-ktx:1.2.3 -> 1.3.1 (*)
+|    |    |    |    +--- androidx.core:core-ktx:1.2.0 -> 1.7.0 (*)
+|    |    |    |    +--- androidx.collection:collection-ktx:1.1.0 (*)
+|    |    |    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.1 -> 2.4.1
+|    |    |    |    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.4.1 (*)
+|    |    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.6.10 (*)
+|    |    |    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1 -> 2.4.1 (*)
+|    |    |    |    +--- androidx.savedstate:savedstate-ktx:1.1.0 (*)
+|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 -> 1.6.10 (*)
+|    |    |    +--- androidx.navigation:navigation-runtime:2.4.2 (*)
+|    |    |    +--- androidx.slidingpanelayout:slidingpanelayout:1.2.0
+|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|    |    |    |    +--- androidx.customview:customview:1.1.0 (*)
+|    |    |    |    +--- androidx.core:core:1.1.0 -> 1.7.0 (*)
+|    |    |    |    +--- androidx.window:window:1.0.0
+|    |    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 1.6.10 (*)
+|    |    |    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 (*)
+|    |    |    |    |    +--- androidx.annotation:annotation:1.2.0
+|    |    |    |    |    +--- androidx.collection:collection:1.1.0 (*)
+|    |    |    |    |    \--- androidx.core:core:1.3.2 -> 1.7.0 (*)
+|    |    |    |    \--- androidx.transition:transition:1.4.1 (*)
+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 1.6.10 (*)
+|    |    \--- androidx.navigation:navigation-runtime-ktx:2.4.2 (*)
+|    +--- androidx.navigation:navigation-ui-ktx:2.0.0 -> 2.4.2
+|    |    +--- androidx.navigation:navigation-ui:2.4.2
+|    |    |    +--- androidx.navigation:navigation-runtime:2.4.2 (*)
+|    |    |    +--- androidx.customview:customview:1.1.0 (*)
+|    |    |    +--- androidx.drawerlayout:drawerlayout:1.1.1 (*)
+|    |    |    +--- com.google.android.material:material:1.4.0-beta01 -> 1.6.0-alpha01 (*)
+|    |    |    +--- androidx.annotation:annotation-experimental:1.1.0
+|    |    |    \--- androidx.transition:transition:1.3.0 -> 1.4.1 (*)
+|    |    \--- androidx.navigation:navigation-runtime-ktx:2.4.2 (*)
+|    +--- androidx.emoji:emoji:1.0.0
+|    |    \--- androidx.core:core:1.0.0 -> 1.7.0 (*)
+|    +--- androidx.recyclerview:recyclerview:1.1.0 (*)
+|    +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
+|    +--- com.github.bumptech.glide:glide:4.10.0 -> 4.11.0
+|    |    +--- com.github.bumptech.glide:gifdecoder:4.11.0
+|    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
+|    |    +--- com.github.bumptech.glide:disklrucache:4.11.0
+|    |    +--- com.github.bumptech.glide:annotations:4.11.0
+|    |    +--- androidx.fragment:fragment:1.0.0 -> 1.4.1 (*)
+|    |    +--- androidx.vectordrawable:vectordrawable-animated:1.0.0 -> 1.1.0 (*)
+|    |    \--- androidx.exifinterface:exifinterface:1.0.0 -> 1.1.0-beta01
+|    |         \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|    +--- jp.wasabeef:glide-transformations:4.3.0
+|    |    \--- com.github.bumptech.glide:glide:4.11.0 (*)
+|    +--- org.greenrobot:eventbus:3.3.1
+|    |    \--- org.greenrobot:eventbus-java:3.3.1
+|    +--- com.automattic.stories:photoeditor:1.4.0
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20 -> 1.6.10 (*)
+|    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc (*)
+|    |    +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
+|    |    +--- androidx.core:core-ktx:1.2.0 -> 1.7.0 (*)
+|    |    +--- androidx.camera:camera-core:1.0.0-alpha06
+|    |    |    +--- com.google.auto.value:auto-value-annotations:1.6.3
+|    |    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+|    |    |    +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.4.1 (*)
+|    |    |    +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.4.1 (*)
+|    |    |    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.1.0-beta01 (*)
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
+|    |    |    +--- androidx.core:core:1.1.0 -> 1.7.0 (*)
+|    |    |    \--- androidx.concurrent:concurrent-futures:1.0.0-alpha03 -> 1.0.0 (*)
+|    |    +--- androidx.camera:camera-camera2:1.0.0-alpha06
+|    |    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+|    |    |    +--- androidx.camera:camera-core:1.0.0-alpha06 (*)
+|    |    |    +--- androidx.core:core:1.1.0 -> 1.7.0 (*)
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
+|    |    |    \--- androidx.concurrent:concurrent-futures:1.0.0-alpha03 -> 1.0.0 (*)
+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.5.2 (*)
+|    |    +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
+|    |    +--- com.github.bumptech.glide:glide:4.10.0 -> 4.11.0 (*)
+|    |    +--- jp.wasabeef:glide-transformations:4.3.0 (*)
+|    |    +--- com.github.chrisbanes:PhotoView:2.3.0
+|    |    |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.3.1 (*)
+|    |    +--- com.automattic.stories:mp4compose:1.4.0
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20 -> 1.6.10 (*)
+|    |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.11.0 (*)
+|    |    \--- androidx.emoji:emoji:1.0.0 (*)
+|    +--- androidx.lifecycle:lifecycle-common-java8:2.2.0 -> 2.4.1 (*)
+|    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -> 2.4.1 (*)
+|    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 -> 2.4.1
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.4.1 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.4.1 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.6.10 (*)
+|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 -> 1.5.2 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.5.2 (*)
+|    \--- com.github.chrisbanes:PhotoView:2.3.0 (*)
-+--- com.automattic.stories:mp4compose:1.3.0 (*)
++--- com.automattic.stories:mp4compose:1.4.0 (*)
 +--- project :libs:image-editor
-|    \--- androidx.databinding:viewbinding:7.1.1 (*)
+|    \--- androidx.databinding:viewbinding:7.2.1 (*)
-+--- com.google.dagger:dagger-android-support:2.41
-|    +--- com.google.dagger:dagger:2.41
-|    |    \--- javax.inject:javax.inject:1
-|    +--- com.google.dagger:dagger-android:2.41
-|    |    +--- com.google.dagger:dagger:2.41 (*)
-|    |    +--- com.google.dagger:dagger-lint-aar:2.41
-|    |    +--- androidx.annotation:annotation:1.2.0
-|    |    \--- javax.inject:javax.inject:1
-|    +--- com.google.dagger:dagger-lint-aar:2.41
-|    +--- androidx.activity:activity:1.3.1 (*)
-|    +--- androidx.annotation:annotation:1.2.0
-|    +--- androidx.appcompat:appcompat:1.3.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 (*)
-|    \--- javax.inject:javax.inject:1
++--- com.google.dagger:dagger-android-support:2.42
+|    +--- com.google.dagger:dagger:2.42
+|    |    \--- javax.inject:javax.inject:1
+|    +--- 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
+|    |    \--- javax.inject:javax.inject:1
+|    +--- com.google.dagger:dagger-lint-aar:2.42
+|    +--- androidx.activity:activity:1.3.1 (*)
+|    +--- androidx.annotation:annotation:1.2.0
+|    +--- androidx.appcompat:appcompat:1.3.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 (*)
+|    \--- javax.inject:javax.inject:1
-+--- com.google.dagger:hilt-android:2.41
-|    +--- com.google.dagger:dagger:2.41 (*)
-|    +--- com.google.dagger:dagger-lint-aar:2.41
-|    +--- com.google.dagger:hilt-core:2.41
-|    |    +--- com.google.dagger:dagger:2.41 (*)
-|    |    +--- com.google.code.findbugs:jsr305:3.0.2
-|    |    \--- javax.inject:javax.inject:1
-|    +--- com.google.code.findbugs:jsr305:3.0.2
-|    +--- androidx.activity:activity:1.3.1 (*)
-|    +--- androidx.annotation:annotation:1.2.0
-|    +--- 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 (*)
-|    +--- androidx.savedstate:savedstate:1.1.0 (*)
-|    +--- javax.inject:javax.inject:1
-|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.32 -> 1.6.10 (*)
++--- com.google.dagger:hilt-android:2.42
+|    +--- com.google.dagger:dagger:2.42 (*)
+|    +--- com.google.dagger:dagger-lint-aar:2.42
+|    +--- com.google.dagger:hilt-core:2.42
+|    |    +--- com.google.dagger:dagger:2.42 (*)
+|    |    +--- com.google.code.findbugs:jsr305:3.0.2
+|    |    \--- javax.inject:javax.inject:1
+|    +--- com.google.code.findbugs:jsr305:3.0.2
+|    +--- androidx.activity:activity:1.3.1 (*)
+|    +--- androidx.annotation:annotation:1.2.0
+|    +--- 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 (*)
+|    +--- androidx.savedstate:savedstate:1.1.0 (*)
+|    +--- javax.inject:javax.inject:1
+|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (*)
-+--- org.wordpress:fluxc:{strictly 1.46.0} -> 1.46.0
-|    +--- org.wordpress:wellsql:1.7.0
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:1.7.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:1.46.0
-|    +--- org.greenrobot:eventbus:3.3.1 (*)
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.9.2 (*)
-|    +--- 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.2.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.1.0 (*)
-|    +--- 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 (*)
-|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
-|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.1.0-beta01 (*)
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2
-|    |    +--- com.squareup.okhttp3:okhttp:4.9.2 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.6.10 (*)
-|    +--- com.google.code.gson:gson:2.8.5
-|    +--- org.apache.commons:commons-text:1.1 (*)
-|    +--- androidx.room:room-runtime:2.4.2 (*)
-|    +--- 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 (*)
-|    +--- com.google.dagger:dagger:2.29.1 -> 2.41 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.5.2 (*)
-|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.5.2 (*)
++--- org.wordpress:fluxc:{strictly trunk-f44a381615f6d850e9c95071469424fbde6daff8} -> 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.2 (*)
+|    +--- 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.2.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.1.0 (*)
+|    +--- 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 (*)
+|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
+|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.1.0-beta01 (*)
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2
+|    |    +--- com.squareup.okhttp3:okhttp:4.9.2 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.6.10 (*)
+|    +--- com.google.code.gson:gson:2.8.5
+|    +--- org.apache.commons:commons-text:1.1 (*)
+|    +--- androidx.room:room-runtime:2.4.2 (*)
+|    +--- 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 (*)
+|    +--- com.google.dagger:dagger:2.42 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.5.2 (*)
+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.5.2 (*)
-+--- org.wordpress:utils:{strictly 2.5.0} -> 2.5.0
++--- org.wordpress:utils:{strictly 2.6.0} -> 2.6.0
 +--- project :libs:editor
-|    +--- org.wordpress:aztec:{strictly v1.5.8} -> v1.5.8
+|    +--- org.wordpress:aztec:{strictly v1.6.0} -> v1.6.0
-|    +--- org.wordpress.aztec:wordpress-shortcodes:{strictly v1.5.8} -> v1.5.8
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.10 (*)
-|    |    +--- org.wordpress:aztec:v1.5.8 (*)
-|    |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.3.1 (*)
+|    +--- org.wordpress.aztec:wordpress-shortcodes:{strictly v1.6.0} -> v1.6.0
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.10 (*)
+|    |    +--- org.wordpress:aztec:v1.6.0 (*)
+|    |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.3.1 (*)
-|    +--- org.wordpress.aztec:wordpress-comments:{strictly v1.5.8} -> v1.5.8
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.10 (*)
-|    |    +--- org.wordpress:aztec:v1.5.8 (*)
-|    |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
-|    |    \--- com.google.android.material:material:1.0.0 -> 1.6.0-alpha01 (*)
+|    +--- org.wordpress.aztec:wordpress-comments:{strictly v1.6.0} -> v1.6.0
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.10 (*)
+|    |    +--- org.wordpress:aztec:v1.6.0 (*)
+|    |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
+|    |    \--- com.google.android.material:material:1.0.0 -> 1.6.0-alpha01 (*)
 |    \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.78.1
 |         \--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.78.1
-|              +--- org.wordpress:aztec:v1.5.8 (*)
+|              +--- org.wordpress:aztec:v1.5.8 -> v1.6.0 (*)
-|              +--- org.wordpress.aztec:wordpress-shortcodes:v1.5.8 (*)
+|              +--- org.wordpress.aztec:wordpress-shortcodes:v1.5.8 -> v1.6.0 (*)
-|              +--- org.wordpress.aztec:wordpress-comments:v1.5.8 (*)
+|              +--- org.wordpress.aztec:wordpress-comments:v1.5.8 -> v1.6.0 (*)
 |              \--- org.wordpress.aztec:glide-loader:v1.5.8
-|                   \--- org.wordpress:aztec:v1.5.8 (*)
+|                   \--- org.wordpress:aztec:v1.5.8 -> v1.6.0 (*)
-\--- org.wordpress:login:0.14.0
-     +--- com.google.android.gms:play-services-auth:18.1.0 (*)
-     +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.6.10 (*)
-     +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.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.constraintlayout:constraintlayout:2.0.4 (*)
-     +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
-     +--- androidx.core:core-ktx:1.3.2 -> 1.7.0 (*)
-     +--- org.wordpress:fluxc:trunk-1436f46fc296ede0e65e117bbfced38fa34cec6d -> 1.46.0 (*)
-     +--- com.google.dagger:dagger:2.33 -> 2.41 (*)
-     \--- com.google.dagger:dagger-android-support:2.33 -> 2.41 (*)
+\--- org.wordpress:login:0.15.0
+     +--- com.google.android.gms:play-services-auth:18.1.0 (*)
+     +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.6.10 (*)
+     +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.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.constraintlayout:constraintlayout:2.0.4 (*)
+     +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
+     +--- androidx.core:core-ktx:1.3.2 -> 1.7.0 (*)
+     +--- org.wordpress:fluxc:trunk-1436f46fc296ede0e65e117bbfced38fa34cec6d -> trunk-f44a381615f6d850e9c95071469424fbde6daff8 (*)
+     +--- com.google.dagger:dagger:2.42 (*)
+     \--- com.google.dagger:dagger-android-support:2.42 (*)

Please review and act accordingly

@oguzkocer oguzkocer marked this pull request as ready for review July 7, 2022 17:17
@oguzkocer oguzkocer enabled auto-merge July 7, 2022 17:17
@oguzkocer oguzkocer disabled auto-merge July 7, 2022 17:18
@oguzkocer
Copy link
Copy Markdown
Contributor Author

@ParaskP7 It looks like you missed this PR review. Since I merged the library updates, I am just going to admin merge this to avoid breaking composite build for developers.

@oguzkocer oguzkocer merged commit 0026dbf into trunk Jul 7, 2022
@oguzkocer oguzkocer deleted the upgrade-gradle-to-7.4.2-agp-to-7.2.1 branch July 7, 2022 17:19
@ParaskP7
Copy link
Copy Markdown
Contributor

ParaskP7 commented Jul 8, 2022

👋 @oguzkocer !

@ParaskP7 It looks like you missed this PR review. Since I merged the library updates, I am just going to admin merge this to avoid breaking composite build for developers.

  • Ah, actually I was aware of this PR but I didn't review it because it was in a draft state (rightfully so) and I wasn't sure how you want me to handle the review on it. By the time you got to merge the dependant PRs it was already EOD, I should have waiting a bit to help you on that too. I hope I didn't block you somehow. 😊
  • Yes indeed, since I reviewed the other PRs that got merged into this, I think it was the right call to admin merge to this one as well, just like you did and in order to avoid breaking composite build for developers, thank you! 💯

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants