Merge pull request #111 from yimingtang/fix-build-settings
Fix project configurations. Update CocoaPods to 0.34.4.
Showing
2 changed files
with
18 additions
and
6 deletions
| @@ -75,6 +75,7 @@ | @@ -75,6 +75,7 @@ | ||
| 75 | 0AF7A892182AA9F6003645C4 /* PNChartDemoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PNChartDemoTests.m; sourceTree = "<group>"; }; | 75 | 0AF7A892182AA9F6003645C4 /* PNChartDemoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PNChartDemoTests.m; sourceTree = "<group>"; }; |
| 76 | 0AF7A8AD182AAEEF003645C4 /* PCChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PCChartViewController.h; sourceTree = "<group>"; }; | 76 | 0AF7A8AD182AAEEF003645C4 /* PCChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PCChartViewController.h; sourceTree = "<group>"; }; |
| 77 | 0AF7A8AE182AAEEF003645C4 /* PCChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PCChartViewController.m; sourceTree = "<group>"; }; | 77 | 0AF7A8AE182AAEEF003645C4 /* PCChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PCChartViewController.m; sourceTree = "<group>"; }; |
| 78 | + 2980CA20C29DC029B2D0B926 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; }; | ||
| 78 | 3BA6321352024B1FBA0158B0 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; | 79 | 3BA6321352024B1FBA0158B0 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; |
| 79 | 91177EC8198DFAC400017E27 /* PNBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PNBar.h; sourceTree = "<group>"; }; | 80 | 91177EC8198DFAC400017E27 /* PNBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PNBar.h; sourceTree = "<group>"; }; |
| 80 | 91177EC9198DFAC400017E27 /* PNBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PNBar.m; sourceTree = "<group>"; }; | 81 | 91177EC9198DFAC400017E27 /* PNBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PNBar.m; sourceTree = "<group>"; }; |
| @@ -100,7 +101,7 @@ | @@ -100,7 +101,7 @@ | ||
| 100 | 9FE15DE9190BB014004129F5 /* PNChartLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PNChartLabel.m; sourceTree = "<group>"; }; | 101 | 9FE15DE9190BB014004129F5 /* PNChartLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PNChartLabel.m; sourceTree = "<group>"; }; |
| 101 | 9FE15DED190BB014004129F5 /* PNColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PNColor.h; sourceTree = "<group>"; }; | 102 | 9FE15DED190BB014004129F5 /* PNColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PNColor.h; sourceTree = "<group>"; }; |
| 102 | 9FE15DEE190BB014004129F5 /* PNColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PNColor.m; sourceTree = "<group>"; }; | 103 | 9FE15DEE190BB014004129F5 /* PNColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PNColor.m; sourceTree = "<group>"; }; |
| 103 | - F161CF4F7A8C4BD2AB65FB4F /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = "<group>"; }; | 104 | + EFE4F6360943ED4001072124 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; }; |
| 104 | /* End PBXFileReference section */ | 105 | /* End PBXFileReference section */ |
| 105 | 106 | ||
| 106 | /* Begin PBXFrameworksBuildPhase section */ | 107 | /* Begin PBXFrameworksBuildPhase section */ |
| @@ -137,7 +138,7 @@ | @@ -137,7 +138,7 @@ | ||
| 137 | 0AF7A88C182AA9F6003645C4 /* PNChartDemoTests */, | 138 | 0AF7A88C182AA9F6003645C4 /* PNChartDemoTests */, |
| 138 | 0AF7A866182AA9F6003645C4 /* Frameworks */, | 139 | 0AF7A866182AA9F6003645C4 /* Frameworks */, |
| 139 | 0AF7A865182AA9F6003645C4 /* Products */, | 140 | 0AF7A865182AA9F6003645C4 /* Products */, |
| 140 | - F161CF4F7A8C4BD2AB65FB4F /* Pods.xcconfig */, | 141 | + 217C3505EE193E5BA78404BE /* Pods */, |
| 141 | ); | 142 | ); |
| 142 | sourceTree = "<group>"; | 143 | sourceTree = "<group>"; |
| 143 | }; | 144 | }; |
| @@ -216,6 +217,15 @@ | @@ -216,6 +217,15 @@ | ||
| 216 | name = PCChartViewController; | 217 | name = PCChartViewController; |
| 217 | sourceTree = "<group>"; | 218 | sourceTree = "<group>"; |
| 218 | }; | 219 | }; |
| 220 | + 217C3505EE193E5BA78404BE /* Pods */ = { | ||
| 221 | + isa = PBXGroup; | ||
| 222 | + children = ( | ||
| 223 | + EFE4F6360943ED4001072124 /* Pods.debug.xcconfig */, | ||
| 224 | + 2980CA20C29DC029B2D0B926 /* Pods.release.xcconfig */, | ||
| 225 | + ); | ||
| 226 | + name = Pods; | ||
| 227 | + sourceTree = "<group>"; | ||
| 228 | + }; | ||
| 219 | 9FE15DE0190BB014004129F5 /* PNChart */ = { | 229 | 9FE15DE0190BB014004129F5 /* PNChart */ = { |
| 220 | isa = PBXGroup; | 230 | isa = PBXGroup; |
| 221 | children = ( | 231 | children = ( |
| @@ -368,7 +378,7 @@ | @@ -368,7 +378,7 @@ | ||
| 368 | ); | 378 | ); |
| 369 | runOnlyForDeploymentPostprocessing = 0; | 379 | runOnlyForDeploymentPostprocessing = 0; |
| 370 | shellPath = /bin/sh; | 380 | shellPath = /bin/sh; |
| 371 | - shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n"; | 381 | + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n"; |
| 372 | showEnvVarsInLog = 0; | 382 | showEnvVarsInLog = 0; |
| 373 | }; | 383 | }; |
| 374 | /* End PBXShellScriptBuildPhase section */ | 384 | /* End PBXShellScriptBuildPhase section */ |
| @@ -521,7 +531,7 @@ | @@ -521,7 +531,7 @@ | ||
| 521 | }; | 531 | }; |
| 522 | 0AF7A897182AA9F6003645C4 /* Debug */ = { | 532 | 0AF7A897182AA9F6003645C4 /* Debug */ = { |
| 523 | isa = XCBuildConfiguration; | 533 | isa = XCBuildConfiguration; |
| 524 | - baseConfigurationReference = F161CF4F7A8C4BD2AB65FB4F /* Pods.xcconfig */; | 534 | + baseConfigurationReference = EFE4F6360943ED4001072124 /* Pods.debug.xcconfig */; |
| 525 | buildSettings = { | 535 | buildSettings = { |
| 526 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | 536 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; |
| 527 | ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | 537 | ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; |
| @@ -536,7 +546,7 @@ | @@ -536,7 +546,7 @@ | ||
| 536 | }; | 546 | }; |
| 537 | 0AF7A898182AA9F6003645C4 /* Release */ = { | 547 | 0AF7A898182AA9F6003645C4 /* Release */ = { |
| 538 | isa = XCBuildConfiguration; | 548 | isa = XCBuildConfiguration; |
| 539 | - baseConfigurationReference = F161CF4F7A8C4BD2AB65FB4F /* Pods.xcconfig */; | 549 | + baseConfigurationReference = 2980CA20C29DC029B2D0B926 /* Pods.release.xcconfig */; |
| 540 | buildSettings = { | 550 | buildSettings = { |
| 541 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | 551 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; |
| 542 | ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | 552 | ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; |
| @@ -551,6 +561,7 @@ | @@ -551,6 +561,7 @@ | ||
| 551 | }; | 561 | }; |
| 552 | 0AF7A89A182AA9F6003645C4 /* Debug */ = { | 562 | 0AF7A89A182AA9F6003645C4 /* Debug */ = { |
| 553 | isa = XCBuildConfiguration; | 563 | isa = XCBuildConfiguration; |
| 564 | + baseConfigurationReference = EFE4F6360943ED4001072124 /* Pods.debug.xcconfig */; | ||
| 554 | buildSettings = { | 565 | buildSettings = { |
| 555 | BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PNChartDemo.app/PNChartDemo"; | 566 | BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PNChartDemo.app/PNChartDemo"; |
| 556 | FRAMEWORK_SEARCH_PATHS = ( | 567 | FRAMEWORK_SEARCH_PATHS = ( |
| @@ -573,6 +584,7 @@ | @@ -573,6 +584,7 @@ | ||
| 573 | }; | 584 | }; |
| 574 | 0AF7A89B182AA9F6003645C4 /* Release */ = { | 585 | 0AF7A89B182AA9F6003645C4 /* Release */ = { |
| 575 | isa = XCBuildConfiguration; | 586 | isa = XCBuildConfiguration; |
| 587 | + baseConfigurationReference = 2980CA20C29DC029B2D0B926 /* Pods.release.xcconfig */; | ||
| 576 | buildSettings = { | 588 | buildSettings = { |
| 577 | BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PNChartDemo.app/PNChartDemo"; | 589 | BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PNChartDemo.app/PNChartDemo"; |
| 578 | FRAMEWORK_SEARCH_PATHS = ( | 590 | FRAMEWORK_SEARCH_PATHS = ( |
-
Please register or login to post a comment