Skip to content

Commit

Permalink
Merge branch 'trunk' into dependabot/gradle/kotlinxCoroutinesVersion-…
Browse files Browse the repository at this point in the history
…1.8.1
  • Loading branch information
nbradbury authored Jul 10, 2024
2 parents e76fea2 + 6b4b7dc commit 63026a8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
15 changes: 11 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down

0 comments on commit 63026a8

Please sign in to comment.