diff --git a/RealmJS.xcodeproj/project.pbxproj b/RealmJS.xcodeproj/project.pbxproj index d9212a66..78022124 100644 --- a/RealmJS.xcodeproj/project.pbxproj +++ b/RealmJS.xcodeproj/project.pbxproj @@ -33,7 +33,7 @@ 02786E331BF1065100937061 /* parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02786E311BF1065000937061 /* parser.cpp */; }; 02786E341BF1065100937061 /* parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 02786E321BF1065000937061 /* parser.hpp */; }; 029048111C0428DF00ABDED4 /* js_init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 029048011C0428DF00ABDED4 /* js_init.cpp */; }; - 029048121C0428DF00ABDED4 /* js_init.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 029048021C0428DF00ABDED4 /* js_init.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; + 029048121C0428DF00ABDED4 /* js_init.h in Headers */ = {isa = PBXBuildFile; fileRef = 029048021C0428DF00ABDED4 /* js_init.h */; settings = {ATTRIBUTES = (Public, ); }; }; 029048131C0428DF00ABDED4 /* js_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 029048031C0428DF00ABDED4 /* js_list.cpp */; }; 029048141C0428DF00ABDED4 /* js_list.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 029048041C0428DF00ABDED4 /* js_list.hpp */; }; 029048151C0428DF00ABDED4 /* js_object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 029048051C0428DF00ABDED4 /* js_object.cpp */; }; @@ -213,7 +213,7 @@ 02786E311BF1065000937061 /* parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = parser.cpp; path = "src/object-store/parser/parser.cpp"; sourceTree = ""; }; 02786E321BF1065000937061 /* parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = parser.hpp; path = "src/object-store/parser/parser.hpp"; sourceTree = ""; }; 029048011C0428DF00ABDED4 /* js_init.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = js_init.cpp; path = src/js_init.cpp; sourceTree = ""; }; - 029048021C0428DF00ABDED4 /* js_init.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = js_init.hpp; path = src/js_init.hpp; sourceTree = ""; }; + 029048021C0428DF00ABDED4 /* js_init.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = js_init.h; path = src/js_init.h; sourceTree = ""; }; 029048031C0428DF00ABDED4 /* js_list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = js_list.cpp; path = src/js_list.cpp; sourceTree = ""; }; 029048041C0428DF00ABDED4 /* js_list.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = js_list.hpp; path = src/js_list.hpp; sourceTree = ""; }; 029048051C0428DF00ABDED4 /* js_object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = js_object.cpp; path = src/js_object.cpp; sourceTree = ""; }; @@ -319,7 +319,7 @@ children = ( 0290483A1C042EE200ABDED4 /* RealmJS.h */, 029048011C0428DF00ABDED4 /* js_init.cpp */, - 029048021C0428DF00ABDED4 /* js_init.hpp */, + 029048021C0428DF00ABDED4 /* js_init.h */, 029048031C0428DF00ABDED4 /* js_list.cpp */, 029048041C0428DF00ABDED4 /* js_list.hpp */, 029048051C0428DF00ABDED4 /* js_object.cpp */, @@ -453,7 +453,7 @@ buildActionMask = 2147483647; files = ( 0290483B1C042EE200ABDED4 /* RealmJS.h in Headers */, - 029048121C0428DF00ABDED4 /* js_init.hpp in Headers */, + 029048121C0428DF00ABDED4 /* js_init.h in Headers */, 029048201C0428DF00ABDED4 /* rpc.hpp in Headers */, 0294465F1BF27DE6006D1617 /* query_builder.hpp in Headers */, 0290481E1C0428DF00ABDED4 /* js_util.hpp in Headers */, diff --git a/react-native/RealmReact.mm b/react-native/RealmReact.mm index 380cc64c..d1d1dada 100644 --- a/react-native/RealmReact.mm +++ b/react-native/RealmReact.mm @@ -6,7 +6,7 @@ extern "C" { #import "RealmReact.h" #import "Base/RCTBridge.h" -#import +#import #import #import diff --git a/src/ios/RealmJS.h b/src/ios/RealmJS.h index d657225e..374b6091 100644 --- a/src/ios/RealmJS.h +++ b/src/ios/RealmJS.h @@ -5,6 +5,6 @@ #ifndef REALM_JS_H #define REALM_JS_H -#include +#include #endif /* REALM_JS_H */ diff --git a/src/js_init.cpp b/src/js_init.cpp index 1849405e..9dbb67ee 100644 --- a/src/js_init.cpp +++ b/src/js_init.cpp @@ -2,7 +2,7 @@ * Proprietary and Confidential */ -#import "js_init.hpp" +#import "js_init.h" #import "js_realm.hpp" #import "js_object.hpp" #import "js_util.hpp" diff --git a/src/js_init.hpp b/src/js_init.h similarity index 100% rename from src/js_init.hpp rename to src/js_init.h diff --git a/src/rpc.cpp b/src/rpc.cpp index 217f7a4b..962eb94d 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -7,7 +7,7 @@ #include #include #include -#include "js_init.hpp" +#include "js_init.h" #include "js_object.hpp" #include "js_results.hpp" #include "js_list.hpp" diff --git a/tests/ios/GrammarTests.mm b/tests/ios/GrammarTests.mm index d2c63789..ca69c09d 100644 --- a/tests/ios/GrammarTests.mm +++ b/tests/ios/GrammarTests.mm @@ -3,7 +3,7 @@ */ #import -#import +#import #import "parser.hpp" @interface GrammerTests : XCTestCase diff --git a/tests/react-test-app/package.json b/tests/react-test-app/package.json index abd401ee..e12a3e48 100644 --- a/tests/react-test-app/package.json +++ b/tests/react-test-app/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "react-native": "^0.14.2", - "realm": "file:../../src/lib-rpc", + "realm": "file:../../lib", "realm-tests": "file:../lib" } }