minor detox fixes

.detoxrc.json

@@ -2,17 +2,7 @@
   "testRunner": "jest",
   "runnerConfig": "e2e/config.json",
   "skipLegacyWorkersInjection": true,
-  "apps": {
-    "android": {
-      "type": "android.apk",
-      "binaryPath": "android/app/build/outputs/apk/unsigned/debug/app-unsigned-debug.apk"
-    }
-  },
   "configurations": {
-    "android": {
-      "device": "emulator",
-      "app": "android"
-    },
     "android.emu.debug": {
       "binaryPath": "android/app/build/outputs/apk/unsigned/debug/app-unsigned-debug.apk",
       "build": "cd android && ./gradlew assembleUnsignedDebug assembleAndroidTest -DtestBuildType=debug && cd ..",

android/app/build.gradle

@@ -81,7 +81,7 @@ android {
 
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             // Detox-specific additions to pro-guard
-            // proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
+            proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
 
             firebaseCrashlytics {
                 nativeSymbolUploadEnabled true
@@ -110,6 +110,7 @@ android {
         pickFirst "lib/arm64-v8a/libc++_shared.so"
         pickFirst "lib/x86/libc++_shared.so"
         pickFirst "lib/x86_64/libc++_shared.so"
+        pickFirst "META-INF/MANIFEST.MF"
     }
 }
 
@@ -144,8 +145,12 @@ dependencies {
     implementation 'androidx.work:work-runtime:2.7.1'
     implementation "androidx.media:media:1.6.0"
 
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+
     androidTestImplementation('com.wix:detox:0.1.1') { transitive = true }
-    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation 'junit:junit:4.13.2'
+    androidTestImplementation "androidx.test:core:1.4.0"
+
     implementation "androidx.annotation:annotation:1.4.0"
 }
 

android/app/src/debug/AndroidManifest.xml

@@ -8,6 +8,6 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
         tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false"/>
     </application>
 </manifest>

android/build.gradle

@@ -5,9 +5,10 @@ buildscript {
         buildToolsVersion = '30.0.0'
         minSdkVersion = 21
         compileSdkVersion = 32
-        targetSdkVersion = 31
+        targetSdkVersion = 32
         supportLibVersion = "28.0.0"
         ndkVersion = "20.1.5948944"
+        kotlinVersion = '1.7.10'
     }
     repositories {
         jcenter()
@@ -22,6 +23,8 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.13'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
         classpath 'com.google.firebase:perf-plugin:1.4.1'
+
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
@@ -42,6 +45,10 @@ allprojects {
             // Android JSC is installed from npm
             url("$rootDir/../node_modules/jsc-android/dist")
         }
+        maven {
+            // All of Detox' artifacts are provided via the npm module
+            url "$rootDir/../node_modules/detox/Detox-android"
+        }
 
         google()
         jcenter()

android/gradle.properties

@@ -25,5 +25,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
+android.useNewApkCreator=false
+
 # Version of flipper SDK to use with React Native
 FLIPPER_VERSION=0.162.0