From c493a8070bd71299f1fcbb2ca4a0c6af48d0be51 Mon Sep 17 00:00:00 2001 From: Ari Lazier Date: Fri, 29 Apr 2016 12:00:40 -0700 Subject: [PATCH] add workspace and clean up xcproject layout --- Realm.xcworkspace/contents.xcworkspacedata | 16 ++ .../xcshareddata/Realm.xcscmblueprint | 30 +++ .../ios/RealmReact.xcodeproj/project.pbxproj | 40 ++-- src/ios/RealmJS.xcodeproj/project.pbxproj | 203 +----------------- .../xcschemes/GCDWebServers.xcscheme | 80 ------- .../xcschemes/RealmJS static.xcscheme | 80 ------- .../xcshareddata/xcschemes/RealmJS.xcscheme | 113 ---------- 7 files changed, 76 insertions(+), 486 deletions(-) create mode 100644 Realm.xcworkspace/contents.xcworkspacedata create mode 100644 Realm.xcworkspace/xcshareddata/Realm.xcscmblueprint delete mode 100644 src/ios/RealmJS.xcodeproj/xcshareddata/xcschemes/GCDWebServers.xcscheme delete mode 100644 src/ios/RealmJS.xcodeproj/xcshareddata/xcschemes/RealmJS static.xcscheme delete mode 100644 src/ios/RealmJS.xcodeproj/xcshareddata/xcschemes/RealmJS.xcscheme diff --git a/Realm.xcworkspace/contents.xcworkspacedata b/Realm.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..24dd9431 --- /dev/null +++ b/Realm.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/Realm.xcworkspace/xcshareddata/Realm.xcscmblueprint b/Realm.xcworkspace/xcshareddata/Realm.xcscmblueprint new file mode 100644 index 00000000..3a7fb82e --- /dev/null +++ b/Realm.xcworkspace/xcshareddata/Realm.xcscmblueprint @@ -0,0 +1,30 @@ +{ + "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "40F53A12E4AE40C654358321B91166ABD3E910A6", + "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { + + }, + "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { + "40F53A12E4AE40C654358321B91166ABD3E910A6" : 0, + "F6F96CA34C5878B0A9123C7C37855491A5E599DA" : 0 + }, + "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "5EE721F9-041C-4877-9E73-A925C9DB080A", + "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { + "40F53A12E4AE40C654358321B91166ABD3E910A6" : "realm-js\/", + "F6F96CA34C5878B0A9123C7C37855491A5E599DA" : "realm-js\/vendor\/GCDWebServer\/" + }, + "DVTSourceControlWorkspaceBlueprintNameKey" : "Realm", + "DVTSourceControlWorkspaceBlueprintVersion" : 204, + "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Realm.xcworkspace", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/realm\/realm-js.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "40F53A12E4AE40C654358321B91166ABD3E910A6" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/swisspol\/GCDWebServer.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "F6F96CA34C5878B0A9123C7C37855491A5E599DA" + } + ] +} \ No newline at end of file diff --git a/react-native/ios/RealmReact.xcodeproj/project.pbxproj b/react-native/ios/RealmReact.xcodeproj/project.pbxproj index e70975cf..87e9f76b 100644 --- a/react-native/ios/RealmReact.xcodeproj/project.pbxproj +++ b/react-native/ios/RealmReact.xcodeproj/project.pbxproj @@ -13,6 +13,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 027A23061CD3E212000543AE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F60690231CA277CC0003FB26 /* RealmJS.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F62BF8FB1CAC71780022BCDC; + remoteInfo = RealmNode; + }; F606902C1CA277CD0003FB26 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F60690231CA277CC0003FB26 /* RealmJS.xcodeproj */; @@ -27,13 +34,6 @@ remoteGlobalIDString = F63FF2B11C1241E500B3B8E0; remoteInfo = "RealmJS static"; }; - F60690301CA277CD0003FB26 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F60690231CA277CC0003FB26 /* RealmJS.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 02B58CB11AE99CEC009B348C; - remoteInfo = RealmJS; - }; F60690321CA277CD0003FB26 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F60690231CA277CC0003FB26 /* RealmJS.xcodeproj */; @@ -120,9 +120,9 @@ F60690241CA277CC0003FB26 /* Products */ = { isa = PBXGroup; children = ( - F606902D1CA277CD0003FB26 /* libGCDWebServers.a */, + F606902D1CA277CD0003FB26 /* liblibGCDWebServers.a */, F606902F1CA277CD0003FB26 /* libRealmJS.a */, - F60690311CA277CD0003FB26 /* RealmJS.framework */, + 027A23071CD3E212000543AE /* libRealmNode.dylib */, F60690331CA277CD0003FB26 /* RealmJSTests.xctest */, ); name = Products; @@ -187,10 +187,17 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - F606902D1CA277CD0003FB26 /* libGCDWebServers.a */ = { + 027A23071CD3E212000543AE /* libRealmNode.dylib */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.dylib"; + path = libRealmNode.dylib; + remoteRef = 027A23061CD3E212000543AE /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + F606902D1CA277CD0003FB26 /* liblibGCDWebServers.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libGCDWebServers.a; + path = liblibGCDWebServers.a; remoteRef = F606902C1CA277CD0003FB26 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -201,13 +208,6 @@ remoteRef = F606902E1CA277CD0003FB26 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - F60690311CA277CD0003FB26 /* RealmJS.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = RealmJS.framework; - remoteRef = F60690301CA277CD0003FB26 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; F60690331CA277CD0003FB26 /* RealmJSTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; @@ -345,7 +345,7 @@ "$(SRCROOT)/../../tests/react-test-app/node_modules/react-native/React/**", "$(SRCROOT)/../../examples/ReactExample/node_modules/react-native/React/**", ); - OTHER_LIBTOOLFLAGS = "$(SRCROOT)/../../core/librealm-ios-bitcode.a $(BUILT_PRODUCTS_DIR)/libRealmJS.a $(BUILT_PRODUCTS_DIR)/libGCDWebServers.a"; + OTHER_LIBTOOLFLAGS = "$(BUILT_PRODUCTS_DIR)/libRealmJS.a $(BUILT_PRODUCTS_DIR)/libGCDWebServers.a"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; @@ -363,7 +363,7 @@ "$(SRCROOT)/../../tests/react-test-app/node_modules/react-native/React/**", "$(SRCROOT)/../../examples/ReactExample/node_modules/react-native/React/**", ); - OTHER_LIBTOOLFLAGS = "$(SRCROOT)/../../core/librealm-ios-bitcode.a $(BUILT_PRODUCTS_DIR)/libRealmJS.a"; + OTHER_LIBTOOLFLAGS = "$(BUILT_PRODUCTS_DIR)/libRealmJS.a"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; diff --git a/src/ios/RealmJS.xcodeproj/project.pbxproj b/src/ios/RealmJS.xcodeproj/project.pbxproj index 69bcd48d..531ef075 100644 --- a/src/ios/RealmJS.xcodeproj/project.pbxproj +++ b/src/ios/RealmJS.xcodeproj/project.pbxproj @@ -9,17 +9,7 @@ /* Begin PBXBuildFile section */ 02409DC21BCF11D6005F3B3E /* RealmJSCoreTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 02409DC11BCF11D6005F3B3E /* RealmJSCoreTests.m */; }; 0270BC821B7D020100010E03 /* RealmJSTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0270BC7B1B7D020100010E03 /* RealmJSTests.mm */; }; - 0270BC871B7D023200010E03 /* RealmJS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02B58CB11AE99CEC009B348C /* RealmJS.framework */; }; - 029048121C0428DF00ABDED4 /* jsc_init.h in Headers */ = {isa = PBXBuildFile; fileRef = 029048021C0428DF00ABDED4 /* jsc_init.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 029048141C0428DF00ABDED4 /* js_list.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 029048041C0428DF00ABDED4 /* js_list.hpp */; }; - 029048161C0428DF00ABDED4 /* js_realm_object.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 029048061C0428DF00ABDED4 /* js_realm_object.hpp */; }; - 029048181C0428DF00ABDED4 /* js_realm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 029048081C0428DF00ABDED4 /* js_realm.hpp */; }; - 0290481A1C0428DF00ABDED4 /* js_results.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 0290480A1C0428DF00ABDED4 /* js_results.hpp */; }; - 0290481C1C0428DF00ABDED4 /* js_schema.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 0290480C1C0428DF00ABDED4 /* js_schema.hpp */; }; - 029048201C0428DF00ABDED4 /* rpc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 029048101C0428DF00ABDED4 /* rpc.hpp */; settings = {ATTRIBUTES = (Public, ); }; }; - 029048371C042A3C00ABDED4 /* platform.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 029048351C042A3C00ABDED4 /* platform.hpp */; }; - 0290483B1C042EE200ABDED4 /* RealmJS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0290483A1C042EE200ABDED4 /* RealmJS.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 02B58CCE1AE99D4D009B348C /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02B58CCD1AE99D4D009B348C /* JavaScriptCore.framework */; }; + 027A23131CD3E379000543AE /* libRealmJS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F63FF2B11C1241E500B3B8E0 /* libRealmJS.a */; }; 02D8D1F71B601984006DB49D /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02B58CCD1AE99D4D009B348C /* JavaScriptCore.framework */; }; 02F59EBF1C88F17D007F774C /* index_set.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F59EAF1C88F17D007F774C /* index_set.cpp */; }; 02F59EC01C88F17D007F774C /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F59EB11C88F17D007F774C /* list.cpp */; }; @@ -59,8 +49,6 @@ F63FF2C61C12469E00B3B8E0 /* jsc_init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 029048011C0428DF00ABDED4 /* jsc_init.cpp */; }; F63FF2C91C12469E00B3B8E0 /* js_realm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 029048071C0428DF00ABDED4 /* js_realm.cpp */; }; F63FF2CD1C12469E00B3B8E0 /* rpc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0290480F1C0428DF00ABDED4 /* rpc.cpp */; }; - F63FF2DE1C1565EA00B3B8E0 /* RealmJS.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63FF2DC1C15659A00B3B8E0 /* RealmJS.mm */; }; - F63FF2E11C1591EC00B3B8E0 /* libRealmJS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F63FF2B11C1241E500B3B8E0 /* libRealmJS.a */; }; F63FF2E21C15921A00B3B8E0 /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6BB7DEF1BF681BC00D0A69E /* base64.cpp */; }; F63FF2E81C159C4B00B3B8E0 /* platform.mm in Sources */ = {isa = PBXBuildFile; fileRef = 029048381C042A8F00ABDED4 /* platform.mm */; }; F63FF31B1C1642BB00B3B8E0 /* GCDWebServer.m in Sources */ = {isa = PBXBuildFile; fileRef = F63FF2FE1C1642BB00B3B8E0 /* GCDWebServer.m */; }; @@ -77,27 +65,9 @@ F63FF3261C1642BB00B3B8E0 /* GCDWebServerFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = F63FF3181C1642BB00B3B8E0 /* GCDWebServerFileResponse.m */; }; F63FF3271C1642BB00B3B8E0 /* GCDWebServerStreamedResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = F63FF31A1C1642BB00B3B8E0 /* GCDWebServerStreamedResponse.m */; }; F68A278C1BC2722A0063D40A /* RJSModuleLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = F68A278B1BC2722A0063D40A /* RJSModuleLoader.m */; }; - F6BB7DF21BF681BC00D0A69E /* base64.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6BB7DF01BF681BC00D0A69E /* base64.hpp */; }; F6BCCFE21C8380A400FE31AE /* lib in Resources */ = {isa = PBXBuildFile; fileRef = F6BCCFDF1C83809A00FE31AE /* lib */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 02B58CBE1AE99CEC009B348C /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 02B58CA81AE99CEB009B348C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 02B58CB01AE99CEC009B348C; - remoteInfo = RealmJS; - }; - F63FF2E41C159B2C00B3B8E0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 02B58CA81AE99CEB009B348C /* Project object */; - proxyType = 1; - remoteGlobalIDString = F63FF2B01C1241E500B3B8E0; - remoteInfo = "RealmJS static"; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ F63FF2EE1C16405C00B3B8E0 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -131,7 +101,6 @@ 029048381C042A8F00ABDED4 /* platform.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform.mm; sourceTree = ""; }; 0290483A1C042EE200ABDED4 /* RealmJS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealmJS.h; sourceTree = ""; }; 02A3C7A41BC4341500B1A7BE /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; - 02B58CB11AE99CEC009B348C /* RealmJS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RealmJS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 02B58CBC1AE99CEC009B348C /* RealmJSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RealmJSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 02B58CCD1AE99D4D009B348C /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; 02F59EAE1C88F17D007F774C /* binding_context.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = binding_context.hpp; path = src/binding_context.hpp; sourceTree = ""; }; @@ -246,20 +215,11 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 02B58CAD1AE99CEC009B348C /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - F63FF2E11C1591EC00B3B8E0 /* libRealmJS.a in Frameworks */, - 02B58CCE1AE99D4D009B348C /* JavaScriptCore.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 02B58CB91AE99CEC009B348C /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0270BC871B7D023200010E03 /* RealmJS.framework in Frameworks */, + 027A23131CD3E379000543AE /* libRealmJS.a in Frameworks */, 02D8D1F71B601984006DB49D /* JavaScriptCore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -320,7 +280,6 @@ 02B58CB21AE99CEC009B348C /* Products */ = { isa = PBXGroup; children = ( - 02B58CB11AE99CEC009B348C /* RealmJS.framework */, 02B58CBC1AE99CEC009B348C /* RealmJSTests.xctest */, F63FF2B11C1241E500B3B8E0 /* libRealmJS.a */, F63FF2F01C16405C00B3B8E0 /* libGCDWebServers.a */, @@ -543,23 +502,6 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 02B58CAE1AE99CEC009B348C /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 0290483B1C042EE200ABDED4 /* RealmJS.h in Headers */, - 029048121C0428DF00ABDED4 /* jsc_init.h in Headers */, - 029048201C0428DF00ABDED4 /* rpc.hpp in Headers */, - 0290481A1C0428DF00ABDED4 /* js_results.hpp in Headers */, - 029048181C0428DF00ABDED4 /* js_realm.hpp in Headers */, - 029048141C0428DF00ABDED4 /* js_list.hpp in Headers */, - F6BB7DF21BF681BC00D0A69E /* base64.hpp in Headers */, - 0290481C1C0428DF00ABDED4 /* js_schema.hpp in Headers */, - 029048161C0428DF00ABDED4 /* js_realm_object.hpp in Headers */, - 029048371C042A3C00ABDED4 /* platform.hpp in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; F62BF8F91CAC71780022BCDC /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -571,25 +513,6 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 02B58CB01AE99CEC009B348C /* RealmJS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 02B58CC71AE99CEC009B348C /* Build configuration list for PBXNativeTarget "RealmJS" */; - buildPhases = ( - 02B58CAD1AE99CEC009B348C /* Frameworks */, - 02B58CAE1AE99CEC009B348C /* Headers */, - F63FF2DD1C1565DF00B3B8E0 /* Sources */, - 02B58CAF1AE99CEC009B348C /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - F63FF2E51C159B2C00B3B8E0 /* PBXTargetDependency */, - ); - name = RealmJS; - productName = RealmJS; - productReference = 02B58CB11AE99CEC009B348C /* RealmJS.framework */; - productType = "com.apple.product-type.framework"; - }; 02B58CBB1AE99CEC009B348C /* RealmJSTests */ = { isa = PBXNativeTarget; buildConfigurationList = 02B58CCA1AE99CEC009B348C /* Build configuration list for PBXNativeTarget "RealmJSTests" */; @@ -602,7 +525,6 @@ buildRules = ( ); dependencies = ( - 02B58CBF1AE99CEC009B348C /* PBXTargetDependency */, ); name = RealmJSTests; productName = RealmJSTests; @@ -626,9 +548,9 @@ productReference = F62BF8FB1CAC71780022BCDC /* libRealmNode.dylib */; productType = "com.apple.product-type.library.dynamic"; }; - F63FF2B01C1241E500B3B8E0 /* RealmJS static */ = { + F63FF2B01C1241E500B3B8E0 /* RealmJS */ = { isa = PBXNativeTarget; - buildConfigurationList = F63FF2C41C1241E500B3B8E0 /* Build configuration list for PBXNativeTarget "RealmJS static" */; + buildConfigurationList = F63FF2C41C1241E500B3B8E0 /* Build configuration list for PBXNativeTarget "RealmJS" */; buildPhases = ( F63FF2C51C12462600B3B8E0 /* Download Core */, F63FF2AD1C1241E500B3B8E0 /* Sources */, @@ -637,7 +559,7 @@ ); dependencies = ( ); - name = "RealmJS static"; + name = RealmJS; productName = libRealmJS; productReference = F63FF2B11C1241E500B3B8E0 /* libRealmJS.a */; productType = "com.apple.product-type.library.static"; @@ -668,9 +590,6 @@ LastUpgradeCheck = 0700; ORGANIZATIONNAME = Realm; TargetAttributes = { - 02B58CB01AE99CEC009B348C = { - CreatedOnToolsVersion = 6.3.1; - }; 02B58CBB1AE99CEC009B348C = { CreatedOnToolsVersion = 6.3.1; }; @@ -698,22 +617,14 @@ projectRoot = ""; targets = ( F63FF2EF1C16405C00B3B8E0 /* GCDWebServers */, - F63FF2B01C1241E500B3B8E0 /* RealmJS static */, + F63FF2B01C1241E500B3B8E0 /* RealmJS */, F62BF8FA1CAC71780022BCDC /* RealmNode */, - 02B58CB01AE99CEC009B348C /* RealmJS */, 02B58CBB1AE99CEC009B348C /* RealmJSTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 02B58CAF1AE99CEC009B348C /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 02B58CBA1AE99CEC009B348C /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -818,14 +729,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - F63FF2DD1C1565DF00B3B8E0 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - F63FF2DE1C1565EA00B3B8E0 /* RealmJS.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; F63FF2EC1C16405C00B3B8E0 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -848,19 +751,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 02B58CBF1AE99CEC009B348C /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 02B58CB01AE99CEC009B348C /* RealmJS */; - targetProxy = 02B58CBE1AE99CEC009B348C /* PBXContainerItemProxy */; - }; - F63FF2E51C159B2C00B3B8E0 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = F63FF2B01C1241E500B3B8E0 /* RealmJS static */; - targetProxy = F63FF2E41C159B2C00B3B8E0 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 02B58CC51AE99CEC009B348C /* Debug */ = { isa = XCBuildConfiguration; @@ -981,50 +871,6 @@ }; name = Release; }; - 02B58CC81AE99CEC009B348C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - DEFINES_MODULE = NO; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 0.11.1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - OTHER_LDFLAGS = ( - "-lrealm-ios-bitcode", - "-all_load", - ); - PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - VERSIONING_SYSTEM = ""; - }; - name = Debug; - }; - 02B58CC91AE99CEC009B348C /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - DEFINES_MODULE = NO; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 0.11.1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - OTHER_LDFLAGS = ( - "-lrealm-ios-bitcode", - "-all_load", - ); - PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - VERSIONING_SYSTEM = ""; - }; - name = Release; - }; 02B58CCB1AE99CEC009B348C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1122,28 +968,6 @@ }; name = GCov_Build; }; - 02F9EE1D1B6BF66300C807E8 /* GCov_Build */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - DEFINES_MODULE = NO; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 0.11.1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - OTHER_LDFLAGS = ( - "-lrealm-ios-bitcode", - "-all_load", - ); - PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - VERSIONING_SYSTEM = ""; - }; - name = GCov_Build; - }; 02F9EE1E1B6BF66300C807E8 /* GCov_Build */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1249,6 +1073,7 @@ "DEBUG=1", "$(inherited)", ); + OTHER_LIBTOOLFLAGS = "$(SRCROOT)/../../core/librealm-ios-bitcode.a"; PRODUCT_NAME = RealmJS; SKIP_INSTALL = YES; }; @@ -1257,6 +1082,7 @@ F63FF2B81C1241E500B3B8E0 /* GCov_Build */ = { isa = XCBuildConfiguration; buildSettings = { + OTHER_LIBTOOLFLAGS = "$(SRCROOT)/../../core/librealm-ios-bitcode.a"; PRODUCT_NAME = RealmJS; SKIP_INSTALL = YES; }; @@ -1265,6 +1091,7 @@ F63FF2B91C1241E500B3B8E0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + OTHER_LIBTOOLFLAGS = "$(SRCROOT)/../../core/librealm-ios-bitcode.a"; PRODUCT_NAME = RealmJS; SKIP_INSTALL = YES; }; @@ -1318,16 +1145,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 02B58CC71AE99CEC009B348C /* Build configuration list for PBXNativeTarget "RealmJS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 02B58CC81AE99CEC009B348C /* Debug */, - 02F9EE1D1B6BF66300C807E8 /* GCov_Build */, - 02B58CC91AE99CEC009B348C /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 02B58CCA1AE99CEC009B348C /* Build configuration list for PBXNativeTarget "RealmJSTests" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1348,7 +1165,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - F63FF2C41C1241E500B3B8E0 /* Build configuration list for PBXNativeTarget "RealmJS static" */ = { + F63FF2C41C1241E500B3B8E0 /* Build configuration list for PBXNativeTarget "RealmJS" */ = { isa = XCConfigurationList; buildConfigurations = ( F63FF2B71C1241E500B3B8E0 /* Debug */, diff --git a/src/ios/RealmJS.xcodeproj/xcshareddata/xcschemes/GCDWebServers.xcscheme b/src/ios/RealmJS.xcodeproj/xcshareddata/xcschemes/GCDWebServers.xcscheme deleted file mode 100644 index f8bff39a..00000000 --- a/src/ios/RealmJS.xcodeproj/xcshareddata/xcschemes/GCDWebServers.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ios/RealmJS.xcodeproj/xcshareddata/xcschemes/RealmJS static.xcscheme b/src/ios/RealmJS.xcodeproj/xcshareddata/xcschemes/RealmJS static.xcscheme deleted file mode 100644 index ef42d62c..00000000 --- a/src/ios/RealmJS.xcodeproj/xcshareddata/xcschemes/RealmJS static.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ios/RealmJS.xcodeproj/xcshareddata/xcschemes/RealmJS.xcscheme b/src/ios/RealmJS.xcodeproj/xcshareddata/xcschemes/RealmJS.xcscheme deleted file mode 100644 index 21463470..00000000 --- a/src/ios/RealmJS.xcodeproj/xcshareddata/xcschemes/RealmJS.xcscheme +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -