use newest ROS
This commit is contained in:
parent
c78f82ac0c
commit
5db836dc8b
|
@ -2,4 +2,4 @@ PACKAGE_NAME=realm-js
|
||||||
VERSION=1.8.3
|
VERSION=1.8.3
|
||||||
REALM_CORE_VERSION=3.0.0-rc3
|
REALM_CORE_VERSION=3.0.0-rc3
|
||||||
REALM_SYNC_VERSION=2.0.0-rc12
|
REALM_SYNC_VERSION=2.0.0-rc12
|
||||||
REALM_OBJECT_SERVER_VERSION=2.0.0-alpha9
|
REALM_OBJECT_SERVER_VERSION=2.0.0-rc2
|
||||||
|
|
|
@ -44,11 +44,11 @@ LOGCAT_OUT="$SRCROOT/logcat_out.txt"
|
||||||
|
|
||||||
|
|
||||||
download_server() {
|
download_server() {
|
||||||
sh ./scripts/download-object-server.sh
|
./scripts/download-object-server.sh
|
||||||
}
|
}
|
||||||
|
|
||||||
start_server() {
|
start_server() {
|
||||||
sh ./object-server-for-testing/start-object-server.command &
|
./object-server-for-testing/start-object-server.command &
|
||||||
SERVER_PID=$!
|
SERVER_PID=$!
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -347,7 +347,7 @@ case "$TARGET" in
|
||||||
|
|
||||||
pushd "$SRCROOT/tests"
|
pushd "$SRCROOT/tests"
|
||||||
npm install
|
npm install
|
||||||
# eval "$npm_tests_cmd"
|
eval "$npm_tests_cmd"
|
||||||
popd
|
popd
|
||||||
stop_server
|
stop_server
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -44,15 +44,8 @@ PersonObject.prototype.description = function() {
|
||||||
PersonObject.prototype.toString = function() {
|
PersonObject.prototype.toString = function() {
|
||||||
return this.name;
|
return this.name;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Object.setPrototypeOf doesn't work on JSC on Android. The code below achieves the same thing.
|
|
||||||
//Object.setPrototypeOf(PersonObject, Realm.Object);
|
|
||||||
//Object.setPrototypeOf(PersonObject.prototype, Realm.Object.prototype);
|
|
||||||
|
|
||||||
PersonObject.__proto__ = Realm.Object;
|
PersonObject.__proto__ = Realm.Object;
|
||||||
PersonObject.prototype.__proto__ = Realm.Object.prototype;
|
PersonObject.prototype.__proto__ = Realm.Object.prototype;
|
||||||
|
|
||||||
|
|
||||||
exports.PersonObject = PersonObject;
|
exports.PersonObject = PersonObject;
|
||||||
|
|
||||||
exports.PersonList = {
|
exports.PersonList = {
|
||||||
|
|
Loading…
Reference in New Issue