status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #160 from realm/al-example 

Update package settings and fix example reload issue
This commit is contained in:
Ari Lazier 2015-11-24 09:26:07 -08:00
parent eb3c973947 dc62cbe52a
commit 2a03d9be94
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/ReactExample/ReactExample.xcodeproj/project.pbxproj
View File

@ -610,7 +610,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "rm -rf ./node_modules/realm\nnpm install realm"; shellScript = "rm -rf ./node_modules/realm\n[ -s \"${HOME}/.nvm/nvm.sh\" ] && . \"${HOME}/.nvm/nvm.sh\"\nnpm install realm";
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */

4
examples/ReactExample/package.json
View File

@ -3,10 +3,10 @@
"version": "0.0.1", "version": "0.0.1",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "node_modules/react-native/packager/packager.sh" "start": "react-native start"
}, },
"dependencies": { "dependencies": {
"react-native": "0.14.2", "react-native": "^0.14.2",
"realm": "file:../../lib" "realm": "file:../../lib"
} }
} }

2
src/object-store/shared_realm.cpp
View File

@ -376,8 +376,6 @@ uint64_t Realm::get_schema_version(const realm::Realm::Config &config)
void Realm::close() void Realm::close()
{ {
invalidate();
if (m_notifier) { if (m_notifier) {
m_notifier->remove_realm(this); m_notifier->remove_realm(this);
} }

2
tests/ReactTests/ios/ReactTests.xcodeproj/project.pbxproj
View File

@ -614,7 +614,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "rm -rf ../node_modules/realm ../node_modules/realm-tests\nnpm install realm realm-tests\ncp ../../../src/object-store/parser/queryTests.json ../node_modules/realm-tests\n"; shellScript = "rm -rf ../node_modules/realm ../node_modules/realm-tests\n[ -s \"${HOME}/.nvm/nvm.sh\" ] && . \"${HOME}/.nvm/nvm.sh\"\nnpm install realm realm-tests\ncp ../../../src/object-store/parser/queryTests.json ../node_modules/realm-tests\n";
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */

4
tests/ReactTests/package.json
View File

@ -3,10 +3,10 @@
"version": "0.0.1", "version": "0.0.1",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "node_modules/react-native/packager/packager.sh" "start": "react-native start"
}, },
"dependencies": { "dependencies": {
"react-native": "0.14.2", "react-native": "^0.14.2",
"realm": "file:../../lib", "realm": "file:../../lib",
"realm-tests": "file:.." "realm-tests": "file:.."
} }