Merge release/20.6 after code freeze (20.6-rc-1) #17065
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Removing JP-specific entries from WP's release notes and WP-specific entries from JP's release notes.
When displaying or hiding the banner during animation, this still uses the branding utils logic to display or hide the banner.
…sible-in-jetpack-app Use Jetpack branding utils flag to set banner visibility in search
Generated by 🚫 dangerJS |
|
Found 1 violations: The PR caused the following dependency changes:-+--- org.wordpress:fluxc:{strictly trunk-eb1d39ad095c01367af03c4259ab93cda14c675e} -> trunk-eb1d39ad095c01367af03c4259ab93cda14c675e
-| +--- org.wordpress:wellsql:1.7.0
-| | \--- org.wordpress.wellsql:wellsql-annotations:1.7.0
-| +--- org.wordpress.fluxc:fluxc-annotations:trunk-eb1d39ad095c01367af03c4259ab93cda14c675e
-| +--- 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.2.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.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:fluxc:{strictly 1.50.0} -> 1.50.0
+| +--- org.wordpress:wellsql:1.7.0
+| | \--- org.wordpress.wellsql:wellsql-annotations:1.7.0
+| +--- org.wordpress.fluxc:fluxc-annotations:1.50.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.2.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.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:login:trunk-e11535105725e02dd1e8aa8065314ceb67079278
- +--- com.google.android.gms:play-services-auth:18.1.0 (*)
- +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8: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-e94126bf9eb942d262768f8851cf2c4980e249fc -> trunk-eb1d39ad095c01367af03c4259ab93cda14c675e (*)
- +--- com.google.dagger:dagger:2.42 (*)
- \--- com.google.dagger:dagger-android-support:2.42 (*)
+\--- org.wordpress:login:0.18.0
+ +--- com.google.android.gms:play-services-auth:18.1.0 (*)
+ +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8: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:1.50.0 (*)
+ +--- com.google.dagger:dagger:2.42 (*)
+ \--- com.google.dagger:dagger-android-support:2.42 (*)
Please review and act accordingly
|
You can test the WordPress changes on this Pull Request by downloading an installable build (wordpress-installable-build-pr17065-16d6c1e.apk), or scanning this QR code:
|
You can test the Jetpack changes on this Pull Request by downloading an installable build (jetpack-installable-build-pr17065-16d6c1e.apk), or scanning this QR code:
|
oguzkocer
approved these changes
Aug 22, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
RELEASE-NOTES.txtfor next iteration.{jetpack_}metadata/release_notes.txtextracted for WordPress and Jetpack.WordPress/jetpack_metadata/release_notes.txtaudited to remove any item not applicable for Jetpack.build.gradle.WordPress/src/main/res/values/strings.xmlupdated with strings from binary dependencies.fastlane/resources/values/strings.xml.version.propertiesThis PR also contains a last-minute fix #17062 for an issue which I spotted while testing the Jetpack app after cutting the code-freeze branch.
After spotting the issue, I asked the team (p1661164649052089-slack-C03QWKMUNN7) if they would be able to fix it quickly before issuing
rc-1, which they did, hence why we were able to include this last-minute fix between me cutting the code freeze branch and triggering the first beta.