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

Merge 25.1-rc-3 to trunk #21014

Merged
merged 14 commits into from
Jun 24, 2024
Merged

Merge 25.1-rc-3 to trunk #21014

merged 14 commits into from
Jun 24, 2024

Conversation

oguzkocer
Copy link
Contributor

No description provided.

@oguzkocer oguzkocer added the Releases Label related to managing releases label Jun 21, 2024
@oguzkocer oguzkocer added this to the 25.2 milestone Jun 21, 2024
@oguzkocer oguzkocer requested a review from a team June 21, 2024 20:58
@oguzkocer oguzkocer enabled auto-merge June 21, 2024 20:58
@dangermattic
Copy link
Collaborator

1 Message
📖 This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

Copy link

sonarcloud bot commented Jun 21, 2024

@wpmobilebot
Copy link
Contributor

Found 1 violations:

The PR caused some dependency changes (expand to see details)

 \--- project :libs:editor
-     \--- org.wordpress.gutenberg-mobile:react-native-gutenberg-bridge:v1.120.0
-          +--- com.facebook.fresco:animated-gif:2.0.0
-          |    +--- com.parse.bolts:bolts-tasks:1.4.0
-          |    +--- com.facebook.soloader:soloader:0.6.0 -> 0.10.5 (*)
-          |    +--- com.facebook.fresco:fbcore:2.0.0 -> 3.1.3 (*)
-          |    \--- com.facebook.fresco:animated-base:2.0.0
-          |         +--- com.facebook.fresco:fbcore:2.0.0 -> 3.1.3 (*)
-          |         +--- com.facebook.fresco:imagepipeline-base:2.0.0 -> 3.1.3 (*)
-          |         +--- com.facebook.fresco:imagepipeline:2.0.0 -> 3.1.3 (*)
-          |         +--- com.facebook.fresco:animated-drawable:2.0.0
-          |         |    +--- com.facebook.fresco:imagepipeline:2.0.0 -> 3.1.3 (*)
-          |         |    +--- com.facebook.fresco:drawee:2.0.0 -> 3.1.3 (*)
-          |         |    \--- com.facebook.fresco:fbcore:2.0.0 -> 3.1.3 (*)
-          |         \--- com.parse.bolts:bolts-tasks:1.4.0
-          +--- com.google.android.material:material:1.2.1 -> 1.9.0 (*)
-          +--- com.github.wordpress-mobile:react-native-video:5.2.0-wp-7
-          |    +--- com.google.android.exoplayer:exoplayer:2.13.3
-          |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3
-          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3
-          |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    |    |    \--- com.google.guava:guava:27.1-android
-          |    |    |    |         +--- com.google.guava:failureaccess:1.0.1
-          |    |    |    |         \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-          |    |    |    \--- com.google.android.exoplayer:exoplayer-extractor:2.13.3
-          |    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    |         \--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
-          |    |    +--- com.google.android.exoplayer:exoplayer-dash:2.13.3
-          |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-          |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    +--- com.google.android.exoplayer:exoplayer-hls:2.13.3
-          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-          |    |    +--- com.google.android.exoplayer:exoplayer-smoothstreaming:2.13.3
-          |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-          |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    +--- com.google.android.exoplayer:exoplayer-transformer:2.13.3
-          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-          |    |    \--- com.google.android.exoplayer:exoplayer-ui:2.13.3
-          |    |         +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-          |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |         +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
-          |    |         \--- androidx.media:media:1.2.1 (*)
-          |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    +--- androidx.core:core:1.1.0 -> 1.12.0 (*)
-          |    +--- androidx.media:media:1.1.0 -> 1.2.1 (*)
-          |    +--- com.google.android.exoplayer:extension-okhttp:2.13.3
-          |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
-          |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    \--- com.squareup.okhttp3:okhttp:3.12.11 -> 4.12.0 (*)
-          |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.12.0 (*)
-          +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-5
-          +--- org.wordpress.react-native-libraries.v6:react-native-get-random-values:1.4.0
-          +--- org.wordpress.react-native-libraries.v6:react-native-safe-area-context:4.8.2
-          |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.9.22 (*)
-          +--- org.wordpress.react-native-libraries.v6:react-native-screens:3.29.0
-          |    +--- androidx.appcompat:appcompat:1.6.1 (*)
-          |    +--- androidx.fragment:fragment:1.3.6 -> 1.6.2 (*)
-          |    +--- androidx.coordinatorlayout:coordinatorlayout:1.2.0 (*)
-          |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 (*)
-          |    +--- com.google.android.material:material:1.9.0 (*)
-          |    +--- androidx.core:core-ktx:1.9.0 -> 1.12.0 (*)
-          |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.10 (*)
-          |    \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1 -> 2.6.2 (c)
-          +--- org.wordpress.react-native-libraries.v6:react-native-svg:14.0.0
-          +--- org.wordpress.react-native-libraries.v6:react-native-webview:13.6.1
-          |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.9.22 (*)
-          |    \--- androidx.webkit:webkit:1.4.0 -> 1.11.0 (*)
-          +--- org.wordpress.react-native-libraries.v6:react-native-masked-view:0.3.0
-          +--- org.wordpress.react-native-libraries.v6:react-native-clipboard:1.11.2
-          +--- org.wordpress.react-native-libraries.v6:react-native-fast-image:8.5.11
-          |    +--- com.github.bumptech.glide:glide:4.12.0 -> 4.16.0
-          |    |    +--- com.github.bumptech.glide:gifdecoder:4.16.0
-          |    |    |    \--- androidx.annotation:annotation:1.5.0 -> 1.6.0 (*)
-          |    |    +--- com.github.bumptech.glide:disklrucache:4.16.0
-          |    |    +--- com.github.bumptech.glide:annotations:4.16.0
-          |    |    +--- androidx.fragment:fragment:1.3.6 -> 1.6.2 (*)
-          |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
-          |    |    +--- androidx.exifinterface:exifinterface:1.3.6 (*)
-          |    |    \--- androidx.tracing:tracing:1.0.0 -> 1.1.0 (*)
-          |    \--- com.github.bumptech.glide:okhttp3-integration:4.12.0
-          |         +--- com.github.bumptech.glide:glide:4.12.0 -> 4.16.0 (*)
-          |         +--- com.squareup.okhttp3:okhttp:3.9.1 -> 4.12.0 (*)
-          |         \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-          +--- org.wordpress.react-native-libraries.v6:react-native-reanimated:3.6.2
-          |    +--- com.facebook.yoga:proguard-annotations:1.19.0
-          |    +--- androidx.transition:transition:1.1.0 -> 1.4.1 (*)
-          |    \--- androidx.core:core:1.9.0 -> 1.12.0 (*)
-          +--- org.wordpress.react-native-libraries.v6:react-native-gesture-handler:2.14.1
-          |    +--- org.wordpress.react-native-libraries.v6:react-native-reanimated:3.6.2 (*)
-          |    +--- androidx.appcompat:appcompat:1.6.1 (*)
-          |    +--- androidx.core:core-ktx:1.9.0 -> 1.12.0 (*)
-          |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.9.22 (*)
-          +--- org.wordpress.react-native-libraries.v6:react-native-linear-gradient:2.7.3
-          +--- org.wordpress.gutenberg-mobile:react-native-aztec:v1.120.0
-          |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
-          |    +--- androidx.gridlayout:gridlayout:1.0.0
-          |    |    +--- androidx.core:core:1.0.0 -> 1.12.0 (*)
-          |    |    \--- androidx.legacy:legacy-support-core-ui:1.0.0 (*)
-          |    +--- androidx.cardview:cardview:1.0.0 (*)
-          |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.6.1 (*)
-          |    +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
-          |    +--- org.wordpress:aztec:v2.1.2 -> v2.1.3 (*)
-          |    +--- org.wordpress.aztec:wordpress-shortcodes:v2.1.2 -> v2.1.3 (*)
-          |    +--- org.wordpress.aztec:wordpress-comments:v2.1.2 -> v2.1.3 (*)
-          |    +--- org.wordpress.aztec:glide-loader:v2.1.2
-          |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.9.10 (*)
-          |    |    +--- org.wordpress:aztec:v2.1.2 -> v2.1.3 (*)
-          |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.16.0 (*)
-          |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.9.10 (*)
-          \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.9.10 (*)
+     \--- org.wordpress.gutenberg-mobile:react-native-gutenberg-bridge:v1.120.1
+          +--- com.facebook.fresco:animated-gif:2.0.0
+          |    +--- com.parse.bolts:bolts-tasks:1.4.0
+          |    +--- com.facebook.soloader:soloader:0.6.0 -> 0.10.5 (*)
+          |    +--- com.facebook.fresco:fbcore:2.0.0 -> 3.1.3 (*)
+          |    \--- com.facebook.fresco:animated-base:2.0.0
+          |         +--- com.facebook.fresco:fbcore:2.0.0 -> 3.1.3 (*)
+          |         +--- com.facebook.fresco:imagepipeline-base:2.0.0 -> 3.1.3 (*)
+          |         +--- com.facebook.fresco:imagepipeline:2.0.0 -> 3.1.3 (*)
+          |         +--- com.facebook.fresco:animated-drawable:2.0.0
+          |         |    +--- com.facebook.fresco:imagepipeline:2.0.0 -> 3.1.3 (*)
+          |         |    +--- com.facebook.fresco:drawee:2.0.0 -> 3.1.3 (*)
+          |         |    \--- com.facebook.fresco:fbcore:2.0.0 -> 3.1.3 (*)
+          |         \--- com.parse.bolts:bolts-tasks:1.4.0
+          +--- com.google.android.material:material:1.2.1 -> 1.9.0 (*)
+          +--- com.github.wordpress-mobile:react-native-video:5.2.0-wp-7
+          |    +--- com.google.android.exoplayer:exoplayer:2.13.3
+          |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3
+          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3
+          |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    |    |    \--- com.google.guava:guava:27.1-android
+          |    |    |    |         +--- com.google.guava:failureaccess:1.0.1
+          |    |    |    |         \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+          |    |    |    \--- com.google.android.exoplayer:exoplayer-extractor:2.13.3
+          |    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    |         \--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
+          |    |    +--- com.google.android.exoplayer:exoplayer-dash:2.13.3
+          |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+          |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    +--- com.google.android.exoplayer:exoplayer-hls:2.13.3
+          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+          |    |    +--- com.google.android.exoplayer:exoplayer-smoothstreaming:2.13.3
+          |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+          |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    +--- com.google.android.exoplayer:exoplayer-transformer:2.13.3
+          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+          |    |    \--- com.google.android.exoplayer:exoplayer-ui:2.13.3
+          |    |         +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+          |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |         +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
+          |    |         \--- androidx.media:media:1.2.1 (*)
+          |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    +--- androidx.core:core:1.1.0 -> 1.12.0 (*)
+          |    +--- androidx.media:media:1.1.0 -> 1.2.1 (*)
+          |    +--- com.google.android.exoplayer:extension-okhttp:2.13.3
+          |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
+          |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    \--- com.squareup.okhttp3:okhttp:3.12.11 -> 4.12.0 (*)
+          |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.12.0 (*)
+          +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-5
+          +--- org.wordpress.react-native-libraries.v6:react-native-get-random-values:1.4.0
+          +--- org.wordpress.react-native-libraries.v6:react-native-safe-area-context:4.8.2
+          |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.9.22 (*)
+          +--- org.wordpress.react-native-libraries.v6:react-native-screens:3.29.0
+          |    +--- androidx.appcompat:appcompat:1.6.1 (*)
+          |    +--- androidx.fragment:fragment:1.3.6 -> 1.6.2 (*)
+          |    +--- androidx.coordinatorlayout:coordinatorlayout:1.2.0 (*)
+          |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 (*)
+          |    +--- com.google.android.material:material:1.9.0 (*)
+          |    +--- androidx.core:core-ktx:1.9.0 -> 1.12.0 (*)
+          |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.10 (*)
+          |    \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1 -> 2.6.2 (c)
+          +--- org.wordpress.react-native-libraries.v6:react-native-svg:14.0.0
+          +--- org.wordpress.react-native-libraries.v6:react-native-webview:13.6.1
+          |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.9.22 (*)
+          |    \--- androidx.webkit:webkit:1.4.0 -> 1.11.0 (*)
+          +--- org.wordpress.react-native-libraries.v6:react-native-masked-view:0.3.0
+          +--- org.wordpress.react-native-libraries.v6:react-native-clipboard:1.11.2
+          +--- org.wordpress.react-native-libraries.v6:react-native-fast-image:8.5.11
+          |    +--- com.github.bumptech.glide:glide:4.12.0 -> 4.16.0
+          |    |    +--- com.github.bumptech.glide:gifdecoder:4.16.0
+          |    |    |    \--- androidx.annotation:annotation:1.5.0 -> 1.6.0 (*)
+          |    |    +--- com.github.bumptech.glide:disklrucache:4.16.0
+          |    |    +--- com.github.bumptech.glide:annotations:4.16.0
+          |    |    +--- androidx.fragment:fragment:1.3.6 -> 1.6.2 (*)
+          |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
+          |    |    +--- androidx.exifinterface:exifinterface:1.3.6 (*)
+          |    |    \--- androidx.tracing:tracing:1.0.0 -> 1.1.0 (*)
+          |    \--- com.github.bumptech.glide:okhttp3-integration:4.12.0
+          |         +--- com.github.bumptech.glide:glide:4.12.0 -> 4.16.0 (*)
+          |         +--- com.squareup.okhttp3:okhttp:3.9.1 -> 4.12.0 (*)
+          |         \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+          +--- org.wordpress.react-native-libraries.v6:react-native-reanimated:3.6.2
+          |    +--- com.facebook.yoga:proguard-annotations:1.19.0
+          |    +--- androidx.transition:transition:1.1.0 -> 1.4.1 (*)
+          |    \--- androidx.core:core:1.9.0 -> 1.12.0 (*)
+          +--- org.wordpress.react-native-libraries.v6:react-native-gesture-handler:2.14.1
+          |    +--- org.wordpress.react-native-libraries.v6:react-native-reanimated:3.6.2 (*)
+          |    +--- androidx.appcompat:appcompat:1.6.1 (*)
+          |    +--- androidx.core:core-ktx:1.9.0 -> 1.12.0 (*)
+          |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.9.22 (*)
+          +--- org.wordpress.react-native-libraries.v6:react-native-linear-gradient:2.7.3
+          +--- org.wordpress.gutenberg-mobile:react-native-aztec:v1.120.1
+          |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
+          |    +--- androidx.gridlayout:gridlayout:1.0.0
+          |    |    +--- androidx.core:core:1.0.0 -> 1.12.0 (*)
+          |    |    \--- androidx.legacy:legacy-support-core-ui:1.0.0 (*)
+          |    +--- androidx.cardview:cardview:1.0.0 (*)
+          |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.6.1 (*)
+          |    +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
+          |    +--- org.wordpress:aztec:v2.1.2 -> v2.1.3 (*)
+          |    +--- org.wordpress.aztec:wordpress-shortcodes:v2.1.2 -> v2.1.3 (*)
+          |    +--- org.wordpress.aztec:wordpress-comments:v2.1.2 -> v2.1.3 (*)
+          |    +--- org.wordpress.aztec:glide-loader:v2.1.2
+          |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.9.10 (*)
+          |    |    +--- org.wordpress:aztec:v2.1.2 -> v2.1.3 (*)
+          |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.16.0 (*)
+          |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.9.10 (*)
+          \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.9.10 (*)

Please review and act accordingly

@wpmobilebot
Copy link
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
Versionpr21014-d3d11b5
Commitd3d11b5
Direct Downloadjetpack-prototype-build-pr21014-d3d11b5.apk
Note: Google Login is not supported on these builds.

@wpmobilebot
Copy link
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
Versionpr21014-d3d11b5
Commitd3d11b5
Direct Downloadwordpress-prototype-build-pr21014-d3d11b5.apk
Note: Google Login is not supported on these builds.

Copy link

codecov bot commented Jun 21, 2024

Codecov Report

Attention: Patch coverage is 0% with 3 lines in your changes missing coverage. Please review.

Project coverage is 40.98%. Comparing base (9e26ec5) to head (d3d11b5).
Report is 192 commits behind head on trunk.

Files Patch % Lines
...ordpress/android/ui/reader/ReaderPostRenderer.java 0.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            trunk   #21014      +/-   ##
==========================================
- Coverage   40.99%   40.98%   -0.01%     
==========================================
  Files        1522     1522              
  Lines       69622    69625       +3     
  Branches    11489    11490       +1     
==========================================
  Hits        28539    28539              
- Misses      38494    38497       +3     
  Partials     2589     2589              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@mokagio mokagio left a comment

Choose a reason for hiding this comment

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

  • versionName rc number and versionCode bumps in version.properties
  • string.xml updates
  • Diffs from the PRs that made it into this beta

@oguzkocer oguzkocer merged commit 3b497cd into trunk Jun 24, 2024
22 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Releases Label related to managing releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants