-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Parent-PR-for-updating-targetSdkVersion-to-33-(Android-13) #18172
Parent-PR-for-updating-targetSdkVersion-to-33-(Android-13) #18172
Conversation
Updates targetSdkVersion to 33 (Android 13)
📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
|
📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
|
Updates About Automattic Version version from 1.0.0 to 1.1.0 for Android 13
Updates Utils version from 3.3.0 to 3.4.0 for Android 13 upgrade
WRITE_EXTERNAL_STORAGE is not required for SDK higher than 29.
For devices with API 33 and higher, we must request one or more of the granular media permissions instead of the READ_EXTERNAL_STORAGE permission.
For devices with API 33 and higher, we must request one or more of the granular media permissions instead of the READ_EXTERNAL_STORAGE permission.
Updates FluxC version from 2.17.0 to 2.21.0 for Android 13
Update FluxC version from 2.21.0 to 2.22.0
…33-(Android-13) # Conflicts: # build.gradle
…13)' into android-13-media-permissions # Conflicts: # build.gradle
…13)' into issue/17714-notification-runtime-permission
…33-(Android-13) # Conflicts: # build.gradle
It will be upgraded again when also gutenberg-mobile library will be compatible with Android 13 and use the Aztec-Editor 1.6.4.
I have reverted the "Aztec-Editor" version to 1.6.3, which is a version that doesn't support Android 13. Because gutenberg-mobile is still on Android 12 and uses Aztec-Editor 1.6.3. When "gutenberg-mobile" is migrated to Android 13 and Aztec-Edior version on the "gutenberg-mobile" is upgraded to 1.6.4, we'll upgrade the version of "gutenberg-mobile" here to 1.6.4. |
…13)' into issue/17714-notification-runtime-permission
Hey @ravishanker 👋 Just leaving a note (as a part of I'm not giving a formal approval from my side only because I did not review the rest of the code, to keep it evident that the review is still needed for the remaining part. Thank you! |
…ion-runtime-permission Runtime notifications permission
…33-(Android-13) # Conflicts: # WordPress/src/debug/AndroidManifest.xml
…ain-androidmanifest Move media permissions from debug to main AndroidManifest
Generated by 🚫 dangerJS |
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.
We have already tested changes in sub PRs. Additionally, I also tested the latest commit in this PR, and everything appears to be in order. 👍🏻
The only task remaining is:
- Update FluxC reference after Update catalogVersion to 1.9.0 WordPress-FluxC-Android#2715 is merged
However, this task does not contain any changes that might affect this PR, so we can merge it once the FluxC PR has been merged.
Found 1 violations: The PR caused the following dependency changes:-+--- org.wordpress:fluxc:{strictly trunk-1ca49e91927fd4bfb1a9b84dd90d8c794deb4fe7} -> trunk-1ca49e91927fd4bfb1a9b84dd90d8c794deb4fe7
-| +--- org.wordpress:wellsql:1.7.0
-| | \--- org.wordpress.wellsql:wellsql-annotations:1.7.0
-| +--- org.wordpress.fluxc:fluxc-annotations:trunk-1ca49e91927fd4bfb1a9b84dd90d8c794deb4fe7
-| +--- org.greenrobot:eventbus:3.3.1
-| | \--- org.greenrobot:eventbus-java:3.3.1
-| +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.9.2 (*)
-| +--- com.android.volley:volley:1.1.1 -> 1.2.1
-| +--- 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.5.1 (*)
-| | +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.5.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 -> 1.6.21 (*)
-| +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.10 (*)
-| +--- androidx.appcompat:appcompat:1.0.2 -> 1.4.2 (*)
-| +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.2.1 (*)
-| +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.3 (*)
-| +--- androidx.security:security-crypto:1.0.0
-| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0
-| | \--- com.google.crypto.tink:tink-android:1.5.0
-| +--- 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.21 (*)
-| +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-| +--- org.apache.commons:commons-text:1.10.0
-| | \--- org.apache.commons:commons-lang3:3.12.0
-| +--- 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 -> 1.6.21 (*)
-| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.4 (*)
-| +--- com.google.dagger:dagger:2.42
-| | \--- javax.inject:javax.inject:1
-| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.4 (*)
-| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.6.4 (*)
++--- org.wordpress:fluxc:{strictly trunk-c4f88d5272c51d59cb7763681699b5925d76dace} -> trunk-c4f88d5272c51d59cb7763681699b5925d76dace
+| +--- org.wordpress:wellsql:1.7.0
+| | \--- org.wordpress.wellsql:wellsql-annotations:1.7.0
+| +--- org.wordpress.fluxc:fluxc-annotations:trunk-c4f88d5272c51d59cb7763681699b5925d76dace
+| +--- org.greenrobot:eventbus:3.3.1
+| | \--- org.greenrobot:eventbus-java:3.3.1
+| +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.9.2 (*)
+| +--- com.android.volley:volley:1.1.1 -> 1.2.1
+| +--- 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.5.1 (*)
+| | +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.5.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 -> 1.6.21 (*)
+| +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.10 (*)
+| +--- androidx.appcompat:appcompat:1.0.2 -> 1.4.2 (*)
+| +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.2.1 (*)
+| +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.3 (*)
+| +--- androidx.security:security-crypto:1.0.0
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0
+| | \--- com.google.crypto.tink:tink-android:1.5.0
+| +--- 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.21 (*)
+| +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+| +--- org.apache.commons:commons-text:1.10.0
+| | \--- org.apache.commons:commons-lang3:3.12.0
+| +--- 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 -> 1.6.21 (*)
+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.4 (*)
+| +--- com.google.dagger:dagger:2.42
+| | \--- javax.inject:javax.inject:1
+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.4 (*)
+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.6.4 (*)
-+--- org.wordpress:utils:{strictly 3.3.0} -> 3.3.0
++--- org.wordpress:utils:{strictly 3.6.0} -> 3.6.0
+--- org.wordpress:login:1.3.0
-| \--- org.wordpress:fluxc:2.21.0 -> trunk-1ca49e91927fd4bfb1a9b84dd90d8c794deb4fe7 (*)
+| \--- org.wordpress:fluxc:2.21.0 -> trunk-c4f88d5272c51d59cb7763681699b5925d76dace (*)
-+--- com.automattic:about:1.0.0
++--- com.automattic:about:1.1.0
-+--- com.automattic:stories:2.0.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.21 (*)
-| +--- 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.21 (*)
-| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0-rc -> 1.6.21
-| +--- org.jetbrains.kotlin:kotlin-reflect:1.4.20
-| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.21 (*)
-| +--- androidx.appcompat:appcompat:1.0.2 -> 1.4.2 (*)
-| +--- androidx.constraintlayout:constraintlayout:1.1.3 -> 2.0.4 (*)
-| +--- androidx.core:core-ktx:1.2.0 -> 1.8.0 (*)
-| +--- androidx.emoji:emoji:1.0.0
-| | \--- androidx.core:core:1.0.0 -> 1.8.0 (*)
-| +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.2.1 (*)
-| +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
-| +--- com.github.bumptech.glide:glide:4.10.0 -> 4.12.0 (*)
-| +--- jp.wasabeef:glide-transformations:4.3.0
-| | \--- com.github.bumptech.glide:glide:4.11.0 -> 4.12.0 (*)
-| +--- org.greenrobot:eventbus:3.3.1 (*)
-| +--- com.automattic.stories:photoeditor:2.0.0
-| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20 -> 1.6.21 (*)
-| | +--- org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc (*)
-| | +--- androidx.appcompat:appcompat:1.0.2 -> 1.4.2 (*)
-| | +--- androidx.core:core-ktx:1.2.0 -> 1.8.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.5.1 (*)
-| | | +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.5.1 (*)
-| | | +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.3 (*)
-| | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
-| | | +--- androidx.core:core:1.1.0 -> 1.8.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.8.0 (*)
-| | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
-| | | \--- androidx.concurrent:concurrent-futures:1.0.0-alpha03 -> 1.0.0 (*)
-| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.4 (*)
-| | +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
-| | +--- com.github.bumptech.glide:glide:4.10.0 -> 4.12.0 (*)
-| | +--- jp.wasabeef:glide-transformations:4.3.0 (*)
-| | +--- com.github.chrisbanes:PhotoView:2.3.0
-| | | \--- androidx.appcompat:appcompat:1.0.0 -> 1.4.2 (*)
-| | +--- com.automattic.stories:mp4compose:2.0.0
-| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20 -> 1.6.21 (*)
-| | | \--- com.github.bumptech.glide:glide:4.10.0 -> 4.12.0 (*)
-| | \--- androidx.emoji:emoji:1.0.0 (*)
-| +--- androidx.lifecycle:lifecycle-common-java8:2.2.0 -> 2.5.1 (*)
-| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -> 2.5.1 (*)
-| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 -> 2.5.1
-| | +--- androidx.lifecycle:lifecycle-livedata:2.5.1 (*)
-| | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.5.1 (*)
-| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 (*)
-| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 -> 1.6.4 (*)
-| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.4 (*)
-| \--- com.github.chrisbanes:PhotoView:2.3.0 (*)
++--- com.automattic:stories:2.1.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.21 (*)
+| +--- 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.21 (*)
+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0-rc -> 1.6.21
+| +--- org.jetbrains.kotlin:kotlin-reflect:1.4.20
+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.21 (*)
+| +--- androidx.appcompat:appcompat:1.0.2 -> 1.4.2 (*)
+| +--- androidx.constraintlayout:constraintlayout:1.1.3 -> 2.0.4 (*)
+| +--- androidx.core:core-ktx:1.2.0 -> 1.8.0 (*)
+| +--- androidx.emoji:emoji:1.0.0
+| | \--- androidx.core:core:1.0.0 -> 1.8.0 (*)
+| +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.2.1 (*)
+| +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
+| +--- com.github.bumptech.glide:glide:4.10.0 -> 4.12.0 (*)
+| +--- jp.wasabeef:glide-transformations:4.3.0
+| | \--- com.github.bumptech.glide:glide:4.11.0 -> 4.12.0 (*)
+| +--- org.greenrobot:eventbus:3.3.1 (*)
+| +--- com.automattic.stories:photoeditor:2.1.0
+| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20 -> 1.6.21 (*)
+| | +--- org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc (*)
+| | +--- androidx.appcompat:appcompat:1.0.2 -> 1.4.2 (*)
+| | +--- androidx.core:core-ktx:1.2.0 -> 1.8.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.5.1 (*)
+| | | +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.5.1 (*)
+| | | +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.3 (*)
+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
+| | | +--- androidx.core:core:1.1.0 -> 1.8.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.8.0 (*)
+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
+| | | \--- androidx.concurrent:concurrent-futures:1.0.0-alpha03 -> 1.0.0 (*)
+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.4 (*)
+| | +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
+| | +--- com.github.bumptech.glide:glide:4.10.0 -> 4.12.0 (*)
+| | +--- jp.wasabeef:glide-transformations:4.3.0 (*)
+| | +--- com.github.chrisbanes:PhotoView:2.3.0
+| | | \--- androidx.appcompat:appcompat:1.0.0 -> 1.4.2 (*)
+| | +--- com.automattic.stories:mp4compose:2.1.0
+| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20 -> 1.6.21 (*)
+| | | \--- com.github.bumptech.glide:glide:4.10.0 -> 4.12.0 (*)
+| | \--- androidx.emoji:emoji:1.0.0 (*)
+| +--- androidx.lifecycle:lifecycle-common-java8:2.2.0 -> 2.5.1 (*)
+| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -> 2.5.1 (*)
+| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 -> 2.5.1
+| | +--- androidx.lifecycle:lifecycle-livedata:2.5.1 (*)
+| | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.5.1 (*)
+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 (*)
+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 -> 1.6.4 (*)
+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.4 (*)
+| \--- com.github.chrisbanes:PhotoView:2.3.0 (*)
-\--- com.automattic.stories:mp4compose:2.0.0 (*)
+\--- com.automattic.stories:mp4compose:2.1.0 (*)
Please review and act accordingly
|
Updates targetSdkVersion to 33 (Android 13)
Fixes #18105
This PR,
Update these permissions are handled in their PRs and merged
Update the following libraries and their versions here, before merging this PR
Update Gutenberg versionUpdate AztecEditor-androidTo test:
To test:
Regression Notes
Potential unintended areas of impact
What I did to test those areas of impact (or what existing automated tests I relied on)
What automated tests I added (or what prevented me from doing so)
PR submission checklist:
RELEASE-NOTES.txt
if necessary.