Merge pull request #6824 from woocommerce/upgrade-gradle-to-7.4.2-agp…

…-to-7.2.1

Update Gradle to 7.4.2 & AGP to 7.2.1

WooCommerce/build.gradle

@@ -204,7 +204,9 @@ dependencies {
         exclude group: "com.android.support"
     }
 
-    implementation "com.automattic.tracks:experimentation:trunk-f25f5b5e77df8313f19d47d07e7411256d18df79"
+    implementation("com.automattic.tracks:experimentation:trunk-f25f5b5e77df8313f19d47d07e7411256d18df79") {
+        exclude group: "org.wordpress", module: "fluxc"
+    }
     implementation 'com.automattic:Automattic-Tracks-Android:2.2.0'
 
     implementation("${gradle.ext.fluxCBinaryPath}:$fluxCVersion") {

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/coupons/details/CouponDetailsViewModelTest.kt

@@ -54,7 +54,7 @@ class CouponDetailsViewModelTest : BaseUnitTest() {
             Result.success(Unit)
     }
     private val wooCommerceStore: WooCommerceStore = mock {
-        on { getSiteSettings(any()) } doReturn WCSettingsModel(0, "USD", LEFT, "", "", 2)
+        on { getSiteSettings(any()) } doReturn WCSettingsModel(0, "USD", LEFT, "", "", 2, couponsEnabled = false)
     }
     private val currencyFormatter: CurrencyFormatter = mock {
         on { formatCurrency(any<BigDecimal>(), any(), any()) } doAnswer { it.arguments[0].toString() }

WooCommerce/src/test/kotlin/com/woocommerce/android/util/DefaultCurrencyFormatterTest.kt

@@ -83,7 +83,8 @@ class DefaultCurrencyFormatterTest : BaseUnitTest() {
             currencyPosition = WCSettingsModel.CurrencyPosition.RIGHT_SPACE,
             currencyThousandSeparator = ",",
             currencyDecimalSeparator = ".",
-            currencyDecimalNumber = 2
+            currencyDecimalNumber = 2,
+            couponsEnabled = false
         )
         val secondSettings = firstSettings.copy(currencyCode = "USD")
         whenever(selectedSite.observe()).thenReturn(sitesFlow)
@@ -108,7 +109,8 @@ class DefaultCurrencyFormatterTest : BaseUnitTest() {
             currencyPosition = WCSettingsModel.CurrencyPosition.RIGHT_SPACE,
             currencyThousandSeparator = ",",
             currencyDecimalSeparator = ".",
-            currencyDecimalNumber = 2
+            currencyDecimalNumber = 2,
+            couponsEnabled = false
         )
         whenever(selectedSite.observe()).thenReturn(sitesFlow)
         // First time return an error

build.gradle

@@ -82,7 +82,7 @@ tasks.register("installGitHooks", Copy) {
 }
 
 ext {
-    fluxCVersion = '1.45.1'
+    fluxCVersion = 'trunk-f44a381615f6d850e9c95071469424fbde6daff8'
     glideVersion = '4.13.2'
     coilVersion = '2.1.0'
     constraintLayoutVersion = '1.2.0'
@@ -98,10 +98,10 @@ ext {
     appCompatVersion = '1.4.1'
     materialVersion = '1.6.1'
     hiltJetpackVersion = '1.0.0'
-    wordPressUtilsVersion = "2.3.0"
-    mediapickerVersion = 'trunk-d0db2634cf27511bec3ef9b837f9cfe27c5ab601'
-    wordPressLoginVersion = '0.13.0'
-    aboutAutomatticVersion = '0.0.4'
+    wordPressUtilsVersion = '2.6.0'
+    mediapickerVersion = '0.1.0'
+    wordPressLoginVersion = '0.15.0'
+    aboutAutomatticVersion = '0.0.6'
 
     // Compose and its module versions need to be consistent with each other (for example 'compose-theme-adapter')
     composeVersion = "1.1.1"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,6 +1,6 @@
 pluginManagement {
-    gradle.ext.agpVersion = '7.1.1'
-    gradle.ext.daggerVersion = '2.40.5'
+    gradle.ext.agpVersion = '7.2.1'
+    gradle.ext.daggerVersion = '2.42'
     gradle.ext.detektVersion = '1.19.0'
     gradle.ext.kotlinVersion = '1.6.10'
     gradle.ext.navigationVersion = '2.4.1'