Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,19 @@ android {
? "src/reactactivitydelegate-0.72/java"
: "src/reactactivitydelegate-pre-0.72/java",

// TODO: Remove this block when we drop support for 0.73
// https://github.com/facebook/react-native/commit/cfa02eec50469059542ccbacbc51643b525ad461
reactNativeVersion >= v(0, 74, 0)
? "src/devserverhelper-0.74/java"
// TODO: Remove this block when we drop support for 0.72
// https://github.com/facebook/react-native/commit/da358d0ec7a492edb804b9cdce70e7516ee518ae
: reactNativeVersion >= v(0, 73, 0)
? "src/devserverhelper-0.73/java"
: "src/devserverhelper-pre-0.73/java",
// TODO: Remove this block when we drop support for 0.74
// https://github.com/facebook/react-native/commit/a1e81185416a53c7c7d0cfc67e40079fd0073e7c
reactNativeVersion >= v(0, 75, 0)
? "src/devserverhelper-0.75/java"
// TODO: Remove this block when we drop support for 0.73
// https://github.com/facebook/react-native/commit/cfa02eec50469059542ccbacbc51643b525ad461
: reactNativeVersion >= v(0, 74, 0)
? "src/devserverhelper-0.74/java"
// TODO: Remove this block when we drop support for 0.72
// https://github.com/facebook/react-native/commit/da358d0ec7a492edb804b9cdce70e7516ee518ae
: reactNativeVersion >= v(0, 73, 0)
? "src/devserverhelper-0.73/java"
: "src/devserverhelper-pre-0.73/java",

// TODO: Remove this block when we drop support for 0.72
// https://github.com/facebook/react-native/commit/c3f672cef7d4f287d3d729d33650f917ed132a0c
Expand Down
14 changes: 14 additions & 0 deletions ...p/src/devserverhelper-0.75/java/com/microsoft/reacttestapp/react/DevServerHelperCompat.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.microsoft.reacttestapp.react

import android.content.Context
import com.facebook.react.devsupport.DevServerHelper
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,
PackagerConnectionSettings(context)
)
}
1 change: 1 addition & 0 deletions test/pack.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ describe("npm pack", () => {
"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-0.74/java/com/microsoft/reacttestapp/react/DevServerHelperCompat.kt",
"android/app/src/devserverhelper-0.75/java/com/microsoft/reacttestapp/react/DevServerHelperCompat.kt",
"android/app/src/devserverhelper-pre-0.73/java/com/microsoft/reacttestapp/react/DevServerHelperCompat.kt",
"android/app/src/main/AndroidManifest.xml",
"android/app/src/main/java/com/microsoft/reacttestapp/MainActivity.kt",
Expand Down