Cleanup some of the dependencies inside ReactAndroid (facebook#34191)

Summary:
This cleans up a bit our dependency list inside `ReactAndroid`. I've re-sorted the lists, and exported everything I could in the `gradle.properties`.

I wish we could move to the Gradle Version Catalog for Android, but that's not possible at the moment (it will make impossible for users to build from source).

## Changelog

[Internal] - Cleanup some of the dependencies inside ReactAndroid

Pull Request resolved: facebook#34191

Test Plan: Will rely on a Green CircleCI

Reviewed By: huntie

Differential Revision: D37828614

Pulled By: cortinico

fbshipit-source-id: f433d08d691db4145e0c72ca4dab2f0350e4101f

Author: cortinico

ReactAndroid/build.gradle

@@ -372,35 +372,38 @@ android {
 }
 
 dependencies {
-    api("com.facebook.infer.annotation:infer-annotation:0.18.0")
-    api("com.facebook.yoga:proguard-annotations:1.19.0")
-    api("javax.inject:javax.inject:1")
-    api("androidx.appcompat:appcompat:${APPCOMPAT_VERSION}")
-    api("androidx.appcompat:appcompat-resources:${APPCOMPAT_VERSION}")
-    api("androidx.autofill:autofill:1.1.0")
-    api("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
+    api("androidx.appcompat:appcompat-resources:${ANDROIDX_APPCOMPAT_VERSION}")
+    api("androidx.appcompat:appcompat:${ANDROIDX_APPCOMPAT_VERSION}")
+    api("androidx.autofill:autofill:${ANDROIDX_AUTOFILL_VERSION}")
+    api("androidx.swiperefreshlayout:swiperefreshlayout:${SWIPEREFRESH_LAYOUT_VERSION}")
+
+    api("com.facebook.fbjni:fbjni-java-only:${FBJNI_VERSION}")
     api("com.facebook.fresco:fresco:${FRESCO_VERSION}")
     api("com.facebook.fresco:imagepipeline-okhttp3:${FRESCO_VERSION}")
     api("com.facebook.fresco:ui-common:${FRESCO_VERSION}")
+    api("com.facebook.infer.annotation:infer-annotation:${INFER_ANNOTATIONS_VERSION}")
     api("com.facebook.soloader:soloader:${SO_LOADER_VERSION}")
-    api("com.google.code.findbugs:jsr305:3.0.2")
-    api("com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}")
+    api("com.facebook.yoga:proguard-annotations:${PROGUARD_ANNOTATIONS_VERSION}")
+
+    api("com.google.code.findbugs:jsr305:${JSR305_VERSION}")
     api("com.squareup.okhttp3:okhttp-urlconnection:${OKHTTP_VERSION}")
-    api("com.squareup.okio:okio:2.9.0")
-    api("com.facebook.fbjni:fbjni-java-only:0.2.2")
-    extractHeaders("com.facebook.fbjni:fbjni:0.2.2:headers")
-    extractJNI("com.facebook.fbjni:fbjni:0.2.2")
+    api("com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}")
+    api("com.squareup.okio:okio:${OKIO_VERSION}")
+    api("javax.inject:javax.inject:${JAVAX_INJECT_VERSION}")
+
+    extractHeaders("com.facebook.fbjni:fbjni:${FBJNI_VERSION}:headers")
+    extractJNI("com.facebook.fbjni:fbjni:${FBJNI_VERSION}")
 
     // It's up to the consumer to decide if hermes should be included or not.
     // Therefore hermes-engine is a compileOnly dependency.
     compileOnly(project(":ReactAndroid:hermes-engine"))
 
     testImplementation("junit:junit:${JUNIT_VERSION}")
+    testImplementation("org.assertj:assertj-core:${ASSERTJ_VERSION}")
+    testImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}")
     testImplementation("org.powermock:powermock-api-mockito2:${POWERMOCK_VERSION}")
-    testImplementation("org.powermock:powermock-module-junit4-rule:${POWERMOCK_VERSION}")
     testImplementation("org.powermock:powermock-classloading-xstream:${POWERMOCK_VERSION}")
-    testImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}")
-    testImplementation("org.assertj:assertj-core:3.21.0")
+    testImplementation("org.powermock:powermock-module-junit4-rule:${POWERMOCK_VERSION}")
     testImplementation("org.robolectric:robolectric:${ROBOLECTRIC_VERSION}")
 
     androidTestImplementation(fileTree(dir: "src/main/third-party/java/buck-android-support/", include: ["*.jar"]))

ReactAndroid/gradle.properties

@@ -5,23 +5,33 @@ POM_NAME=ReactNative
 POM_ARTIFACT_ID=react-native
 POM_PACKAGING=aar
 
-MOCKITO_CORE_VERSION=2.26.0
-POWERMOCK_VERSION=2.0.2
-ROBOLECTRIC_VERSION=4.4
-JUNIT_VERSION=4.12
-
+# JVM Versions
+ASSERTJ_VERSION=3.21.0
 ANDROIDX_TEST_VERSION=1.1.0
-APPCOMPAT_VERSION=1.4.1
+ANDROIDX_APPCOMPAT_VERSION=1.4.1
+ANDROIDX_AUTOFILL_VERSION=1.1.0
+FBJNI_VERSION=0.2.2
 FRESCO_VERSION=2.5.0
+INFER_ANNOTATIONS_VERSION=0.18.0
+JAVAX_INJECT_VERSION=1
+JSR305_VERSION=3.0.2
+JUNIT_VERSION=4.12
+MOCKITO_CORE_VERSION=2.26.0
+OKIO_VERSION=2.9.0
 OKHTTP_VERSION=4.9.2
+POWERMOCK_VERSION=2.0.2
+PROGUARD_ANNOTATIONS_VERSION=1.19.0
+ROBOLECTRIC_VERSION=4.4
 SO_LOADER_VERSION=0.10.3
+SWIPEREFRESH_LAYOUT_VERSION=1.0.0
 
+# Native Dependency Versions
 BOOST_VERSION=1_76_0
 DOUBLE_CONVERSION_VERSION=1.1.6
-FOLLY_VERSION=2021.07.22.00
 FMT_VERSION=6.2.1
-LIBEVENT_VERSION=2.1.12
+FOLLY_VERSION=2021.07.22.00
 GLOG_VERSION=0.3.5
+LIBEVENT_VERSION=2.1.12
 
 android.useAndroidX=true
 android.enableJetifier=true