diff --git a/test-app.gradle b/test-app.gradle index 27ecfd648..ae63f70ed 100644 --- a/test-app.gradle +++ b/test-app.gradle @@ -33,11 +33,26 @@ private static void applySettings(Settings settings) { .projectDir = new File("${projectDir}/android/support") } +// TODO: Remove when `@react-native-community/cli` 6.0+ is required. See also +// https://github.com/react-native-community/cli/commit/fa0d09b2c9be144bbdff526bb14f171d7ddca88e +private static void patchArgumentTypeMismatchError(String cliAndroidDir) { + def script = new File("${cliAndroidDir}/native_modules.gradle") + if (script.exists()) { + def content = script.text + def patched = content.replace( + "ArrayList>[] packages = this.reactNativeModules", + "ArrayList> packages = this.reactNativeModules", + ) + script.write(patched) + } +} + def scriptDir = buildscript.sourceFile.getParent() -apply from: "${scriptDir}/android/test-app-util.gradle" +apply(from: "${scriptDir}/android/test-app-util.gradle") def cliAndroidDir = findNodeModulesPath(rootDir, "@react-native-community/cli-platform-android") -apply from: "${cliAndroidDir}/native_modules.gradle" +patchArgumentTypeMismatchError(cliAndroidDir) +apply(from: "${cliAndroidDir}/native_modules.gradle") ext.applyTestAppSettings = { DefaultSettings defaultSettings -> applySettings(defaultSettings) diff --git a/test/android-test-app/test-app-util.test.js b/test/android-test-app/test-app-util.test.js index fa9847200..36a43507b 100644 --- a/test/android-test-app/test-app-util.test.js +++ b/test/android-test-app/test-app-util.test.js @@ -47,6 +47,11 @@ describe("test-app-util", () => { removeProject(defaultTestProject); }); + // TODO: Figure out why Windows CI keeps running out of Java heap space. + // https://github.com/microsoft/react-native-test-app/issues/738 + const test = + process.env["CI"] && require("os").platform() === "win32" ? it.skip : it; + test("getAppName() returns `name` if `displayName` is omitted", async () => { const { status, stdout } = await runGradle({ "app.json": JSON.stringify({