[Dependency Updates] Main Batch - AndroidX Compose/Kotlin (plus Core)

WordPress/build.gradle

@@ -373,10 +373,6 @@ dependencies {
     }
     implementation "org.wordpress:persistentedittext:$wordPressPersistentEditTextVersion"
 
-    // To enable Android Studio specific features for Jetpack Compose.
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$androidxComposeVersion"
-    debugImplementation "androidx.compose.ui:ui-tooling:$androidxComposeVersion"
-    implementation "androidx.compose.ui:ui-tooling-preview:$androidxComposeVersion"
     // To enable Stetho, a debug bridge that enables the Chrome Developer Tools for debug purposes.
     debugImplementation "com.facebook.stetho:stetho:$stethoVersion"
     debugImplementation "com.facebook.stetho:stetho-okhttp3:$stethoVersion"
@@ -405,7 +401,6 @@ dependencies {
     implementation "androidx.work:work-runtime:$androidxWorkManagerVersion"
     implementation "androidx.work:work-runtime-ktx:$androidxWorkManagerVersion"
     implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion"
-    implementation "androidx.constraintlayout:constraintlayout-compose:$androidxConstraintlayoutComposeVersion"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$androidxLifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidxLifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion"
@@ -426,7 +421,6 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:$squareupRetrofitVersion"
     implementation "org.apache.commons:commons-text:$apacheCommonsTextVersion"
     implementation "com.airbnb.android:lottie:$lottieVersion"
-    implementation "com.airbnb.android:lottie-compose:$lottieVersion"
     implementation "com.facebook.shimmer:shimmer:$facebookShimmerVersion"
     implementation ("com.github.yalantis:ucrop:$uCropVersion") {
         exclude group: 'androidx.core', module: 'core'
@@ -436,17 +430,6 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     kapt "com.github.bumptech.glide:compiler:$glideVersion"
     implementation "com.github.bumptech.glide:volley-integration:$glideVolleyVersion"
-    implementation "androidx.compose.runtime:runtime:$androidxComposeVersion"
-    implementation "androidx.compose.runtime:runtime-livedata:$androidxComposeVersion"
-    implementation "androidx.compose.foundation:foundation:$androidxComposeVersion"
-    implementation "androidx.compose.foundation:foundation-layout:$androidxComposeVersion"
-    implementation "androidx.compose.ui:ui:$androidxComposeVersion"
-    implementation "androidx.compose.ui:ui-graphics:$androidxComposeVersion"
-    implementation "androidx.compose.ui:ui-text:$androidxComposeVersion"
-    implementation "androidx.compose.ui:ui-unit:$androidxComposeVersion"
-    implementation "androidx.compose.material:material:$androidxComposeVersion"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$androidxComposeLifecycleVersion"
-    implementation "io.coil-kt:coil-compose:$coilComposeVersion"
     implementation "com.github.indexos.media-for-mobile:domain:$indexosMediaForMobileVersion"
     implementation "com.github.indexos.media-for-mobile:android:$indexosMediaForMobileVersion"
     implementation "com.zendesk:support:$zendeskVersion"
@@ -484,14 +467,24 @@ dependencies {
     androidTestImplementation "com.squareup.okhttp3:mockwebserver:$squareupMockWebServerVersion"
     androidTestImplementation "androidx.test.uiautomator:uiautomator:$androidxTestUiAutomatorVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxTestEspressoVersion", {
+        version {
+            strictly androidxTestEspressoVersion
+        }
         exclude group: 'com.android.support', module: 'support-annotations'
     }
     androidTestImplementation("androidx.test.espresso:espresso-contrib:$androidxTestEspressoVersion") {
+        version {
+            strictly androidxTestEspressoVersion
+        }
         exclude group: 'com.android.support', module: 'appcompat'
         exclude group: 'com.android.support', module: 'support-v4'
         exclude module: 'recyclerview-v7'
     }
-    androidTestImplementation "androidx.test.espresso:espresso-accessibility:$androidxTestEspressoVersion"
+    androidTestImplementation("androidx.test.espresso:espresso-accessibility:$androidxTestEspressoVersion") {
+        version {
+            strictly androidxTestEspressoVersion
+        }
+    }
     androidTestImplementation("com.github.tomakehurst:wiremock:$wiremockVersion") {
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
         exclude group: 'org.apache.commons', module: 'commons-lang3'
@@ -509,10 +502,36 @@ dependencies {
     androidTestImplementation "androidx.work:work-testing:$androidxWorkManagerVersion"
     androidTestImplementation "com.google.dagger:hilt-android-testing:$gradle.ext.daggerVersion"
     kaptAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion"
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$androidxComposeVersion"
     // Enables Java 8+ API desugaring support
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$androidDesugarVersion"
     lintChecks "org.wordpress:lint:$wordPressLintVersion"
+
+    // Jetpack Compose
+    def composeBom = platform("androidx.compose:compose-bom:$androidxComposeBomVersion")
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
+    // - Jetpack Compose - Android Studio
+    debugImplementation "androidx.compose.ui:ui-test-manifest"
+    debugImplementation "androidx.compose.ui:ui-tooling"
+    // - Jetpack Compose - Main
+    implementation "androidx.compose.runtime:runtime"
+    implementation "androidx.compose.runtime:runtime-livedata"
+    implementation "androidx.compose.foundation:foundation"
+    implementation "androidx.compose.foundation:foundation-layout"
+    implementation "androidx.compose.ui:ui"
+    implementation "androidx.compose.ui:ui-graphics"
+    implementation "androidx.compose.ui:ui-text"
+    implementation "androidx.compose.ui:ui-unit"
+    implementation "androidx.compose.ui:ui-tooling-preview"
+    implementation "androidx.compose.material:material"
+    // - Jetpack Compose - AndroidX
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$androidxLifecycleVersion"
+    implementation "androidx.constraintlayout:constraintlayout-compose:$androidxConstraintlayoutComposeVersion"
+    // - Jetpack Compose - Other
+    implementation "io.coil-kt:coil-compose:$coilComposeVersion"
+    implementation "com.airbnb.android:lottie-compose:$lottieVersion"
+    // - Jetpack Compose - UI Tests
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4"
 }
 
 configurations.all {

WordPress/src/androidTest/java/org/wordpress/android/UserAgentTest.java

@@ -25,21 +25,17 @@ public class UserAgentTest {
     public InitializationRule initRule = new InitializationRule();
 
     @Test
-    public void testGetDefaultUserAgent() {
-        String defaultUserAgent = WordPress.getDefaultUserAgent();
-        assertNotNull("Default User-Agent must be set", defaultUserAgent);
-        assertTrue("Default User-Agent must not be an empty string", defaultUserAgent.length() > 0);
-        assertFalse("Default User-Agent must not contain app name", defaultUserAgent.contains(USER_AGENT_APPNAME));
-    }
-
-    @Test
-    public void testGetUserAgent() {
+    public void testGetUserAgentAndGetDefaultUserAgent() {
         String userAgent = WordPress.getUserAgent();
         assertNotNull("User-Agent must be set", userAgent);
         assertTrue("User-Agent must not be an empty string", userAgent.length() > 0);
         assertTrue("User-Agent must contain app name substring", userAgent.contains(USER_AGENT_APPNAME));
 
         String defaultUserAgent = WordPress.getDefaultUserAgent();
+        assertNotNull("Default User-Agent must be set", defaultUserAgent);
+        assertTrue("Default User-Agent must not be an empty string", defaultUserAgent.length() > 0);
+        assertFalse("Default User-Agent must not contain app name", defaultUserAgent.contains(USER_AGENT_APPNAME));
+
         assertTrue("User-Agent must be derived from default User-Agent", userAgent.contains(defaultUserAgent));
     }
 }

WordPress/src/androidTest/java/org/wordpress/android/e2e/LoginTests.kt

@@ -1,7 +1,6 @@
 package org.wordpress.android.e2e
 
 import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.wordpress.android.BuildConfig