Skip to content

Conversation

wpmobilebot
Copy link
Collaborator

Merging release/23.3 into trunk.

Via intermediate branch merge/release-23.3-into-trunk, to help fix conflicts if any:

                            release/23.3  ----o-- - - -
                                               \
           merge/release-23.3-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

@wpmobilebot wpmobilebot requested a review from a team as a code owner October 2, 2025 15:24
@wpmobilebot wpmobilebot requested review from malinajirka and removed request for a team October 2, 2025 15:24
@wpmobilebot wpmobilebot added the Releases Used in release management. Using this label will skip some bot checks. label Oct 2, 2025
@wpmobilebot wpmobilebot added this to the 23.4 milestone Oct 2, 2025
@dangermattic
Copy link
Collaborator

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

Generated by 🚫 Danger

@wpmobilebot
Copy link
Collaborator Author

Project dependencies changes

list
! Upgraded Dependencies
com.squareup.okhttp3:okhttp-tls:5.1.0, (changed from 4.12.0)
tree
-\--- project :libs:cardreader
-     \--- com.stripe:stripeterminal-taptopay:4.6.0
-          +--- com.squareup.okhttp3:okhttp-tls:4.12.0
-          |    +--- com.squareup.okhttp3:okhttp:4.12.0 -> 5.1.0 (*)
-          |    +--- com.squareup.okio:okio:3.6.0 -> 3.15.0 (*)
-          |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.24 (*)
-          \--- com.stripe:stripeterminal-internal-common:4.6.0
-               \--- com.squareup.okhttp3:okhttp-tls:4.12.0 (*)
++--- project :libs:fluxc
+     \--- com.squareup.okhttp3:okhttp-tls:5.1.0
+          +--- com.squareup.okhttp3:okhttp:5.1.0 (*)
+          +--- com.squareup.okio:okio:3.15.0 (*)
+          \--- org.jetbrains.kotlin:kotlin-stdlib:2.2.0 (*)
+\--- project :libs:cardreader
+     \--- com.stripe:stripeterminal-taptopay:4.6.0
+          +--- com.squareup.okhttp3:okhttp-tls:4.12.0 -> 5.1.0 (*)
+          \--- com.stripe:stripeterminal-internal-common:4.6.0
+               \--- com.squareup.okhttp3:okhttp-tls:4.12.0 -> 5.1.0 (*)

@wpmobilebot
Copy link
Collaborator Author

Project manifest changes for WooCommerce

The following changes in the WooCommerce's merged AndroidManifest.xml file were detected (build variant: vanillaRelease):

--- ./build/reports/diff_manifest/WooCommerce/vanillaRelease/base_manifest.txt	2025-10-02 15:28:44.249622163 +0000
+++ ./build/reports/diff_manifest/WooCommerce/vanillaRelease/head_manifest.txt	2025-10-02 15:29:15.479756916 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.woocommerce.android"
-    android:versionCode="693"
-    android:versionName="23.3-rc-1" >
+    android:versionCode="694"
+    android:versionName="23.3-rc-2" >
 
     <uses-sdk
         android:minSdkVersion="26"

Go to https://buildkite.com/automattic/woocommerce-android/builds/32433/canvas?sid=0199a586-53e3-4770-b690-8d28151c796e, click on the Artifacts tab and audit the files.

@wpmobilebot
Copy link
Collaborator Author

Project manifest changes for WooCommerce-Wear

The following changes in the WooCommerce-Wear's merged AndroidManifest.xml file were detected (build variant: vanillaRelease):

--- ./build/reports/diff_manifest/WooCommerce-Wear/vanillaRelease/base_manifest.txt	2025-10-02 15:29:31.309824134 +0000
+++ ./build/reports/diff_manifest/WooCommerce-Wear/vanillaRelease/head_manifest.txt	2025-10-02 15:29:44.299878677 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.woocommerce.android"
-    android:versionCode="50693"
-    android:versionName="23.3-rc-1w" >
+    android:versionCode="50694"
+    android:versionName="23.3-rc-2w" >
 
     <uses-sdk
         android:minSdkVersion="26"

Go to https://buildkite.com/automattic/woocommerce-android/builds/32433/canvas?sid=0199a586-53e3-4770-b690-8d28151c796e, click on the Artifacts tab and audit the files.

@wpmobilebot
Copy link
Collaborator Author

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.
App Name WooCommerce-Wear Android
Platform⌚️ Wear OS
FlavorJalapeno
Build TypeDebug
Commitbfaf24f
Direct Downloadwoocommerce-wear-prototype-build-pr14683-bfaf24f.apk

@wpmobilebot
Copy link
Collaborator Author

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

App Name WooCommerce Android
Platform📱 Mobile
FlavorJalapeno
Build TypeDebug
Commitbfaf24f
Direct Downloadwoocommerce-prototype-build-pr14683-bfaf24f.apk

@codecov-commenter
Copy link

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 38.50%. Comparing base (a2ebe1a) to head (bfaf24f).
⚠️ Report is 251 commits behind head on trunk.

Additional details and impacted files
@@             Coverage Diff              @@
##              trunk   #14683      +/-   ##
============================================
- Coverage     38.50%   38.50%   -0.01%     
+ Complexity     9775     9774       -1     
============================================
  Files          2066     2066              
  Lines        115514   115514              
  Branches      15390    15390              
============================================
- Hits          44477    44476       -1     
  Misses        66906    66906              
- Partials       4131     4132       +1     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Contributor

@malinajirka malinajirka left a comment

Choose a reason for hiding this comment

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

LGTM

@malinajirka malinajirka merged commit 105a0ed into trunk Oct 3, 2025
21 of 22 checks passed
@malinajirka malinajirka deleted the merge/release-23.3-into-trunk branch October 3, 2025 05:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Releases Used in release management. Using this label will skip some bot checks.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants