diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj index 99276cba58..a44e5a2aee 100644 --- a/Charts.xcodeproj/project.pbxproj +++ b/Charts.xcodeproj/project.pbxproj @@ -944,6 +944,7 @@ inputPaths = ( FBSnapshotTestCase, Realm, + RealmSwift, ); name = "Copy Carthage Frameworks"; outputPaths = ( diff --git a/ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj b/ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj index b92821b2c1..3877e224d3 100644 --- a/ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj +++ b/ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj @@ -9,8 +9,6 @@ /* Begin PBXBuildFile section */ 0439A3541C9FF95F00496F83 /* PiePolylineChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0439A3521C9FF95F00496F83 /* PiePolylineChartViewController.m */; }; 0471CBFC1CA1090A00E52DBC /* PiePolylineChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0471CBFB1CA1090A00E52DBC /* PiePolylineChartViewController.xib */; }; - 0630AE371D8126B1008859B0 /* Realm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE361D8126B1008859B0 /* Realm.framework */; }; - 0630AE381D8126B1008859B0 /* Realm.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE361D8126B1008859B0 /* Realm.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 0630AE511D81271B008859B0 /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE411D8126C0008859B0 /* Charts.framework */; }; 0630AE521D81271B008859B0 /* Charts.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE411D8126C0008859B0 /* Charts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 0630AE551D81271B008859B0 /* ChartsRealm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE451D8126C0008859B0 /* ChartsRealm.framework */; }; @@ -158,7 +156,6 @@ dstSubfolderSpec = 10; files = ( 0630AE561D81271B008859B0 /* ChartsRealm.framework in Embed Frameworks */, - 0630AE381D8126B1008859B0 /* Realm.framework in Embed Frameworks */, 0630AE521D81271B008859B0 /* Charts.framework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -172,6 +169,7 @@ 0471CBFB1CA1090A00E52DBC /* PiePolylineChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PiePolylineChartViewController.xib; sourceTree = ""; }; 0630AE361D8126B1008859B0 /* Realm.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Realm.framework; path = ../Carthage/Build/iOS/Realm.framework; sourceTree = ""; }; 0630AE391D8126C0008859B0 /* Charts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Charts.xcodeproj; path = ../Charts.xcodeproj; sourceTree = ""; }; + 066750AC1E2DB68D00E22DC6 /* Carthage.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Carthage.xcconfig; path = ../Carthage.xcconfig; sourceTree = ""; }; 55E3564D1ADC638F00A57971 /* BubbleChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BubbleChartViewController.xib; sourceTree = ""; }; 55E3564E1ADC638F00A57971 /* BubbleChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BubbleChartViewController.h; sourceTree = ""; }; 55E3564F1ADC638F00A57971 /* BubbleChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BubbleChartViewController.m; sourceTree = ""; }; @@ -320,7 +318,6 @@ buildActionMask = 2147483647; files = ( 0630AE551D81271B008859B0 /* ChartsRealm.framework in Frameworks */, - 0630AE371D8126B1008859B0 /* Realm.framework in Frameworks */, 0630AE511D81271B008859B0 /* Charts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -367,6 +364,7 @@ 5B57BBA61A9B26AA0036A6CC = { isa = PBXGroup; children = ( + 066750AC1E2DB68D00E22DC6 /* Carthage.xcconfig */, 5B57BBB11A9B26AA0036A6CC /* Classes */, 5B8EAF2E1AB32E15009697AA /* Resources */, 5B57BBB21A9B26AA0036A6CC /* Supporting Files */, @@ -604,6 +602,7 @@ 5B57BBAC1A9B26AA0036A6CC /* Frameworks */, 5B57BBAD1A9B26AA0036A6CC /* Resources */, 5BB4B0751ACA710D00E2EF4D /* Embed Frameworks */, + 066750AE1E2DB70B00E22DC6 /* Copy Carthage Frameworks */, ); buildRules = ( ); @@ -740,6 +739,25 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 066750AE1E2DB70B00E22DC6 /* Copy Carthage Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + Realm, + RealmSwift, + ); + name = "Copy Carthage Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#!/bin/sh\n\ncase \"$PLATFORM_NAME\" in\nmacosx) plat=Mac;;\niphone*) plat=iOS;;\nwatch*) plat=watchOS;;\nappletv*) plat=tvOS;;\n*) echo \"error: Unknown PLATFORM_NAME: $PLATFORM_NAME\"; exit 1;;\nesac\n\nfor (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do\nVAR=SCRIPT_INPUT_FILE_$n\nframework=$(basename \"${!VAR}\")\nexport SCRIPT_INPUT_FILE_$n=\"$SRCROOT\"/../Carthage/Build/$plat/\"$framework\".framework\ndone\n\n/usr/local/bin/carthage copy-frameworks || exit\n\nfor (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do\nVAR=SCRIPT_INPUT_FILE_$n\nsource=${!VAR}.dSYM\ndest=${BUILT_PRODUCTS_DIR}/$(basename \"$source\")\nditto \"$source\" \"$dest\" || exit\ndone"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 5B57BBAB1A9B26AA0036A6CC /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -814,6 +832,7 @@ /* Begin XCBuildConfiguration section */ 5B57BBD01A9B26AA0036A6CC /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 066750AC1E2DB68D00E22DC6 /* Carthage.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -859,6 +878,7 @@ }; 5B57BBD11A9B26AA0036A6CC /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 066750AC1E2DB68D00E22DC6 /* Carthage.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -898,6 +918,7 @@ }; 5B57BBD31A9B26AA0036A6CC /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 066750AC1E2DB68D00E22DC6 /* Carthage.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -908,6 +929,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ChartsDemo; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; @@ -916,6 +938,7 @@ }; 5B57BBD41A9B26AA0036A6CC /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 066750AC1E2DB68D00E22DC6 /* Carthage.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -926,6 +949,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ChartsDemo; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h"; SWIFT_VERSION = 3.0; }; diff --git a/Rakefile b/Rakefile index 77b714c57f..fd12472ede 100644 --- a/Rakefile +++ b/Rakefile @@ -40,8 +40,8 @@ def devices { iOS: { sdk: 'iphonesimulator', - device: "name='iPhone 7'", - uuid: '5F911B30-5F23-403B-9697-1DFDC24773C8' + device: "id='22FA2149-1241-469C-BF6D-462D3837DB72'", + uuid: '22FA2149-1241-469C-BF6D-462D3837DB72' }, macOS: { sdk: 'macosx', @@ -50,8 +50,8 @@ def devices }, tvOS: { sdk: 'appletvsimulator', - device: "name='Apple TV 1080p'", - uuid: '273D776F-196E-4F2A-AEF2-E1E3EAE99B47' + device: "id='5761D8AB-2838-4681-A528-D0949FF240C5'", + uuid: '5761D8AB-2838-4681-A528-D0949FF240C5' } } end