Update FluxC changeset to include fix #12721

JorgeMucientes · 2024-09-27T17:11:57Z

Closes: #12715

Description

This PR simply updates FluxC changeset to include the following fix: wordpress-mobile/WordPress-FluxC-Android#3104

I don't think there's nothing to tests here other than ensuring that all checks are green.

wpmobilebot · 2024-09-27T17:16:26Z

Project dependencies changes

The following changes in project dependencies were detected (configuration vanillaReleaseRuntimeClasspath):

list

Upgraded Dependencies
org.wordpress.fluxc.plugins:woocommerce:trunk-06e2a179771b9d8c726a15843d56fc897b6d5ca0, (changed from trunk-7e2a6b2524a39103ade0b034e40a9e1a013a6d2a)
org.wordpress.fluxc:fluxc-annotations:trunk-06e2a179771b9d8c726a15843d56fc897b6d5ca0, (changed from trunk-7e2a6b2524a39103ade0b034e40a9e1a013a6d2a)
org.wordpress:fluxc:trunk-06e2a179771b9d8c726a15843d56fc897b6d5ca0, (changed from trunk-7e2a6b2524a39103ade0b034e40a9e1a013a6d2a)

tree

-+--- org.wordpress:fluxc:trunk-7e2a6b2524a39103ade0b034e40a9e1a013a6d2a
-|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.25
-|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
-|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
-|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
-|    |    +--- com.google.crypto.tink:tink-android:1.5.0
-|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
-|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- org.apache.commons:commons-text:1.10.0 (*)
-|    +--- androidx.room:room-runtime:2.6.1 (*)
-|    +--- androidx.room:room-ktx:2.6.1
-|    |    +--- androidx.room:room-common:2.6.1 (*)
-|    |    +--- androidx.room:room-runtime:2.6.1 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.25 (*)
-|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
-|    |    +--- androidx.room:room-common:2.6.1 (c)
-|    |    \--- androidx.room:room-runtime:2.6.1 (c)
-|    +--- com.google.dagger:dagger:2.51.1
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-7e2a6b2524a39103ade0b034e40a9e1a013a6d2a
-|    +--- org.greenrobot:eventbus:3.3.1 (*)
-|    +--- org.greenrobot:eventbus-java:3.3.1
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    +--- 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.8.0 (*)
-|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.7.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.7.0 (*)
-|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
-|    +--- com.goterl:lazysodium-android:5.0.2
-|    +--- net.java.dev.jna:jna:5.5.0
-|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
++--- org.wordpress:fluxc:trunk-06e2a179771b9d8c726a15843d56fc897b6d5ca0
+|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.25
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
+|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
+|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
+|    |    +--- com.google.crypto.tink:tink-android:1.5.0
+|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
+|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+|    +--- org.apache.commons:commons-text:1.10.0 (*)
+|    +--- androidx.room:room-runtime:2.6.1 (*)
+|    +--- androidx.room:room-ktx:2.6.1
+|    |    +--- androidx.room:room-common:2.6.1 (*)
+|    |    +--- androidx.room:room-runtime:2.6.1 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.25 (*)
+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
+|    |    +--- androidx.room:room-common:2.6.1 (c)
+|    |    \--- androidx.room:room-runtime:2.6.1 (c)
+|    +--- com.google.dagger:dagger:2.51.1
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-06e2a179771b9d8c726a15843d56fc897b6d5ca0
+|    +--- org.greenrobot:eventbus:3.3.1 (*)
+|    +--- org.greenrobot:eventbus-java:3.3.1
+|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    +--- 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.8.0 (*)
+|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.7.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.7.0 (*)
+|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
+|    +--- com.goterl:lazysodium-android:5.0.2
+|    +--- net.java.dev.jna:jna:5.5.0
+|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-\--- org.wordpress.fluxc.plugins:woocommerce:trunk-7e2a6b2524a39103ade0b034e40a9e1a013a6d2a
-     +--- org.wordpress:fluxc:trunk-7e2a6b2524a39103ade0b034e40a9e1a013a6d2a (*)
-     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-     +--- com.google.dagger:dagger:2.51.1 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-     +--- androidx.room:room-runtime:2.6.1 (*)
-     +--- org.wordpress:wellsql:2.0.0 (*)
-     +--- org.wordpress.fluxc:fluxc-annotations:trunk-7e2a6b2524a39103ade0b034e40a9e1a013a6d2a
-     +--- androidx.room:room-ktx:2.6.1 (*)
-     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
+\--- org.wordpress.fluxc.plugins:woocommerce:trunk-06e2a179771b9d8c726a15843d56fc897b6d5ca0
+     +--- org.wordpress:fluxc:trunk-06e2a179771b9d8c726a15843d56fc897b6d5ca0 (*)
+     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+     +--- com.google.dagger:dagger:2.51.1 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+     +--- androidx.room:room-runtime:2.6.1 (*)
+     +--- org.wordpress:wellsql:2.0.0 (*)
+     +--- org.wordpress.fluxc:fluxc-annotations:trunk-06e2a179771b9d8c726a15843d56fc897b6d5ca0
+     +--- androidx.room:room-ktx:2.6.1 (*)
+     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)

wpmobilebot · 2024-09-27T17:19:36Z

📲 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
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`57532a3`
	Direct Download	`woocommerce-wear-prototype-build-pr12721-57532a3.apk`

wpmobilebot · 2024-09-27T17:29:59Z

📲 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
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`57532a3`
	Direct Download	`woocommerce-prototype-build-pr12721-57532a3.apk`

# Conflicts: # build.gradle

hichamboushaba

LGTM.

np, we can probably add a release note about the fix.

JorgeMucientes · 2024-10-01T11:05:30Z

Updated the release notes 👍🏼

I also noticed that this PR won't be eligible for merging until this other is merged. Otherwise the app won't compile with the latest FluxC trunk changeset 🤦🏼

hichamboushaba · 2024-10-01T12:18:11Z

I also noticed that this PR won't be eligible for merging until #12733 other is merged. Otherwise the app won't compile with the latest FluxC trunk changeset 🤦🏼

I see, this could also impact my other PR since the FluxC changeset includes the breaking changes as well 😅.

I'll try to review the other PR ASAP.

# Conflicts: # build.gradle

Update FluxC changeset to include fix

50a8d16

JorgeMucientes added 2 commits October 1, 2024 11:15

Merge branch 'refs/heads/trunk' into fix/12715-crash-fetching-site-info

c8d4708

# Conflicts: # build.gradle

Update fluxc changeset

8cf93cd

JorgeMucientes requested a review from hichamboushaba October 1, 2024 09:17

JorgeMucientes marked this pull request as ready for review October 1, 2024 09:17

JorgeMucientes added this to the 20.7 milestone Oct 1, 2024

JorgeMucientes added the type: crash The worst kind of bug. label Oct 1, 2024

hichamboushaba approved these changes Oct 1, 2024

View reviewed changes

Updates release notes

8f2d555

Merge branch 'refs/heads/trunk' into fix/12715-crash-fetching-site-info

57532a3

# Conflicts: # build.gradle

JorgeMucientes enabled auto-merge October 1, 2024 14:26

JorgeMucientes merged commit 392343e into trunk Oct 1, 2024
15 checks passed

JorgeMucientes deleted the fix/12715-crash-fetching-site-info branch October 1, 2024 15:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update FluxC changeset to include fix #12721

Update FluxC changeset to include fix #12721

JorgeMucientes commented Sep 27, 2024

wpmobilebot commented Sep 27, 2024 •

edited

Loading

wpmobilebot commented Sep 27, 2024 •

edited

Loading

wpmobilebot commented Sep 27, 2024 •

edited

Loading

hichamboushaba left a comment

JorgeMucientes commented Oct 1, 2024

hichamboushaba commented Oct 1, 2024

Update FluxC changeset to include fix #12721

Update FluxC changeset to include fix #12721

Conversation

JorgeMucientes commented Sep 27, 2024

Description

wpmobilebot commented Sep 27, 2024 • edited Loading

Project dependencies changes

wpmobilebot commented Sep 27, 2024 • edited Loading

wpmobilebot commented Sep 27, 2024 • edited Loading

hichamboushaba left a comment

Choose a reason for hiding this comment

JorgeMucientes commented Oct 1, 2024

hichamboushaba commented Oct 1, 2024

wpmobilebot commented Sep 27, 2024 •

edited

Loading

wpmobilebot commented Sep 27, 2024 •

edited

Loading

wpmobilebot commented Sep 27, 2024 •

edited

Loading