Skip to content

Commit

Permalink
Update CorePlot from 1.6 to 2.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
beepscore committed Nov 6, 2016
1 parent 5e67f41 commit 59ff49c
Show file tree
Hide file tree
Showing 1,002 changed files with 19,426 additions and 12,198 deletions.
16 changes: 8 additions & 8 deletions BGCompass.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
2B24B3E9C397CE5B7BD113AF /* libPods-BGCompass.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A948D49E946B3924F0658E2 /* libPods-BGCompass.a */; };
176AF338B70A0324DC32D7D4 /* Pods_BGCompassTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FEE93CFE190E071FBBDD0B97 /* Pods_BGCompassTests.framework */; };
2C0739911840342000B413BE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2C233120182B6C82008A6F88 /* InfoPlist.strings */; };
2C1334531854DA0800CECB76 /* CollapsedTrendMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2C1334521854DA0800CECB76 /* CollapsedTrendMenu.xib */; };
2C1334561854DA2000CECB76 /* CollapsedTrendMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C1334551854DA2000CECB76 /* CollapsedTrendMenu.m */; };
Expand Down Expand Up @@ -135,7 +135,7 @@
83EAFABD182F521000CE5FA9 /* BGReading.m in Sources */ = {isa = PBXBuildFile; fileRef = 83EAFABA182F521000CE5FA9 /* BGReading.m */; };
83FD930E1830529600F4F19E /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = 83FD930D1830529600F4F19E /* Constants.m */; };
845D246A1BA52C2F00981091 /* WarningViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 845D24691BA52C2F00981091 /* WarningViewController.m */; };
E0F7E9AB8A9D52D4B3BF47CA /* libPods-BGCompassTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 38FB4155A2599B0BB9298ECC /* libPods-BGCompassTests.a */; };
F50B7C400FB640842A39B767 /* Pods_BGCompass.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CFB80745219C33121D284861 /* Pods_BGCompass.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -284,7 +284,6 @@
2CD96E8018C2FCF100361C64 /* EditItemViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditItemViewController.m; sourceTree = "<group>"; };
2CF6D27218480F3E00872B8F /* compass.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = compass.png; sourceTree = "<group>"; };
2CF6D2741848121200872B8F /* solid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = solid.png; sourceTree = "<group>"; };
38FB4155A2599B0BB9298ECC /* libPods-BGCompassTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-BGCompassTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
7FC63F7E66C515C78A6B48C4 /* Pods-BGCompassTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BGCompassTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-BGCompassTests/Pods-BGCompassTests.release.xcconfig"; sourceTree = "<group>"; };
8337DF2B18EA332A00055E59 /* UPCScannerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPCScannerViewController.h; sourceTree = "<group>"; };
8337DF2C18EA332A00055E59 /* UPCScannerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPCScannerViewController.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -332,8 +331,9 @@
845D24691BA52C2F00981091 /* WarningViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WarningViewController.m; sourceTree = "<group>"; };
848D6EAF19CC023F003C611F /* BGCompass.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = BGCompass.entitlements; sourceTree = "<group>"; };
8BDCB62A0108EFA37CBB1497 /* Pods-BGCompass.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BGCompass.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BGCompass/Pods-BGCompass.debug.xcconfig"; sourceTree = "<group>"; };
9A948D49E946B3924F0658E2 /* libPods-BGCompass.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-BGCompass.a"; sourceTree = BUILT_PRODUCTS_DIR; };
CFB80745219C33121D284861 /* Pods_BGCompass.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BGCompass.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DA8767A213B9617639CF29F3 /* Pods-BGCompassTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BGCompassTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BGCompassTests/Pods-BGCompassTests.debug.xcconfig"; sourceTree = "<group>"; };
FEE93CFE190E071FBBDD0B97 /* Pods_BGCompassTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BGCompassTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -346,7 +346,7 @@
2C2330F3182B6C82008A6F88 /* CoreData.framework in Frameworks */,
2C2330F1182B6C82008A6F88 /* UIKit.framework in Frameworks */,
2C2330ED182B6C82008A6F88 /* Foundation.framework in Frameworks */,
2B24B3E9C397CE5B7BD113AF /* libPods-BGCompass.a in Frameworks */,
F50B7C400FB640842A39B767 /* Pods_BGCompass.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -358,7 +358,7 @@
2C23311A182B6C82008A6F88 /* CoreData.framework in Frameworks */,
2C233119182B6C82008A6F88 /* UIKit.framework in Frameworks */,
2C233118182B6C82008A6F88 /* Foundation.framework in Frameworks */,
E0F7E9AB8A9D52D4B3BF47CA /* libPods-BGCompassTests.a in Frameworks */,
176AF338B70A0324DC32D7D4 /* Pods_BGCompassTests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -395,8 +395,8 @@
2C2330F0182B6C82008A6F88 /* UIKit.framework */,
2C2330F2182B6C82008A6F88 /* CoreData.framework */,
2C233116182B6C82008A6F88 /* XCTest.framework */,
9A948D49E946B3924F0658E2 /* libPods-BGCompass.a */,
38FB4155A2599B0BB9298ECC /* libPods-BGCompassTests.a */,
CFB80745219C33121D284861 /* Pods_BGCompass.framework */,
FEE93CFE190E071FBBDD0B97 /* Pods_BGCompassTests.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down
5 changes: 4 additions & 1 deletion BGCompass/GraphViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
//

#import <UIKit/UIKit.h>
#import <CorePlot-CocoaTouch.h>

// https://github.com/core-plot/core-plot/issues/204
#import <CorePlot/ios/CorePlot.h>

#import "InsulinReading.h"
#import "FoodReading.h"

Expand Down
6 changes: 3 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

target 'BGCompass' do
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
# use_frameworks!
use_frameworks!

# Pods for BGCompass

pod 'MagicalRecord'
pod 'RestKit', '~> 0.20.3'
pod 'RestKit/Testing', '~> 0.20.3'
pod 'RestKit/Search', '~> 0.20.3'
pod 'CorePlot', '~> 1.6'
pod 'CorePlot', '~> 2.2'
pod 'PPiFlatSegmentedControl', '~> 1.3.3'
pod 'JVFloatLabeledTextField'
pod 'RETableViewManager'
Expand All @@ -23,7 +23,7 @@ pod 'Reachability'

target 'BGCompassTests' do
inherit! :search_paths
pod 'CorePlot', '~> 1.6'
pod 'CorePlot', '~> 2.2'
end

end
50 changes: 25 additions & 25 deletions Podfile.lock
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
PODS:
- AFNetworking (1.3.4)
- BlurryModalSegue (1.0.0):
- BlurryModalSegue (1.1.2):
- MZAppearance (~> 1.1.1)
- UIImage+BlurredFrame (~> 0.0.4)
- CorePlot (1.6)
- CorePlot (2.2)
- EAIntroView (2.2.2)
- EFCircularSlider (0.1.0)
- FontAwesome+iOS (0.1.1)
- JVFloatLabeledTextField (0.0.8)
- MagicalRecord (2.2):
- MagicalRecord/Core (= 2.2)
- MagicalRecord/Core (2.2)
- MZAppearance (1.1.3)
- PPiAwesomeButton (1.4.7):
- FontAwesome+iOS (0.1.4)
- JVFloatLabeledTextField (1.1.1)
- MagicalRecord (2.3.2):
- MagicalRecord/Core (= 2.3.2)
- MagicalRecord/Core (2.3.2)
- MZAppearance (1.1.6)
- PPiAwesomeButton (1.5.2):
- FontAwesome+iOS
- PPiFlatSegmentedControl (1.3.8):
- PPiAwesomeButton
- Reachability (3.1.1)
- REFormattedNumberField (1.1.2)
- Reachability (3.2)
- REFormattedNumberField (1.1.6)
- RestKit (0.20.3):
- RestKit/Core (= 0.20.3)
- RestKit/Core (0.20.3):
Expand All @@ -36,8 +36,8 @@ PODS:
- RestKit/Support (0.20.3):
- TransitionKit (= 1.1.1)
- RestKit/Testing (0.20.3)
- RETableViewManager (1.5.10):
- REFormattedNumberField (~> 1.1.2)
- RETableViewManager (1.7):
- REFormattedNumberField (~> 1.1.5)
- REValidation (~> 0.1.4)
- REValidation (0.1.4)
- RMDateSelectionViewController (1.1.0)
Expand All @@ -47,7 +47,7 @@ PODS:

DEPENDENCIES:
- BlurryModalSegue
- CorePlot (~> 1.6)
- CorePlot (~> 2.2)
- EAIntroView (~> 2.2.0)
- EFCircularSlider (~> 0.1.0)
- JVFloatLabeledTextField
Expand All @@ -62,26 +62,26 @@ DEPENDENCIES:

SPEC CHECKSUMS:
AFNetworking: cf8e418e16f0c9c7e5c3150d019a3c679d015018
BlurryModalSegue: fb97c1668ab84209c5a49789c3441a63215552c4
CorePlot: 820901f6c147f2d84549ffa1f0902869f980d74d
BlurryModalSegue: 35cdad34eba31228e4d84073033a9ea7d6537aa4
CorePlot: cbe0c6e14220705e32e06a89c7d6a5a908b7d7d8
EAIntroView: 84ef32c009a04208afc1a20547c6c9c7d0ed3a3c
EFCircularSlider: 5a4baa272264e845577945c86e23d5d3996d3c37
FontAwesome+iOS: 26037dac07b0768df058a1abfd28b10d553db393
JVFloatLabeledTextField: 8e67126f7008768d1f782b2378297260d5e12e71
MagicalRecord: 2dc87179ae7c1f2a274442624ec65a07d4357a6f
MZAppearance: c2937318234fd782e900fb178942278881ac5490
PPiAwesomeButton: 9b08862a85457a3087359e8c38d1c289338785b1
FontAwesome+iOS: 9070b682a9255ca0fdc34bcfb129ad0ba2b73b87
JVFloatLabeledTextField: 0e5524b097f102036214dd8279edc8ecf08b5e18
MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
MZAppearance: 0c06d3fa9cc55142f1da14bc8631fbe8fd6e19d5
PPiAwesomeButton: 16f7279582fd36f65186b24b83ef876217363eb5
PPiFlatSegmentedControl: 7c60444d0761769b15fbb344c35c6622f22ef9ad
Reachability: dd9aa4fb6667b9f787690a74f53cb7634ce99893
REFormattedNumberField: 242e9973174d8d4d77d8ccfb8d14aa13f044402e
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
REFormattedNumberField: 70fc5fb1218ebd5ee9983820defd12806d5c6ec6
RestKit: aac0c81c60d30fdd829d627d062f0eea231eb52c
RETableViewManager: b943a12b8684d8563b6daa30e3ceab390856c1c3
RETableViewManager: 0f24d796c42c0890d38c79cc9aeb3871e186726e
REValidation: 38c4de1be58455f8b00aab208ac80db316a66b7f
RMDateSelectionViewController: 4585dcd2024d5e213b792c0834caaa7da8696df5
SOCKit: c7376ac262bea9115b8f749358f762522a47d392
TransitionKit: aec4d65b2be460fec0db04f905e8bedca601d669
UIImage+BlurredFrame: ad2f7195c6947ea3117c7d202f75a51958d5061a

PODFILE CHECKSUM: d998fe51844ee2c1df240e42428674b4681f01db
PODFILE CHECKSUM: f839c9710548667a3410b4e2418ed0f9fa20c83a

COCOAPODS: 1.1.1
50 changes: 42 additions & 8 deletions Pods/BlurryModalSegue/BlurryModalSegue/BlurryModalSegue.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Pods/BlurryModalSegue/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pods/CorePlot/License.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 59ff49c

Please sign in to comment.