diff --git a/package.json b/package.json index 69bb75bf..69634f05 100644 --- a/package.json +++ b/package.json @@ -69,11 +69,11 @@ "alias:win:apply" : "git apply-win-symlink-aliases", "postalias:win:apply" : "git config --unset alias.apply-win-symlink-aliases", "alias:win:revert" : "git config alias.rm-symlink \"\" && git config alias.rm-symlinks \"\" && git config alias.checkout-symlinks \"\"", - "win-fix-symlinks" : "npm run isWin -s && npm run alias:win:apply || echo . ", - "win-revert-symlinks" : "npm run isWin -s && npm run alias:win:revert || echo .", - "prereact-tests-android": "npm run isWin -s && npm run win-fix-symlinks && git checkout-symlinks && git rm-symlinks || echo . ", + "win-fix-symlinks" : "npm run isWin -s && npm run alias:win:apply && git checkout-symlinks && git rm-symlinks || echo . ", + "win-revert-symlinks" : "npm run isWin -s && npm run alias:win:apply && git checkout-symlinks && npm run alias:win:revert || echo .", + "prereact-tests-android": "npm run isWin -s && npm run win-fix-symlinks || echo . ", "react-tests-android": "node scripts/react-tests-android.js || npm run postreact-tests-android", - "postreact-tests-android": "git checkout-symlinks || echo . && npm run win-revert-symlinks" + "postreact-tests-android": "npm run win-revert-symlinks" }, "dependencies": { "extract-zip": "^1.6.0", diff --git a/scripts/prepublish.js b/scripts/prepublish.js index 0c32e663..0a534c19 100644 --- a/scripts/prepublish.js +++ b/scripts/prepublish.js @@ -30,7 +30,7 @@ if ('REALM_BUILD_ANDROID' in process.env) { const gradlew = process.platform === 'win32' ? 'gradlew.bat' : 'gradlew'; const androidPath = path.resolve(__dirname, '../react-native/android'); - exec(`${androidPath}/${gradlew}`, ['publishAndroid', '-PbuildWithSync=true'], { cwd: androidPath, stdio: 'inherit' }); + exec(`${androidPath}/${gradlew}`, ['publishAndroid'], { cwd: androidPath, stdio: 'inherit' }); } function ini(string) { diff --git a/scripts/react-tests-android.js b/scripts/react-tests-android.js index 549aa0d5..3edf421b 100644 --- a/scripts/react-tests-android.js +++ b/scripts/react-tests-android.js @@ -14,7 +14,8 @@ if (shell.env["REALM_BUILD_ANDROID"]) { shell.echo("Realm is already installed"); } else { shell.env["REALM_BUILD_ANDROID"] = 1; - shell.exec("npm install realm realm-tests"); + shell.exec("npm install realm"); + shell.exec("npm install realm-tests"); } shell.cp("../../src/object-store/tests/query.json", "node_modules/realm-tests/query-tests.json");