From 6abaf1354e69b9428475ddfcb4bea38f33af42b9 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 3 Nov 2023 16:39:28 +0200 Subject: [PATCH 1/5] Build: Update fluxc version to pr hash (#2893) This 'FluxC' PR hash updates the library to that branch version where the 'Theme' payload classes are updated to their new null proof version. FluxC PR: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/pull/2893 This step is required in order to check that these 'FluxC' related changes work as expected for WPAndroid. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8a5408c9dc01..5905d3f2818d 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ ext { automatticTracksVersion = '3.3.0' gutenbergMobileVersion = 'v1.107.0' wordPressAztecVersion = 'v1.8.0' - wordPressFluxCVersion = 'trunk-7fd7840a9bd900fde8e32ad8bd5632ad8f05dff3' + wordPressFluxCVersion = '2893-9ee355f2cd4f7d1f4bfbb78ba9b55d969af64bc6' wordPressLoginVersion = 'trunk-9963d78096edf65f8704b803e5b93c08fc9174cd' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.10.0' From 5381456f806e35ef46717e1ffc79e2a9c908b02a Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 3 Nov 2023 16:42:09 +0200 Subject: [PATCH 2/5] Analysis: Un-guard usages of non-null on starter designs fetched designs --- .../wordpress/android/ui/sitecreation/SiteCreationMainVM.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt index d783e4a69250..38d3bbc80ced 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt @@ -193,9 +193,6 @@ class SiteCreationMainVM @Inject constructor( if (response.isError) { AppLog.e(T.THEMES, "Error preloading starter designs: ${response.error}") return@launch - } else if (response.designs == null) { - AppLog.e(T.THEMES, "Null starter designs response: $response") - return@launch } for (design in response.designs) { From 9c21ef2cc189db42e5b96dc9ddecef2e40ad7101 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 3 Nov 2023 16:46:32 +0200 Subject: [PATCH 3/5] Test: Resolve blaze campaign model parameter target urn related warnings Warning: "No value passed for parameter 'targetUrn'" FYI: These 'BlazeCampaignModel' test compile errors are unrelated to the theme payload changes and only started to appear because 'FluxC' got updated to that version where there is now a new 'targetUrn' constructor argument on this model. PS: At some point, WPAndroid should get updated accordingly anyway, but until then this commit will at least fix any testing related CI issues. --- .../campaignlisting/CampaignListingUIModelMapperTest.kt | 2 ++ .../ui/mysite/cards/dashboard/blaze/BlazeCardBuilderTest.kt | 1 + 2 files changed, 3 insertions(+) diff --git a/WordPress/src/test/java/org/wordpress/android/ui/blaze/blazecampaigns/campaignlisting/CampaignListingUIModelMapperTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/blaze/blazecampaigns/campaignlisting/CampaignListingUIModelMapperTest.kt index 631116bfd135..67a3718fd0b0 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/blaze/blazecampaigns/campaignlisting/CampaignListingUIModelMapperTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/blaze/blazecampaigns/campaignlisting/CampaignListingUIModelMapperTest.kt @@ -39,6 +39,7 @@ class CampaignListingUIModelMapperTest : BaseUnitTest() { budgetCents = 100, createdAt = mock(), endDate = mock(), + targetUrn = null, ) @Test @@ -67,6 +68,7 @@ class CampaignListingUIModelMapperTest : BaseUnitTest() { budgetCents = 100, createdAt = mock(), endDate = mock(), + targetUrn = null, ) @Test diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/blaze/BlazeCardBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/blaze/BlazeCardBuilderTest.kt index ef11a910abff..5a3a24657ec1 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/blaze/BlazeCardBuilderTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/blaze/BlazeCardBuilderTest.kt @@ -33,6 +33,7 @@ val campaign = BlazeCampaignModel( budgetCents = 20L, impressions = 1, clicks = 1, + targetUrn = null, ) val onCreateCampaignClick = { } From a2d486d1c27ecdff555d21da452fb9d5c81b7b1f Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Tue, 7 Nov 2023 15:49:43 +0200 Subject: [PATCH 4/5] Build: Update fluxc version to pr hash (#2893) This 'FluxC' PR hash updates the library to that branch version where the 'Theme' payload classes are updated to their new null proof version. FluxC PR: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/pull/2893 This step is required in order to check that these 'FluxC' related changes work as expected for WPAndroid. ------------------------------------------------------------------------ FYI: This change is an addition to 6abaf1354e69b9428475ddfcb4bea38f33af42b9. This change is necessary in order to overcome and resolve new merge conflicts. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index da8622bbdd03..ed6db55b3b97 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ ext { automatticTracksVersion = '3.3.0' gutenbergMobileVersion = 'v1.107.0' wordPressAztecVersion = 'v1.8.0' - wordPressFluxCVersion = 'trunk-82a701e28d0eeb8c1612b256fd9d772182a13b6a' + wordPressFluxCVersion = '2893-950b8bf0ebfc47c654e9d60cb1034876d6dcbc5c' wordPressLoginVersion = 'trunk-9963d78096edf65f8704b803e5b93c08fc9174cd' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.10.0' From 7f546860c2b4c3799a33e8e1d358c4d7e02eeb22 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Tue, 7 Nov 2023 16:20:07 +0200 Subject: [PATCH 5/5] Build: Update fluxc version to trunk hash (#2893) This 'FluxC' hash updates the library to that 'trunk' version where the 'Theme' payload classes are updated to their new null proof version. FluxC PR: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/pull/2893 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ed6db55b3b97..a20b545f4e12 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ ext { automatticTracksVersion = '3.3.0' gutenbergMobileVersion = 'v1.107.0' wordPressAztecVersion = 'v1.8.0' - wordPressFluxCVersion = '2893-950b8bf0ebfc47c654e9d60cb1034876d6dcbc5c' + wordPressFluxCVersion = 'trunk-7a028a40d0b015e8382c656b82064db2d887e578' wordPressLoginVersion = 'trunk-9963d78096edf65f8704b803e5b93c08fc9174cd' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.10.0'