Skip to content

Merge 23.8-rc-3 and editorialized release notes to trunk - #19713

Merged
oguzkocer merged 90 commits into
trunkfrom
release/23.8
Dec 1, 2023
Merged

Merge 23.8-rc-3 and editorialized release notes to trunk#19713
oguzkocer merged 90 commits into
trunkfrom
release/23.8

Conversation

@oguzkocer

@oguzkocer oguzkocer commented Dec 1, 2023

Copy link
Copy Markdown
Contributor

Includes #19708.

Edit: It now also includes #19715.

Thomas Horta added 30 commits November 27, 2023 11:49
…y-nudge-ff

[Bloganuary] Create Bloganuary Nudge FF
We were using bodyLarge and changing the text size to be the same as the medium,
so it makes more sense to use the `bodyMedium` directly, since it has better
values for the line height and letter spacing for the smaller font size.
This change will be done at the end of feature development so it is easier to
test the dashboard nudge PRs. Before delivering the feature we should check if
the current device date is in December 2023 as one of the eligibility params.
…y-nudge-dashboard-card

[Bloganuary] Dashboard Nudge card
…y-card-hide-button

[Bloganuary] Implement Dashboard Nudge card hide button functionality
@oguzkocer oguzkocer added this to the 23.9 milestone Dec 1, 2023
@oguzkocer
oguzkocer requested a review from a team December 1, 2023 16:30
@oguzkocer
oguzkocer enabled auto-merge December 1, 2023 16:30
@wpmobilebot

Copy link
Copy Markdown
Contributor

Found 1 violations:

The PR caused the following dependency changes:

 +--- com.automattic:stories:2.4.0
 |    \--- com.automattic.stories:photoeditor:2.4.0
-|         +--- androidx.camera:camera-core:1.0.0-alpha06 -> 1.2.3
-|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|         |    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*)
-|         |    +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
-|         |    +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-|         |    +--- androidx.exifinterface:exifinterface:1.3.2 -> 1.3.6 (*)
-|         |    +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.6.2 (*)
-|         |    +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.6.2 (*)
-|         |    +--- com.google.auto.value:auto-value-annotations:1.6.3
-|         |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.10 (*)
+|         +--- 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.6.2 (*)
+|         |    +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.6.2 (*)
+|         |    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
+|         |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+|         |    +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
+|         |    \--- androidx.concurrent:concurrent-futures:1.0.0-alpha03 -> 1.1.0 (*)
-|         \--- androidx.camera:camera-camera2:1.0.0-alpha06 -> 1.2.3
-|              +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|              +--- androidx.camera:camera-core:1.2.3 (*)
-|              +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
-|              +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-|              +--- 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.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.10.0 (*)
+|              +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+|              \--- androidx.concurrent:concurrent-futures:1.0.0-alpha03 -> 1.1.0 (*)
++--- com.google.android.gms:play-services-code-scanner:16.0.0-beta3
+|    +--- androidx.activity:activity:1.3.1 -> 1.8.0 (*)
+|    +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0
+|    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    +--- com.google.android.datatransport:transport-api:3.0.0 (*)
+|    |    +--- com.google.android.datatransport:transport-runtime:3.1.8
+|    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
+|    |    |    +--- com.google.android.datatransport:transport-api:3.0.0 (*)
+|    |    |    +--- com.google.firebase:firebase-encoders:17.0.0
+|    |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    |    +--- com.google.firebase:firebase-encoders-proto:16.0.0
+|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    |    |    \--- com.google.firebase:firebase-encoders:17.0.0 (*)
+|    |    |    \--- javax.inject:javax.inject:1
+|    |    +--- com.google.firebase:firebase-encoders:17.0.0 (*)
+|    |    \--- com.google.firebase:firebase-encoders-json:18.0.0
+|    |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |         \--- com.google.firebase:firebase-encoders:17.0.0 (*)
+|    +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
+|    +--- com.google.android.gms:play-services-base:18.1.0 (*)
+|    +--- com.google.android.gms:play-services-basement:18.1.0 (*)
+|    +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
+|    +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0
+|    |    +--- androidx.annotation:annotation:1.5.0 -> 1.6.0 (*)
+|    |    +--- com.google.errorprone:error_prone_annotations:2.9.0 -> 2.15.0
+|    |    \--- com.google.firebase:firebase-annotations:16.2.0
+|    |         \--- javax.inject:javax.inject:1
+|    +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
+|    +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
+|    +--- com.google.mlkit:barcode-scanning-common:17.0.0
+|    |    +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
+|    |    \--- com.google.mlkit:vision-common:17.0.0
+|    |         +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
+|    |         +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
+|    |         +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
+|    |         +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
+|    |         +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
+|    |         +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
+|    |         +--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
+|    |         +--- com.google.android.odml:image:1.0.0-beta1
+|    |         +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
+|    |         +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
+|    |         +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
+|    |         \--- com.google.mlkit:common:18.0.0 -> 18.5.0
+|    |              +--- androidx.core:core:1.0.0 -> 1.10.0 (*)
+|    |              +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
+|    |              +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
+|    |              +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
+|    |              +--- com.google.android.gms:play-services-base:18.1.0 (*)
+|    |              +--- com.google.android.gms:play-services-basement:18.1.0 (*)
+|    |              +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
+|    |              +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
+|    |              +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
+|    |              \--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
+|    \--- com.google.mlkit:common:18.5.0 (*)
-+--- com.google.mlkit:barcode-scanning-common:17.0.0
-|    +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
-|    \--- com.google.mlkit:vision-common:17.0.0 -> 17.3.0
-|         +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
-|         +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0
-|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8
-|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    +--- com.google.android.datatransport:transport-api:3.0.0 (*)
-|         |    +--- com.google.android.datatransport:transport-runtime:3.1.8
-|         |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
-|         |    |    +--- com.google.android.datatransport:transport-api:3.0.0 (*)
-|         |    |    +--- com.google.firebase:firebase-encoders:17.0.0
-|         |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    |    +--- com.google.firebase:firebase-encoders-proto:16.0.0
-|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |    |    |    \--- com.google.firebase:firebase-encoders:17.0.0 (*)
-|         |    |    \--- javax.inject:javax.inject:1
-|         |    +--- com.google.firebase:firebase-encoders:17.0.0 (*)
-|         |    \--- com.google.firebase:firebase-encoders-json:18.0.0
-|         |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|         |         \--- com.google.firebase:firebase-encoders:17.0.0 (*)
-|         +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
-|         +--- com.google.android.gms:play-services-base:18.1.0 (*)
-|         +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-|         +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-|         +--- com.google.android.odml:image:1.0.0-beta1
-|         +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0
-|         |    +--- androidx.annotation:annotation:1.5.0 -> 1.6.0 (*)
-|         |    +--- com.google.errorprone:error_prone_annotations:2.9.0 -> 2.15.0
-|         |    \--- com.google.firebase:firebase-annotations:16.2.0
-|         |         \--- javax.inject:javax.inject:1
-|         +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
-|         +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
-|         \--- com.google.mlkit:common:18.6.0 -> 18.9.0
-|              +--- androidx.core:core:1.0.0 -> 1.10.0 (*)
-|              +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
-|              +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
-|              +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
-|              +--- com.google.android.gms:play-services-base:18.1.0 (*)
-|              +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-|              +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-|              +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
-|              +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
-|              \--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
+\--- com.google.mlkit:barcode-scanning-common:17.0.0 (*)
-+--- com.google.mlkit:text-recognition:16.0.0
-|    +--- com.google.android.gms:play-services-base:18.1.0 (*)
-|    +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-|    +--- com.google.android.gms:play-services-mlkit-text-recognition:19.0.0
-|    |    +--- com.google.android.gms:play-services-base:18.1.0 (*)
-|    |    +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-|    |    +--- com.google.android.gms:play-services-mlkit-text-recognition-common:19.0.0
-|    |    |    +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
-|    |    |    +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
-|    |    |    +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
-|    |    |    +--- com.google.android.gms:play-services-base:18.1.0 (*)
-|    |    |    +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-|    |    |    +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-|    |    |    +--- com.google.android.odml:image:1.0.0-beta1
-|    |    |    +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
-|    |    |    +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
-|    |    |    +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
-|    |    |    +--- com.google.mlkit:common:18.8.0 -> 18.9.0 (*)
-|    |    |    +--- com.google.mlkit:vision-common:17.3.0 (*)
-|    |    |    \--- com.google.mlkit:vision-interfaces:16.2.0
-|    |    |         +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-|    |    |         \--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-|    |    \--- com.google.mlkit:common:18.8.0 -> 18.9.0 (*)
-|    +--- com.google.mlkit:common:18.8.0 -> 18.9.0 (*)
-|    \--- com.google.mlkit:text-recognition-bundled-common:16.0.0
-|         +--- com.google.android.gms:play-services-base:18.1.0 (*)
-|         +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-|         +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-|         +--- com.google.mlkit:common:18.8.0 -> 18.9.0 (*)
-|         \--- com.google.mlkit:vision-common:17.3.0 (*)
-+--- com.google.mlkit:barcode-scanning:17.2.0
-|    +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-|    +--- com.google.android.gms:play-services-mlkit-barcode-scanning:18.3.0
-|    |    +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
-|    |    +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
-|    |    +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
-|    |    +--- com.google.android.gms:play-services-base:18.1.0 (*)
-|    |    +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-|    |    +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-|    |    +--- com.google.android.odml:image:1.0.0-beta1
-|    |    +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
-|    |    +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
-|    |    +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
-|    |    +--- com.google.mlkit:barcode-scanning-common:17.0.0 (*)
-|    |    +--- com.google.mlkit:common:18.9.0 (*)
-|    |    +--- com.google.mlkit:vision-common:17.3.0 (*)
-|    |    \--- com.google.mlkit:vision-interfaces:16.2.0 (*)
-|    +--- com.google.mlkit:barcode-scanning-common:17.0.0 (*)
-|    +--- com.google.mlkit:common:18.9.0 (*)
-|    \--- com.google.mlkit:vision-common:17.3.0 (*)
-+--- androidx.camera:camera-camera2:1.2.3 (*)
-+--- androidx.camera:camera-lifecycle:1.2.3
-|    +--- androidx.camera:camera-core:1.2.3 (*)
-|    +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
-|    +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-|    +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.6.2 (*)
-|    +--- 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.camera:camera-view:1.2.3
-     +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-     +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*)
-     +--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*)
-     +--- androidx.camera:camera-core:1.2.3 (*)
-     +--- androidx.camera:camera-lifecycle:1.2.3 (*)
-     +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
-     +--- androidx.core:core:1.3.2 -> 1.10.0 (*)
-     +--- androidx.lifecycle:lifecycle-common:2.0.0 -> 2.6.2 (*)
-     +--- com.google.auto.value:auto-value-annotations:1.6.3
-     \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava

Please review and act accordingly

@wpmobilebot

wpmobilebot commented Dec 1, 2023

Copy link
Copy Markdown
Contributor
Jetpack📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack Jetpack
FlavorJalapeno
Build TypeDebug
Versionpr19713-0a3337b
Commit0a3337b
Direct Downloadjetpack-prototype-build-pr19713-0a3337b.apk
Note: Google Login is not supported on these builds.

@wpmobilebot

wpmobilebot commented Dec 1, 2023

Copy link
Copy Markdown
Contributor
WordPress📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress WordPress
FlavorJalapeno
Build TypeDebug
Versionpr19713-0a3337b
Commit0a3337b
Direct Downloadwordpress-prototype-build-pr19713-0a3337b.apk
Note: Google Login is not supported on these builds.

[Bloganuary] Implement Dashboard Card and Modal for Bloganuary Nudge
@peril-wordpress-mobile

Copy link
Copy Markdown
Warnings
⚠️

This PR adds a translatable entry to strings.xml which references another string resource: this usually causes issues with translations.Please make sure to set the translatable="false" attribute here:+ <string name="bloganuary_dashboard_nudge_learn_more">@string/learn_more</string>

Generated by 🚫 dangerJS

@oguzkocer
oguzkocer requested a review from thomashorta December 1, 2023 21:15

@thomashorta thomashorta left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM!

@oguzkocer
oguzkocer merged commit 1ef03c0 into trunk Dec 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants