Merge branch 'trunk' into dependabot/gradle/com.gradle.develocity-3.18.1

WordPress/src/test/java/org/wordpress/android/ui/blaze/blazecampaigns/campaignlisting/CampaignListingUIModelMapperTest.kt

@@ -4,9 +4,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever
 import org.wordpress.android.BaseUnitTest
@@ -17,7 +15,6 @@ import org.wordpress.android.ui.stats.refresh.utils.StatsUtils
 import org.wordpress.android.ui.utils.UiString
 
 @ExperimentalCoroutinesApi
-@RunWith(MockitoJUnitRunner::class)
 class CampaignListingUIModelMapperTest : BaseUnitTest() {
     @Mock
     lateinit var statsUtils: StatsUtils
@@ -41,6 +38,7 @@ class CampaignListingUIModelMapperTest : BaseUnitTest() {
         targetUrn = null,
         totalBudget = 1.0,
         spentBudget = 0.0,
+        isEndlessCampaign = false,
     )
 
     @Test
@@ -71,6 +69,7 @@ class CampaignListingUIModelMapperTest : BaseUnitTest() {
         targetUrn = null,
         totalBudget = 0.0,
         spentBudget = 0.0,
+        isEndlessCampaign = false,
     )
 
     @Test

WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/blaze/BlazeCardBuilderTest.kt

@@ -35,6 +35,7 @@ val campaign = BlazeCampaignModel(
     targetUrn = null,
     totalBudget = 0.0,
     spentBudget = 0.0,
+    isEndlessCampaign = false,
 )
 
 val onCreateCampaignClick = { }

build.gradle

@@ -28,7 +28,7 @@ ext {
     automatticTracksVersion = '5.1.0'
     gutenbergMobileVersion = 'v1.121.0'
     wordPressAztecVersion = 'v2.1.4'
-    wordPressFluxCVersion = 'trunk-94d25d35fb4bf58a2e90741a6a5d56b8c6c3ce42'
+    wordPressFluxCVersion = 'trunk-a77c116b8bd00247c8c0551b4497629ff84ca023'
     wordPressLoginVersion = '1.16.0'
     wordPressPersistentEditTextVersion = '1.0.2'
     wordPressRsVersion = 'trunk-50f703a7f677084157d02f05d4d477d7eaf960b1'
@@ -67,7 +67,7 @@ ext {
     chrisbanesPhotoviewVersion = '2.3.0'
     eventBusVersion = '3.3.1'
     facebookShimmerVersion = '0.5.0'
-    firebaseBomVersion = '33.2.0'
+    firebaseBomVersion = '33.3.0'
     firebaseIidVersion = '21.1.0'
     glideVersion = '4.16.0'
     googleAutoServiceVersion = '1.0.1'
@@ -259,4 +259,3 @@ dependencies {
 }
 
 apply from: './config/gradle/code_coverage.gradle'
-apply from: './config/gradle/gradle_build_scan.gradle'

config/gradle/gradle_build_scan.gradle

@@ -1,11 +1,19 @@
 
 // Only run build scan on CI builds.
 if (System.getenv('CI')) {
-    buildScan {
-        termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-        termsOfServiceAgree = 'yes'
-        tag 'CI'
-        publishAlways()
-        uploadInBackground = false
+    develocity {
+        buildScan {
+            termsOfUseUrl = 'https://gradle.com/terms-of-service'
+            termsOfUseAgree = 'yes'
+            tag 'CI'
+            publishing.onlyIf { true }
+            uploadInBackground = false
+        }
+    }
+} else {
+    develocity {
+        buildScan {
+            publishing.onlyIf { false }
+        }
     }
 }

fastlane/Fastfile

@@ -162,7 +162,6 @@ import 'lanes/localization.rb'
 import 'lanes/release.rb'
 import 'lanes/screenshots.rb'
 import 'lanes/test.rb'
-import 'lanes/release_management_in_ci.rb'
 
 default_platform(:android)
 

settings.gradle

@@ -65,3 +65,4 @@ include ':libs:mocks'
 
 apply from: './config/gradle/included_builds.gradle'
 apply from: './config/gradle/gradle_build_cache.gradle'
+apply from: './config/gradle/gradle_build_scan.gradle'