Skip to content

fix(android): patch argument type mismatch in cli prior to 6.0 #732

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 7 commits into from
Jan 31, 2022
Merged

fix(android): patch argument type mismatch in cli prior to 6.0 #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2311720
fix(android): patch `argument type mismatch` in cli prior to 6.0
tido64 Jan 31, 2022
0669a5d
Update test-app.gradle
tido64 Jan 31, 2022
d68fa08
bump Java heap space
tido64 Jan 31, 2022
f206631
handle file not found
tido64 Jan 31, 2022
6401c66
skip Gradle tests on Windows CI
tido64 Jan 31, 2022
e134dfe
Revert "bump Java heap space"
tido64 Jan 31, 2022
88c4bfb
add link to issue
tido64 Jan 31, 2022
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
19 changes: 17 additions & 2 deletions test-app.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<HashMap<String, String>>[] packages = this.reactNativeModules",
"ArrayList<HashMap<String, String>> 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)
Expand Down
5 changes: 5 additions & 0 deletions test/android-test-app/test-app-util.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down