diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 342574d534eb..aad8816a97b6 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -2,6 +2,7 @@ 25.2 ----- +* [*] Fix ability to update a published post's date [https://github.com/wordpress-mobile/WordPress-Android/pull/21036] 25.1 diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/PublicizeTable.java b/WordPress/src/main/java/org/wordpress/android/datasets/PublicizeTable.java index f4149762b8e1..52968d43263e 100644 --- a/WordPress/src/main/java/org/wordpress/android/datasets/PublicizeTable.java +++ b/WordPress/src/main/java/org/wordpress/android/datasets/PublicizeTable.java @@ -157,7 +157,7 @@ private static PublicizeService getServiceFromCursor(Cursor c) { } public static boolean onlyExternalConnections(String serviceId) { - if (serviceId == null && serviceId.isEmpty()) { + if (serviceId == null || serviceId.isEmpty()) { return false; } diff --git a/build.gradle b/build.gradle index 07ca8751398f..474b33391092 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ -import com.automattic.android.measure.MeasureBuildsExtension +import com.automattic.android.measure.reporters.InternalA8cCiReporter +import com.automattic.android.measure.reporters.SlowSlowTasksMetricsReporter import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -26,7 +27,7 @@ ext { automatticTracksVersion = '5.1.0' gutenbergMobileVersion = 'v1.121.0-alpha1' wordPressAztecVersion = 'v2.1.3' - wordPressFluxCVersion = 'trunk-79f2bc35285748c715e00f2a6648ed6831632178' + wordPressFluxCVersion = '3045-5fc175e4780dec098cfd04bf5eb9da7f3cce4076' wordPressLoginVersion = '1.16.0' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.14.0' @@ -119,8 +120,14 @@ ext { measureBuilds { enable = findProperty('measureBuildsEnabled')?.toBoolean() ?: false - automatticProject = MeasureBuildsExtension.AutomatticProject.WordPress - authToken = findProperty('appsMetricsToken') + onBuildMetricsReadyListener { report -> + SlowSlowTasksMetricsReporter.report(report) + InternalA8cCiReporter.reportBlocking( + report, + "wordpress", + findProperty('appsMetricsToken') + ) + } attachGradleScanId = System.getenv('CI')?.toBoolean() ?: false } diff --git a/settings.gradle b/settings.gradle index ce16fc371913..987cdf6d6775 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,7 +8,7 @@ pluginManagement { gradle.ext.daggerVersion = "2.50" gradle.ext.detektVersion = '1.23.0' gradle.ext.violationCommentsVersion = '1.70.0' - gradle.ext.measureBuildsVersion = '2.1.2' + gradle.ext.measureBuildsVersion = '3.1.0' gradle.ext.koverVersion = '0.7.5' gradle.ext.dependencyAnalysisVersion = '1.28.0'