From ab1afaa82ef543195f05599fdf532e4427f9188b Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Mon, 16 Oct 2023 12:37:19 +0300 Subject: [PATCH 1/4] Build: Update fluxc version to pr hash (#2870) This 'FluxC' PR hash updates the library to that branch version where the 'CommentModel' is updated to its new null proof version. FluxC PR: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/pull/2870 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 c5018beaaeb4..702be5c4198f 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ ext { automatticTracksVersion = '3.3.0' gutenbergMobileVersion = 'v1.106.0' wordPressAztecVersion = 'v1.8.0' - wordPressFluxCVersion = 'trunk-21b9cb51949bff38713430b86c31e4620623dcf2' + wordPressFluxCVersion = '2870-a164dd020a556a647fe3e66e2e5bd64a4d64080f' wordPressLoginVersion = '1.6.0' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.10.0' From 98f9f11115754c4607a62a9a2c15d5930e7a1b6f Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Mon, 16 Oct 2023 12:43:00 +0300 Subject: [PATCH 2/4] Test: Update get likes use case test to updated on cmt likes changed --- .../usecases/GetLikesUseCaseTest.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/WordPress/src/test/java/org/wordpress/android/ui/engagement/usecases/GetLikesUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/engagement/usecases/GetLikesUseCaseTest.kt index a6b553172e56..5863a88c5743 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/engagement/usecases/GetLikesUseCaseTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/engagement/usecases/GetLikesUseCaseTest.kt @@ -343,9 +343,9 @@ class GetLikesUseCaseTest : BaseUnitTest() { OnCommentLikesChanged( siteId, commentId, - false + false, + FETCHED_COMMENT_LIKES ).apply { - causeOfChange = FETCHED_COMMENT_LIKES error = CommentError( CommentErrorType.AUTHORIZATION_REQUIRED, "Error occurred" @@ -387,9 +387,9 @@ class GetLikesUseCaseTest : BaseUnitTest() { OnCommentLikesChanged( siteId, commentId, - false + false, + FETCHED_COMMENT_LIKES ).apply { - causeOfChange = FETCHED_COMMENT_LIKES error = CommentError( CommentErrorType.AUTHORIZATION_REQUIRED, errorMessage @@ -431,9 +431,9 @@ class GetLikesUseCaseTest : BaseUnitTest() { OnCommentLikesChanged( siteId, commentId, - false + false, + FETCHED_COMMENT_LIKES ).apply { - causeOfChange = FETCHED_COMMENT_LIKES error = CommentError( CommentErrorType.AUTHORIZATION_REQUIRED, errorMessage @@ -476,9 +476,9 @@ class GetLikesUseCaseTest : BaseUnitTest() { OnCommentLikesChanged( siteId, commentId, - false + false, + FETCHED_COMMENT_LIKES ).apply { - causeOfChange = FETCHED_COMMENT_LIKES commentLikes = likeData } ) @@ -512,9 +512,9 @@ class GetLikesUseCaseTest : BaseUnitTest() { OnCommentLikesChanged( siteId, commentId, - false + false, + FETCHED_COMMENT_LIKES ).apply { - causeOfChange = FETCHED_COMMENT_LIKES commentLikes = likeData } ) From e1a6a978b2f4ffcaea893ab9cfddd5343623d0a4 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 18 Oct 2023 15:05:18 +0300 Subject: [PATCH 3/4] Build: Update fluxc version to pr hash (#2870) This 'FluxC' PR hash updates the library to that branch version where the 'CommentModel' is updated to its new null proof version. FluxC PR: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/pull/2870 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 ab1afaa82ef543195f05599fdf532e4427f9188b. 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 3c5169a668e6..0e75c11bea5c 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ ext { automatticTracksVersion = '3.3.0' gutenbergMobileVersion = 'v1.106.0' wordPressAztecVersion = 'v1.8.0' - wordPressFluxCVersion = '2.51.0' + wordPressFluxCVersion = '2870-94fbe921b84cb818aa8c28429e84ef57ae350cc4' wordPressLoginVersion = '1.6.0' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.10.0' From 1a3ee3db3715bb281014df1ea52a6bf4105fd9d0 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 19 Oct 2023 13:19:10 +0300 Subject: [PATCH 4/4] Build: Update fluxc version to trunk hash (#2870) This 'FluxC' hash updates the library to that 'trunk' version where the 'CommentModel' is updated to its new null proof version. FluxC PR: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/pull/2870 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0e75c11bea5c..845eb09329b9 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ ext { automatticTracksVersion = '3.3.0' gutenbergMobileVersion = 'v1.106.0' wordPressAztecVersion = 'v1.8.0' - wordPressFluxCVersion = '2870-94fbe921b84cb818aa8c28429e84ef57ae350cc4' + wordPressFluxCVersion = 'trunk-5f7448d86213648f402c2e04af738ec5904ebb31' wordPressLoginVersion = '1.6.0' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.10.0'