fix(android): handle DevServerHelper constructor signature change (#…

…1423)
microsoft · May 15, 2023 · 735a5db · 735a5db
1 parent 53ab08d
commit 735a5db
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 42 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -303,45 +303,37 @@ android {
     }
 
     sourceSets {
-        if (project.ext.react.enableCamera) {
-            main.java.srcDirs += "src/camera/java"
-        } else {
-            main.java.srcDirs += "src/no-camera/java"
-        }
+        main.java.srcDirs += [
+            project.ext.react.enableCamera ? "src/camera/java" : "src/no-camera/java",
+
+            // TODO: Remove this block when we drop support for 0.67
+            project.ext.react.enableFabric ? "src/fabric/java" : "src/no-fabric/java",
+
+            // TODO: Remove this block when we drop support for 0.65
+            enableNewArchitecture ? "src/turbomodule/java" : "src/no-turbomodule/java",
+
+            // TODO: Remove this block when we drop support for 0.67
+            // https://github.com/facebook/react-native/commit/ce74aa4ed335d4c36ce722d47937b582045e05c4
+            reactNativeVersion > 0 && reactNativeVersion < 6800
+                ? "src/reactinstanceeventlistener-pre-0.68/java"
+                : "src/reactinstanceeventlistener-0.68/java",
+
+            // TODO: Remove this block when we drop support for 0.72
+            // https://github.com/facebook/react-native/commit/e5dd9cdc6688e63e75a7e0bebf380be1a9a5fe2b
+            reactNativeVersion > 0 && reactNativeVersion < 7200
+                ? "src/reactactivitydelegate-pre-0.72/java"
+                : "src/reactactivitydelegate-0.72/java",
+
+            // TODO: Remove this block when we drop support for 0.73
+            // https://github.com/facebook/react-native/commit/da358d0ec7a492edb804b9cdce70e7516ee518ae
+            reactNativeVersion > 0 && reactNativeVersion < 7300
+                ? "src/devserverhelper-pre-0.73/java"
+                : "src/devserverhelper-0.73/java",
+        ]
 
         if (project.ext.react.enableFlipper) {
             debug.java.srcDirs += "src/flipper/java"
         }
-
-        // TODO: Remove this block when we drop support for 0.67
-        if (project.ext.react.enableFabric) {
-            main.java.srcDirs += "src/fabric/java"
-        } else {
-            main.java.srcDirs += "src/no-fabric/java"
-        }
-
-        // TODO: Remove this block when we drop support for 0.65
-        if (enableNewArchitecture) {
-            main.java.srcDirs += "src/turbomodule/java"
-        } else {
-            main.java.srcDirs += "src/no-turbomodule/java"
-        }
-
-        // TODO: Remove this block when we drop support for 0.67
-        // https://github.com/facebook/react-native/commit/ce74aa4ed335d4c36ce722d47937b582045e05c4
-        if (reactNativeVersion > 0 && reactNativeVersion < 6800) {
-            main.java.srcDirs += "src/reactinstanceeventlistener-pre-0.68/java"
-        } else {
-            main.java.srcDirs += "src/reactinstanceeventlistener-0.68/java"
-        }
-
-        // TODO: Remove this block when we drop support for 0.72
-        // https://github.com/facebook/react-native/commit/e5dd9cdc6688e63e75a7e0bebf380be1a9a5fe2b
-        if (reactNativeVersion > 0 && reactNativeVersion < 7200) {
-            main.java.srcDirs += "src/reactactivitydelegate-pre-0.72/java"
-        } else {
-            main.java.srcDirs += "src/reactactivitydelegate-0.72/java"
-        }
     }
 
     splits {

diff --git a/...p/src/devserverhelper-0.73/java/com/microsoft/reacttestapp/react/DevServerHelperCompat.kt b/...p/src/devserverhelper-0.73/java/com/microsoft/reacttestapp/react/DevServerHelperCompat.kt
@@ -0,0 +1,16 @@
+package com.microsoft.reacttestapp.react
+
+import android.content.Context
+import com.facebook.react.devsupport.DevServerHelper
+import com.facebook.react.devsupport.InspectorPackagerConnection.BundleStatus
+import com.facebook.react.modules.debug.interfaces.DeveloperSettings
+import com.facebook.react.packagerconnection.PackagerConnectionSettings
+
+fun createDevServerHelper(context: Context, developerSettings: DeveloperSettings): DevServerHelper {
+    return DevServerHelper(
+        developerSettings,
+        context.packageName,
+        { BundleStatus() },
+        PackagerConnectionSettings(context)
+    )
+}
diff --git a/...c/devserverhelper-pre-0.73/java/com/microsoft/reacttestapp/react/DevServerHelperCompat.kt b/...c/devserverhelper-pre-0.73/java/com/microsoft/reacttestapp/react/DevServerHelperCompat.kt
@@ -0,0 +1,18 @@
+package com.microsoft.reacttestapp.react
+
+import android.content.Context
+import com.facebook.react.devsupport.DevInternalSettings
+import com.facebook.react.devsupport.DevServerHelper
+import com.facebook.react.devsupport.InspectorPackagerConnection.BundleStatus
+import com.facebook.react.modules.debug.interfaces.DeveloperSettings
+
+fun createDevServerHelper(
+    context: Context,
+    @Suppress("UNUSED_PARAMETER") developerSettings: DeveloperSettings
+): DevServerHelper {
+    return DevServerHelper(
+        DevInternalSettings(context) {},
+        context.packageName,
+        { BundleStatus() }
+    )
+}
diff --git a/android/app/src/main/java/com/microsoft/reacttestapp/react/TestAppReactNativeHost.kt b/android/app/src/main/java/com/microsoft/reacttestapp/react/TestAppReactNativeHost.kt
@@ -12,9 +12,6 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.JSIModulePackage
 import com.facebook.react.bridge.JavaScriptExecutorFactory
 import com.facebook.react.bridge.ReactContext
-import com.facebook.react.devsupport.DevInternalSettings
-import com.facebook.react.devsupport.DevServerHelper
-import com.facebook.react.devsupport.InspectorPackagerConnection.BundleStatus
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.facebook.react.modules.systeminfo.ReactNativeVersion
 import com.facebook.react.packagerconnection.PackagerConnectionSettings
@@ -212,13 +209,12 @@ class TestAppReactNativeHost(
         val latch = CountDownLatch(1)
         var packagerIsRunning = false
 
-        DevServerHelper(
-            DevInternalSettings(context) {},
-            context.packageName
-        ) { BundleStatus() }.isPackagerRunning {
+        val devSettings = reactInstanceManager.devSupportManager.devSettings
+        createDevServerHelper(context, devSettings).isPackagerRunning {
             packagerIsRunning = it
             latch.countDown()
         }
+
         latch.await()
         return packagerIsRunning
     }

diff --git a/test/pack.test.js b/test/pack.test.js
@@ -31,6 +31,8 @@ describe("npm pack", () => {
       "android/app/lint.xml",
       "android/app/src/camera/java/com/microsoft/reacttestapp/camera/MainActivityExtensions.kt",
       "android/app/src/camera/java/com/microsoft/reacttestapp/camera/QRCodeScannerFragment.kt",
+      "android/app/src/devserverhelper-0.73/java/com/microsoft/reacttestapp/react/DevServerHelperCompat.kt",
+      "android/app/src/devserverhelper-pre-0.73/java/com/microsoft/reacttestapp/react/DevServerHelperCompat.kt",
       "android/app/src/fabric/java/com/microsoft/reacttestapp/fabric/FabricJSIModulePackage.kt",
       "android/app/src/flipper/java/com/microsoft/reacttestapp/ReactNativeFlipper.kt",
       "android/app/src/main/AndroidManifest.xml",