From d31183d442dd082cb80ef293bf149f9c611721a1 Mon Sep 17 00:00:00 2001 From: Miroslav Mirovic Date: Sun, 4 Feb 2018 13:10:20 +0100 Subject: [PATCH 1/8] Dodat pod 'LocationPicker' --- ComtradeGramFinal.xcodeproj/project.pbxproj | 6 +- ComtradeGramFinal/Base.lproj/Main.storyboard | 2 +- ComtradeGramFinal/Info.plist | 4 + .../ViewControllers/MapViewController.swift | 48 +- Podfile | 1 + Podfile.lock | 7 +- Pods/Manifest.lock | 7 +- Pods/Pods.xcodeproj/project.pbxproj | 678 ++++++++++++------ ...omtradeGramFinal-acknowledgements.markdown | 25 + ...s-ComtradeGramFinal-acknowledgements.plist | 31 + .../Pods-ComtradeGramFinal-frameworks.sh | 46 +- .../Pods-ComtradeGramFinalTests-frameworks.sh | 44 +- ...Pods-ComtradeGramFinalTests.debug.xcconfig | 8 +- ...ds-ComtradeGramFinalTests.release.xcconfig | 8 +- ...ods-ComtradeGramFinalUITests-frameworks.sh | 44 +- ...ds-ComtradeGramFinalUITests.debug.xcconfig | 8 +- ...-ComtradeGramFinalUITests.release.xcconfig | 8 +- .../SwiftInstagram/SwiftInstagram.xcconfig | 6 +- 18 files changed, 697 insertions(+), 284 deletions(-) diff --git a/ComtradeGramFinal.xcodeproj/project.pbxproj b/ComtradeGramFinal.xcodeproj/project.pbxproj index 8086f59..756a03c 100644 --- a/ComtradeGramFinal.xcodeproj/project.pbxproj +++ b/ComtradeGramFinal.xcodeproj/project.pbxproj @@ -402,10 +402,12 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/LocationPicker/LocationPicker.framework", "${BUILT_PRODUCTS_DIR}/SwiftInstagram/SwiftInstagram.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LocationPicker.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftInstagram.framework", ); runOnlyForDeploymentPostprocessing = 0; @@ -679,7 +681,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 43E5B5CSA6; + DEVELOPMENT_TEAM = DHFN8WY7B6; INFOPLIST_FILE = ComtradeGramFinal/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = Comtrade.ComtradeGramFinal; @@ -695,7 +697,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 43E5B5CSA6; + DEVELOPMENT_TEAM = DHFN8WY7B6; INFOPLIST_FILE = ComtradeGramFinal/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = Comtrade.ComtradeGramFinal; diff --git a/ComtradeGramFinal/Base.lproj/Main.storyboard b/ComtradeGramFinal/Base.lproj/Main.storyboard index 74e6568..95367e9 100644 --- a/ComtradeGramFinal/Base.lproj/Main.storyboard +++ b/ComtradeGramFinal/Base.lproj/Main.storyboard @@ -67,7 +67,7 @@ - + diff --git a/ComtradeGramFinal/Info.plist b/ComtradeGramFinal/Info.plist index 51f1c3a..8f0684d 100644 --- a/ComtradeGramFinal/Info.plist +++ b/ComtradeGramFinal/Info.plist @@ -47,5 +47,9 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + NSLocationWhenInUseUsageDescription + Allow your Location + NSLocationAlwaysAndWhenInUseUsageDescription + Allow your Location diff --git a/ComtradeGramFinal/ViewControllers/MapViewController.swift b/ComtradeGramFinal/ViewControllers/MapViewController.swift index d898ae5..e2c8ac9 100644 --- a/ComtradeGramFinal/ViewControllers/MapViewController.swift +++ b/ComtradeGramFinal/ViewControllers/MapViewController.swift @@ -8,20 +8,60 @@ import UIKit import SwiftInstagram +import LocationPicker +import CoreLocation class MapViewController: UIViewController { - + var post: InstagramMedia? - + override func viewDidLoad() { super.viewDidLoad() + // Do any additional setup after loading the view, typically from a nib. + + let locationPicker = LocationPickerViewController() + + // you can optionally set initial location + _ = CLLocation(latitude: 44.834561, longitude: 20.411077) +// let initialLocation = Location(name: "Comtrade-Code", location: location) +// locationPicker.location = initialLocation + + // button placed on right bottom corner + locationPicker.showCurrentLocationButton = true // default: true + + // default: navigation bar's `barTintColor` or `.whiteColor()` + locationPicker.currentLocationButtonBackground = .red + + // ignored if initial location is given, shows that location instead + locationPicker.showCurrentLocationInitially = true // default: true + + locationPicker.mapType = .standard // default: .Hybrid + + // for searching, see `MKLocalSearchRequest`'s `region` property + locationPicker.useCurrentLocationAsHint = true // default: false + + locationPicker.searchBarPlaceholder = "Search places" // default: "Search or enter an address" + + locationPicker.searchHistoryLabel = "Previously searched" // default: "Search History" + + // optional region distance to be used for creation region when user selects place from search results + locationPicker.resultRegionDistance = 500 // default: 600 + + locationPicker.completion = { location in + // do some awesome stuff with location + + } + + navigationController?.pushViewController(locationPicker, animated: true) + } - + override func didReceiveMemoryWarning() { super.didReceiveMemoryWarning() // Dispose of any resources that can be recreated. } - + + } diff --git a/Podfile b/Podfile index 4868578..0624a67 100644 --- a/Podfile +++ b/Podfile @@ -8,6 +8,7 @@ target 'ComtradeGramFinal' do # Pods for ComtradeGramFinal pod 'SwiftInstagram', '~> 1.1.0' +pod 'LocationPicker' target 'ComtradeGramFinalTests' do inherit! :search_paths diff --git a/Podfile.lock b/Podfile.lock index a39ed1e..0cf3453 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,14 +1,17 @@ PODS: + - LocationPicker (1.1.0) - SwiftInstagram (1.1.0): - SwiftInstagram/Core (= 1.1.0) - SwiftInstagram/Core (1.1.0) DEPENDENCIES: + - LocationPicker - SwiftInstagram (~> 1.1.0) SPEC CHECKSUMS: + LocationPicker: 94dbd15ee053646d5c275d44b4dfce8634d66041 SwiftInstagram: 90d5c143d8ebe1c790e06a138b8da3c8f2a9ba16 -PODFILE CHECKSUM: b26df78b569c81a8edc3c89e01e7f93a59d9e263 +PODFILE CHECKSUM: 6b094d6ec7e99a91f952bcac61b548d0a1be522c -COCOAPODS: 1.3.1 +COCOAPODS: 1.4.0 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index a39ed1e..0cf3453 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -1,14 +1,17 @@ PODS: + - LocationPicker (1.1.0) - SwiftInstagram (1.1.0): - SwiftInstagram/Core (= 1.1.0) - SwiftInstagram/Core (1.1.0) DEPENDENCIES: + - LocationPicker - SwiftInstagram (~> 1.1.0) SPEC CHECKSUMS: + LocationPicker: 94dbd15ee053646d5c275d44b4dfce8634d66041 SwiftInstagram: 90d5c143d8ebe1c790e06a138b8da3c8f2a9ba16 -PODFILE CHECKSUM: b26df78b569c81a8edc3c89e01e7f93a59d9e263 +PODFILE CHECKSUM: 6b094d6ec7e99a91f952bcac61b548d0a1be522c -COCOAPODS: 1.3.1 +COCOAPODS: 1.4.0 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 57fedcc..c64c164 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -7,145 +7,182 @@ objects = { /* Begin PBXBuildFile section */ - 0527C0E5D22450735307E084A8BAA96F /* Likes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27C2EC661758ADF057FF02E5DE7E21EE /* Likes.swift */; }; + 00F96C8B36A460C09122C67A0CCD1E11 /* InstagramLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8037846325D3BE7787D0815A0052115A /* InstagramLoginViewController.swift */; }; + 0139BCAAF0A6CE4CDA811DEBE64D6E63 /* LocationPicker-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D73222EE47F965264739F1B308C40749 /* LocationPicker-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; 097F32CAF71028B957E2C4CF0857CD34 /* Pods-ComtradeGramFinalUITests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 6233FD9354650EB139A9E6F199255AC7 /* Pods-ComtradeGramFinalUITests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0D4A40C1AA3B51D6339CB606629755C0 /* InstagramMedia.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED19F41C74969776DE6FEB23624D8F11 /* InstagramMedia.swift */; }; - 1B31817B781605AC5C54BE1F90804C33 /* InstagramResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 405FFCC627D63A5C8EED744B986B99B0 /* InstagramResponse.swift */; }; + 0EDA0271052D30E5D223D9291C6E98D4 /* LocationPicker-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = B93CA5281383870C8B002C50DB320905 /* LocationPicker-dummy.m */; }; + 0F44C64373D1D6BB0C07E919DE8B43E6 /* Tags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30CCDE246DC6AE8243A028A9AB90E214 /* Tags.swift */; }; + 150B6E4BDEF2F5BE30503072312697C5 /* Users.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8B1085EBD02F4B94856BA24442DFC91 /* Users.swift */; }; 220E209AC3EC1C1B913BCCD674729901 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; + 23F74A95837B053199B75F28238AD247 /* Location.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCFD3EB96F42F863BB2C8CC794A8F64 /* Location.swift */; }; 2402B0670DC241A13C8F917CF76D0206 /* Pods-ComtradeGramFinalTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 86C62026671E2C88B9BA337A058FFD93 /* Pods-ComtradeGramFinalTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 270A25D95A75607634A818A4230D2BED /* Dictionary+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA0772B2C8FF12BD8ADEE912F7FC7E2E /* Dictionary+SwiftInstagram.swift */; }; + 303F8538B20258E1D5B24B8DCADA6418 /* LocationSearchResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A5663669FBB5BA2AD84D4A02F72A3C6 /* LocationSearchResultsViewController.swift */; }; + 35576FE2893E084F4203FFE311A057DB /* Pods-ComtradeGramFinal-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = ADCB8062A627A00376019EA75609D3F0 /* Pods-ComtradeGramFinal-dummy.m */; }; 35642470519F0DD3713754980E6427F0 /* Pods-ComtradeGramFinalUITests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A0093C572B52EC6B29C22E74F17F4A7 /* Pods-ComtradeGramFinalUITests-dummy.m */; }; - 3A74166513B29255A74205844BCAD7DE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; - 407B312B0B3673C61934225658944838 /* Array+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBE3BF0F05A7664F1F42C695F80F9B47 /* Array+SwiftInstagram.swift */; }; - 4EE9D92E75872611409DD635D10F5515 /* InstagramUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EEECD67877547482FCACC81FE2E4CB1 /* InstagramUser.swift */; }; - 5E39C8152D56B32451096ACB8A487F69 /* Users.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1183E03AE537EADBF0C944414A6FF66 /* Users.swift */; }; - 652C8D62897955E73072E16D82DE425C /* InstagramRelationship.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3DE4CBDEA7D62688A0A6BB7BD2D699A /* InstagramRelationship.swift */; }; - 65F6362A5812EA164FCEB7821C7CA041 /* InstagramComment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59F760CDEB68A960E4267FDEA581533E /* InstagramComment.swift */; }; - 6A55961A65AE67D4A6579D9662EDDB63 /* Pods-ComtradeGramFinal-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 8DDFEC1CB32443ECA2E76A1F5A2E2096 /* Pods-ComtradeGramFinal-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 702CFD91F1F450895992F6FDC1304FB5 /* Data+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1B8940C6D2BAB0448B746CA3C4978EB /* Data+SwiftInstagram.swift */; }; - 71385E6DEF1A6E1F368303930DC77B0A /* Instagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20CAF73206390EABD283AF93DC8B9DFD /* Instagram.swift */; }; - 79E5666C7FC21F71EAD7D5DEF9E5033F /* Media.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0D081A4BF2C927FE77599076679B292 /* Media.swift */; }; - 7A7541C4902D42378EDB4F1FEC47C684 /* URL+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72E9DC0D32FA138583A43B70E0CA70E7 /* URL+SwiftInstagram.swift */; }; - 7D8D064B5DA638A911A3B53BB55972B1 /* Comments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B7CEC94E35675982F345EEAC558A72F /* Comments.swift */; }; - 81AF9F1A94D84A816E9F84648D283966 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; - 91B0671B8FECDBC3D66C1921D50B8971 /* Locations.swift in Sources */ = {isa = PBXBuildFile; fileRef = F512787EC210F96F4C2F104D9BB9B2F0 /* Locations.swift */; }; - 920B9A4599DFD409990071212F280F86 /* Pods-ComtradeGramFinal-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = ADCB8062A627A00376019EA75609D3F0 /* Pods-ComtradeGramFinal-dummy.m */; }; - 9B667DA0E7B6FDF11EDEFA7B4D8E856F /* InstagramScope.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB9A74F984A77EADD1AF2EB353B43A4B /* InstagramScope.swift */; }; - 9F78029007ADF150DF4F7FCC2AE9891B /* SwiftInstagram-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BFA146CD8872FB06C74E3238C7539E5 /* SwiftInstagram-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A2B196FF43AD8C1342FED458F25BD46B /* Relationships.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F663B530A1A4688ACC3B40CD9DA7348 /* Relationships.swift */; }; - B094D7527E999F5BEC10F3F577A4F8A6 /* InstagramTag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CF983BD43573BC6185CBD50745D474A /* InstagramTag.swift */; }; + 3A4744238E59176B10462C3FB0226FB9 /* Instagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91762D9A28FCD3303697C30273B20DED /* Instagram.swift */; }; + 3E2EEB8F11A76948506FE4923BD64286 /* Relationships.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE52EF3FB6A30EC06FD7DFB8189A81A1 /* Relationships.swift */; }; + 3F204C58C15128D22FA14C59241889EB /* InstagramLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E139277637185FDED2C2762BD3E7A33 /* InstagramLocation.swift */; }; + 6033313CAA69561C82844D25233AC72D /* SearchHistoryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99DBE52DB04CB4E45AB2EB0F2F817DDF /* SearchHistoryManager.swift */; }; + 62E6C86B5F4E79EFC5657D9E15F5DD70 /* Media.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5E0BF0EF7D087DA1AC2B6FB37AB634C /* Media.swift */; }; + 6F4692CEFF03EA40C85B4AF36EFD1092 /* InstagramTag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF53CB9A098A171B9906A25D72D1681 /* InstagramTag.swift */; }; + 7E88CB586C3022DCE67D389C11C33900 /* Likes.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA5915751A04A6CFA176F24DE8CC8AF1 /* Likes.swift */; }; + 8182BD80C91F01F93C964CF570A1EB22 /* InstagramRelationship.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85298E443B6724CBB793B4D5EE9F6637 /* InstagramRelationship.swift */; }; + 900866ABAEA73F8155565371637467A7 /* Array+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DFE5363F60D26EA1D9795471C5A9F20 /* Array+SwiftInstagram.swift */; }; + 9386FC6533090B5D9DBA7DEA4F356329 /* Locations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 555769B347B1FCEEF26A0600D888CB61 /* Locations.swift */; }; + 95746E78253C50DC572BE3F11B98D6FE /* InstagramComment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 592EC9EAB200B9FDE27D850AE5B16408 /* InstagramComment.swift */; }; + 97CB038F81C5E64081D61038BAF1D603 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; + 993594CE6B938B65DB75AE710BF38707 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; + 9982E62992E525E7973BB4A4695E2E37 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; + 9CB6385FCC102DEA70A913D98C1623FB /* InstagramUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F5DB1ABE6200886F78F4BB7942A1EDF /* InstagramUser.swift */; }; + 9F67E77889536E2BAD6FDB7C69AE7691 /* Optional+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = D821DA4C3EC7587859376693C5BF85DA /* Optional+SwiftInstagram.swift */; }; + 9F85B97442140DE41E6E43CA5468C070 /* InstagramResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0F44686FB8C953F35BF061383A641CB /* InstagramResponse.swift */; }; + A493853B243FAA58FC0F3E6601E3BC78 /* InstagramMedia.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DCCBE30E419C5CEB53AB8DA314E6B69 /* InstagramMedia.swift */; }; + AB2A2527FB20BDAED024495A039B47DC /* SwiftInstagram-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DBC6364F55588C7EF196664B1C98301 /* SwiftInstagram-dummy.m */; }; + B0C9122E6BFE7200340798095E2AA5EC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B99596250CFCA59D78FF8869DD858BDF /* Images.xcassets */; }; B7B0E953C47FE98E316DEF6120621075 /* Pods-ComtradeGramFinalTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6952E10C2562D093D2EE5A6B838D3499 /* Pods-ComtradeGramFinalTests-dummy.m */; }; - BD09B2BB8159C9527542F2465A12E973 /* InstagramError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5459F6107395C04B50BDFB4BB890A284 /* InstagramError.swift */; }; - CF9C6FC312FF32F0E4FBB3CFBEA9B818 /* SwiftInstagram-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 847F01E2B9C4CF9F45D954359A09BD60 /* SwiftInstagram-dummy.m */; }; - D0000A75039CE3596C55C26EA5588D82 /* InstagramLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E3EA29F8ED0420088E9D580E96F5E0F /* InstagramLocation.swift */; }; - DBF1BADB1DFA19262ED3BF75D03A85D8 /* KeychainSwiftDistrib.swift in Sources */ = {isa = PBXBuildFile; fileRef = 870B5B25E4BE092CAE645810C6F2783C /* KeychainSwiftDistrib.swift */; }; - EA5CCA5A93393E99D05F9681CFE8AE39 /* InstagramLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C7C08AABF9095F154313E01D560401D /* InstagramLoginViewController.swift */; }; - EFC4066853B1008A38B67F0B13E20DA1 /* Tags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DD3DFAB93B367B7CE7D352414031B2A /* Tags.swift */; }; + B8704D7D58C8CB99592B79B291F17E33 /* InstagramScope.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9FF7F8A806D4AAA5997C6545E3F967D /* InstagramScope.swift */; }; + BE313785DB0D335FA9EC60B5CDE7F27F /* Comments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EA931AC2F761C92BADE6195BE5920B7 /* Comments.swift */; }; + C6C0DECB2CCF25ACF8446C7E249E913C /* SwiftInstagram-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = A1F2252DE9D803C99DC6F0CCE8F86C7D /* SwiftInstagram-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D10BB1011BDA0F12FC603850B6034411 /* LocationPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063600D7A96105AA31C41B77508713DD /* LocationPickerViewController.swift */; }; + E4149840596E5186B6AFC47B1B6484A2 /* Pods-ComtradeGramFinal-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 8DDFEC1CB32443ECA2E76A1F5A2E2096 /* Pods-ComtradeGramFinal-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E7A09D5DBDD3A0284B7AE4D5F134EF7E /* KeychainSwiftDistrib.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F46EB82C6BCC13C8CED5957F68FC6A /* KeychainSwiftDistrib.swift */; }; + EB2D9E42BB8A1CE044D9377F60812CD6 /* URL+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8EAFAEEE6AE6F771C7823A9F50997C8 /* URL+SwiftInstagram.swift */; }; + ED8B487DDD3F9F6AE0EDCAEAB6C406AF /* LocationPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = BAF670456DAE247C84870FB925DF096A /* LocationPicker.h */; settings = {ATTRIBUTES = (Public, ); }; }; + EF23270C16A870B07DD8DE3AB15D2D99 /* InstagramError.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1A3EE86E9F990470B437C692155B2B9 /* InstagramError.swift */; }; F27A51D7590876360B21C8CFFB421E38 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; - F2EB987E1565BBA474D55F51B6D15EE8 /* Dictionary+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A1986B5C10A59919C8512EF8A8E3B8 /* Dictionary+SwiftInstagram.swift */; }; - F5F0CD706B709C06D191919A956C4A12 /* Optional+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABFAFE0117CC56867FEE50547A7CBE9A /* Optional+SwiftInstagram.swift */; }; + F68DEB6B2BCA1AF7A6BCD5F9A5E7732B /* Data+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD915AF928FB740071E56EF5832C70C0 /* Data+SwiftInstagram.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 784A1480F67CE7E911AF99393B53F188 /* PBXContainerItemProxy */ = { + 1025F922819FD1FF2D1A3C311F696293 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 01AE8BF7196BF9EFBE221A8F1155F203; + remoteGlobalIDString = 6270B7E559D4DAE3057E9BC530994201; + remoteInfo = LocationPicker; + }; + 8BF4168FC1B8D01E2CB67265D691B9BA /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; + proxyType = 1; + remoteGlobalIDString = C718B4B9A322B71550C47FB3D6392690; remoteInfo = SwiftInstagram; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 02BC0BCCDCA39772BCE8638E4AE87209 /* Pods-ComtradeGramFinal.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-ComtradeGramFinal.modulemap"; sourceTree = ""; }; + 03CD5EBA1F57157A483D6C99E503D441 /* SwiftInstagram.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SwiftInstagram.framework; path = SwiftInstagram.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 063600D7A96105AA31C41B77508713DD /* LocationPickerViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LocationPickerViewController.swift; path = LocationPicker/LocationPickerViewController.swift; sourceTree = ""; }; 0EC2ED43E4B8CDCA408471459E02B196 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0F1F98F44EA86EE775FF474BD9C41E50 /* Pods-ComtradeGramFinalTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ComtradeGramFinalTests-acknowledgements.plist"; sourceTree = ""; }; 1321DE22E844F58B6A60203CCAE5B325 /* Pods-ComtradeGramFinalUITests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ComtradeGramFinalUITests-acknowledgements.markdown"; sourceTree = ""; }; - 20CAF73206390EABD283AF93DC8B9DFD /* Instagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Instagram.swift; path = Sources/Instagram.swift; sourceTree = ""; }; - 27C2EC661758ADF057FF02E5DE7E21EE /* Likes.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Likes.swift; path = Sources/Endpoints/Likes.swift; sourceTree = ""; }; - 2B7CEC94E35675982F345EEAC558A72F /* Comments.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Comments.swift; path = Sources/Endpoints/Comments.swift; sourceTree = ""; }; + 136D343E3733E4F1625FA931D99F7321 /* SwiftInstagram-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SwiftInstagram-prefix.pch"; sourceTree = ""; }; + 1A5663669FBB5BA2AD84D4A02F72A3C6 /* LocationSearchResultsViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LocationSearchResultsViewController.swift; path = LocationPicker/LocationSearchResultsViewController.swift; sourceTree = ""; }; + 1E139277637185FDED2C2762BD3E7A33 /* InstagramLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramLocation.swift; path = Sources/Models/InstagramLocation.swift; sourceTree = ""; }; + 2DCCBE30E419C5CEB53AB8DA314E6B69 /* InstagramMedia.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramMedia.swift; path = Sources/Models/InstagramMedia.swift; sourceTree = ""; }; + 2DFE5363F60D26EA1D9795471C5A9F20 /* Array+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Array+SwiftInstagram.swift"; path = "Sources/Extensions/Array+SwiftInstagram.swift"; sourceTree = ""; }; + 30CCDE246DC6AE8243A028A9AB90E214 /* Tags.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Tags.swift; path = Sources/Endpoints/Tags.swift; sourceTree = ""; }; + 30F82AC640F9EDB2899AFE0E3CF03374 /* SwiftInstagram.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = SwiftInstagram.modulemap; sourceTree = ""; }; 3128216E6BFFEA437638008C85A96D45 /* Pods-ComtradeGramFinalUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinalUITests.release.xcconfig"; sourceTree = ""; }; - 31A1986B5C10A59919C8512EF8A8E3B8 /* Dictionary+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Dictionary+SwiftInstagram.swift"; path = "Sources/Extensions/Dictionary+SwiftInstagram.swift"; sourceTree = ""; }; 382869D374EA909FA3677ABAACED9E5D /* Pods-ComtradeGramFinal-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinal-frameworks.sh"; sourceTree = ""; }; - 3BFA146CD8872FB06C74E3238C7539E5 /* SwiftInstagram-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SwiftInstagram-umbrella.h"; sourceTree = ""; }; 3CF40225CE77019B9E9B4A9F8D7C9B80 /* Pods-ComtradeGramFinal.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinal.debug.xcconfig"; sourceTree = ""; }; - 3CF983BD43573BC6185CBD50745D474A /* InstagramTag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramTag.swift; path = Sources/Models/InstagramTag.swift; sourceTree = ""; }; - 405FFCC627D63A5C8EED744B986B99B0 /* InstagramResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramResponse.swift; path = Sources/Models/InstagramResponse.swift; sourceTree = ""; }; 4A0093C572B52EC6B29C22E74F17F4A7 /* Pods-ComtradeGramFinalUITests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ComtradeGramFinalUITests-dummy.m"; sourceTree = ""; }; + 4DBC6364F55588C7EF196664B1C98301 /* SwiftInstagram-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SwiftInstagram-dummy.m"; sourceTree = ""; }; + 4F5DB1ABE6200886F78F4BB7942A1EDF /* InstagramUser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramUser.swift; path = Sources/Models/InstagramUser.swift; sourceTree = ""; }; 5364C7ECB0B54F05C662D5BD7AECC715 /* Pods-ComtradeGramFinalTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-ComtradeGramFinalTests.modulemap"; sourceTree = ""; }; - 5459F6107395C04B50BDFB4BB890A284 /* InstagramError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramError.swift; path = Sources/Models/InstagramError.swift; sourceTree = ""; }; - 59F760CDEB68A960E4267FDEA581533E /* InstagramComment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramComment.swift; path = Sources/Models/InstagramComment.swift; sourceTree = ""; }; + 555769B347B1FCEEF26A0600D888CB61 /* Locations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Locations.swift; path = Sources/Endpoints/Locations.swift; sourceTree = ""; }; + 592EC9EAB200B9FDE27D850AE5B16408 /* InstagramComment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramComment.swift; path = Sources/Models/InstagramComment.swift; sourceTree = ""; }; 5A8D05B1D818E99A709030388A5C776B /* Pods-ComtradeGramFinal-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ComtradeGramFinal-acknowledgements.markdown"; sourceTree = ""; }; - 5EEECD67877547482FCACC81FE2E4CB1 /* InstagramUser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramUser.swift; path = Sources/Models/InstagramUser.swift; sourceTree = ""; }; + 5BF53CB9A098A171B9906A25D72D1681 /* InstagramTag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramTag.swift; path = Sources/Models/InstagramTag.swift; sourceTree = ""; }; + 5CA39579306E6DC0D8D65E7C90B39C8C /* Pods_ComtradeGramFinalTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinalTests.framework; path = "Pods-ComtradeGramFinalTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5EA931AC2F761C92BADE6195BE5920B7 /* Comments.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Comments.swift; path = Sources/Endpoints/Comments.swift; sourceTree = ""; }; 6233FD9354650EB139A9E6F199255AC7 /* Pods-ComtradeGramFinalUITests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-ComtradeGramFinalUITests-umbrella.h"; sourceTree = ""; }; 64CA6678FEF9FD10F1B362CAE896AB37 /* Pods-ComtradeGramFinalUITests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinalUITests-resources.sh"; sourceTree = ""; }; 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; 6952E10C2562D093D2EE5A6B838D3499 /* Pods-ComtradeGramFinalTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ComtradeGramFinalTests-dummy.m"; sourceTree = ""; }; 6BE16F74625E8874E57C596D69F3C091 /* Pods-ComtradeGramFinalUITests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-ComtradeGramFinalUITests.modulemap"; sourceTree = ""; }; - 72E9DC0D32FA138583A43B70E0CA70E7 /* URL+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+SwiftInstagram.swift"; path = "Sources/Extensions/URL+SwiftInstagram.swift"; sourceTree = ""; }; - 73386F2DC02441DE1EA8A8ABA86F8082 /* SwiftInstagram-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SwiftInstagram-prefix.pch"; sourceTree = ""; }; - 7DD3DFAB93B367B7CE7D352414031B2A /* Tags.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Tags.swift; path = Sources/Endpoints/Tags.swift; sourceTree = ""; }; + 6BFB400B0B0873D4F88A577069FED801 /* Pods_ComtradeGramFinalUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinalUITests.framework; path = "Pods-ComtradeGramFinalUITests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6C4051416667E661A1B1A55D4F412036 /* LocationPicker-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "LocationPicker-prefix.pch"; sourceTree = ""; }; 7E70F066EB661C08FCFECDCF8BB78E53 /* Pods-ComtradeGramFinalUITests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinalUITests-frameworks.sh"; sourceTree = ""; }; 7F9B42FE7D2F2682EB370C3E23121122 /* Pods-ComtradeGramFinalTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinalTests.release.xcconfig"; sourceTree = ""; }; - 847F01E2B9C4CF9F45D954359A09BD60 /* SwiftInstagram-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SwiftInstagram-dummy.m"; sourceTree = ""; }; + 8037846325D3BE7787D0815A0052115A /* InstagramLoginViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramLoginViewController.swift; path = Sources/Views/InstagramLoginViewController.swift; sourceTree = ""; }; + 818F6380538864D67E93DC14CAE154DA /* LocationPicker.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = LocationPicker.modulemap; sourceTree = ""; }; + 85298E443B6724CBB793B4D5EE9F6637 /* InstagramRelationship.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramRelationship.swift; path = Sources/Models/InstagramRelationship.swift; sourceTree = ""; }; 86C62026671E2C88B9BA337A058FFD93 /* Pods-ComtradeGramFinalTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-ComtradeGramFinalTests-umbrella.h"; sourceTree = ""; }; - 870B5B25E4BE092CAE645810C6F2783C /* KeychainSwiftDistrib.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = KeychainSwiftDistrib.swift; path = Sources/Helpers/KeychainSwiftDistrib.swift; sourceTree = ""; }; - 8B14DE1628BAD04E6A7F3DD81F4C84FE /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8C7C08AABF9095F154313E01D560401D /* InstagramLoginViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramLoginViewController.swift; path = Sources/Views/InstagramLoginViewController.swift; sourceTree = ""; }; + 89E232246B155B7476FC0FD57D975EFB /* Pods_ComtradeGramFinal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinal.framework; path = "Pods-ComtradeGramFinal.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 8DDFEC1CB32443ECA2E76A1F5A2E2096 /* Pods-ComtradeGramFinal-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-ComtradeGramFinal-umbrella.h"; sourceTree = ""; }; 8ED58EB51A048A153C2C85825C7291F1 /* Pods-ComtradeGramFinal-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ComtradeGramFinal-acknowledgements.plist"; sourceTree = ""; }; - 8F663B530A1A4688ACC3B40CD9DA7348 /* Relationships.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Relationships.swift; path = Sources/Endpoints/Relationships.swift; sourceTree = ""; }; - 937B8453C2192ADFD4BF8093DC6E3E86 /* Pods_ComtradeGramFinalTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinalTests.framework; path = "Pods-ComtradeGramFinalTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 8F9C1712580856D81A3C2C3970AEBBD8 /* LocationPicker.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = LocationPicker.xcconfig; sourceTree = ""; }; + 91762D9A28FCD3303697C30273B20DED /* Instagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Instagram.swift; path = Sources/Instagram.swift; sourceTree = ""; }; 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 99DBE52DB04CB4E45AB2EB0F2F817DDF /* SearchHistoryManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SearchHistoryManager.swift; path = LocationPicker/SearchHistoryManager.swift; sourceTree = ""; }; 9C6F566B5FA4830FDEECE6B316873BFF /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9E3EA29F8ED0420088E9D580E96F5E0F /* InstagramLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramLocation.swift; path = Sources/Models/InstagramLocation.swift; sourceTree = ""; }; - A0D081A4BF2C927FE77599076679B292 /* Media.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Media.swift; path = Sources/Endpoints/Media.swift; sourceTree = ""; }; + A1A3EE86E9F990470B437C692155B2B9 /* InstagramError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramError.swift; path = Sources/Models/InstagramError.swift; sourceTree = ""; }; A1E1A853F8A9B1B3130405C1490E2380 /* Pods-ComtradeGramFinalTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ComtradeGramFinalTests-acknowledgements.markdown"; sourceTree = ""; }; - A21140C5740B6CA37E34881B3D2DB30B /* Pods_ComtradeGramFinalUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinalUITests.framework; path = "Pods-ComtradeGramFinalUITests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + A1F2252DE9D803C99DC6F0CCE8F86C7D /* SwiftInstagram-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SwiftInstagram-umbrella.h"; sourceTree = ""; }; A5DB8FFEB1A5981DBC1D4A43D7731D0A /* Pods-ComtradeGramFinalUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinalUITests.debug.xcconfig"; sourceTree = ""; }; - AB9A74F984A77EADD1AF2EB353B43A4B /* InstagramScope.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramScope.swift; path = Sources/InstagramScope.swift; sourceTree = ""; }; - ABFAFE0117CC56867FEE50547A7CBE9A /* Optional+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Optional+SwiftInstagram.swift"; path = "Sources/Extensions/Optional+SwiftInstagram.swift"; sourceTree = ""; }; + A9B56404EE4D5DE22CFBE35B6C3F09B6 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; ADCB8062A627A00376019EA75609D3F0 /* Pods-ComtradeGramFinal-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ComtradeGramFinal-dummy.m"; sourceTree = ""; }; B0ABF5C3522F46B69ACB5FED61DB5606 /* Pods-ComtradeGramFinalUITests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ComtradeGramFinalUITests-acknowledgements.plist"; sourceTree = ""; }; B0D63E01ED81DA8497AF0E58E3DCD233 /* Pods-ComtradeGramFinalTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinalTests-frameworks.sh"; sourceTree = ""; }; B105EECE766BC05A2F36B9C72C1EC8F1 /* Pods-ComtradeGramFinal-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinal-resources.sh"; sourceTree = ""; }; + B530FC49F55FC39F428740386ADC80EA /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; B67487A4FAF59C996F6E79F61AD0B45A /* Pods-ComtradeGramFinal.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinal.release.xcconfig"; sourceTree = ""; }; - B90E1D212E0C0B6DEB78FDE317F8CB94 /* Pods_ComtradeGramFinal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinal.framework; path = "Pods-ComtradeGramFinal.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - C3DE4CBDEA7D62688A0A6BB7BD2D699A /* InstagramRelationship.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramRelationship.swift; path = Sources/Models/InstagramRelationship.swift; sourceTree = ""; }; - C68B46AE97921A208C66A0AFA6F11391 /* SwiftInstagram.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = SwiftInstagram.modulemap; sourceTree = ""; }; - CBE3BF0F05A7664F1F42C695F80F9B47 /* Array+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Array+SwiftInstagram.swift"; path = "Sources/Extensions/Array+SwiftInstagram.swift"; sourceTree = ""; }; - D1183E03AE537EADBF0C944414A6FF66 /* Users.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Users.swift; path = Sources/Endpoints/Users.swift; sourceTree = ""; }; + B93CA5281383870C8B002C50DB320905 /* LocationPicker-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "LocationPicker-dummy.m"; sourceTree = ""; }; + B99596250CFCA59D78FF8869DD858BDF /* Images.xcassets */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = LocationPicker/Images.xcassets; sourceTree = ""; }; + BAF670456DAE247C84870FB925DF096A /* LocationPicker.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LocationPicker.h; path = LocationPicker/LocationPicker.h; sourceTree = ""; }; + BD915AF928FB740071E56EF5832C70C0 /* Data+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Data+SwiftInstagram.swift"; path = "Sources/Extensions/Data+SwiftInstagram.swift"; sourceTree = ""; }; + CDCFD3EB96F42F863BB2C8CC794A8F64 /* Location.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Location.swift; path = LocationPicker/Location.swift; sourceTree = ""; }; + CE52EF3FB6A30EC06FD7DFB8189A81A1 /* Relationships.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Relationships.swift; path = Sources/Endpoints/Relationships.swift; sourceTree = ""; }; D177ADBC65430373F205689C1F03841B /* Pods-ComtradeGramFinalTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinalTests.debug.xcconfig"; sourceTree = ""; }; - E1B8940C6D2BAB0448B746CA3C4978EB /* Data+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Data+SwiftInstagram.swift"; path = "Sources/Extensions/Data+SwiftInstagram.swift"; sourceTree = ""; }; - ED19F41C74969776DE6FEB23624D8F11 /* InstagramMedia.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramMedia.swift; path = Sources/Models/InstagramMedia.swift; sourceTree = ""; }; + D73222EE47F965264739F1B308C40749 /* LocationPicker-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "LocationPicker-umbrella.h"; sourceTree = ""; }; + D821DA4C3EC7587859376693C5BF85DA /* Optional+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Optional+SwiftInstagram.swift"; path = "Sources/Extensions/Optional+SwiftInstagram.swift"; sourceTree = ""; }; + D8EAFAEEE6AE6F771C7823A9F50997C8 /* URL+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+SwiftInstagram.swift"; path = "Sources/Extensions/URL+SwiftInstagram.swift"; sourceTree = ""; }; + D9FF7F8A806D4AAA5997C6545E3F967D /* InstagramScope.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramScope.swift; path = Sources/InstagramScope.swift; sourceTree = ""; }; + E57CC4BD6A1E02EAD60677B804441D16 /* SwiftInstagram.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SwiftInstagram.xcconfig; sourceTree = ""; }; + ED4CA94CC9A0A0572D7C7937A7E74A68 /* LocationPicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = LocationPicker.framework; path = LocationPicker.framework; sourceTree = BUILT_PRODUCTS_DIR; }; EE5665149C7D372703711D2F23E10942 /* Pods-ComtradeGramFinalTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinalTests-resources.sh"; sourceTree = ""; }; - F12EF9679C96DA88762EE1ECE7CD28B5 /* SwiftInstagram.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SwiftInstagram.xcconfig; sourceTree = ""; }; - F512787EC210F96F4C2F104D9BB9B2F0 /* Locations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Locations.swift; path = Sources/Endpoints/Locations.swift; sourceTree = ""; }; - FA520C6BBF3CF86593E04C30D7BE2982 /* SwiftInstagram.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SwiftInstagram.framework; path = SwiftInstagram.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + F0F44686FB8C953F35BF061383A641CB /* InstagramResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramResponse.swift; path = Sources/Models/InstagramResponse.swift; sourceTree = ""; }; + F5E0BF0EF7D087DA1AC2B6FB37AB634C /* Media.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Media.swift; path = Sources/Endpoints/Media.swift; sourceTree = ""; }; + F8B1085EBD02F4B94856BA24442DFC91 /* Users.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Users.swift; path = Sources/Endpoints/Users.swift; sourceTree = ""; }; + F9F46EB82C6BCC13C8CED5957F68FC6A /* KeychainSwiftDistrib.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = KeychainSwiftDistrib.swift; path = Sources/Helpers/KeychainSwiftDistrib.swift; sourceTree = ""; }; + FA0772B2C8FF12BD8ADEE912F7FC7E2E /* Dictionary+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Dictionary+SwiftInstagram.swift"; path = "Sources/Extensions/Dictionary+SwiftInstagram.swift"; sourceTree = ""; }; + FA5915751A04A6CFA176F24DE8CC8AF1 /* Likes.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Likes.swift; path = Sources/Endpoints/Likes.swift; sourceTree = ""; }; FE0DFDC8DBE8AFC553E99BF12A903672 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 8268A53B3C79FFD32AF1DB65AC8CF869 /* Frameworks */ = { + 3498D7607F139346D732A39E436896F5 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 81AF9F1A94D84A816E9F84648D283966 /* Foundation.framework in Frameworks */, + 9982E62992E525E7973BB4A4695E2E37 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - D9D329CBFC0C30CA75A8A9A5D9A9F9FE /* Frameworks */ = { + 8232D65D255B4D2322BE640ED66EEF91 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F27A51D7590876360B21C8CFFB421E38 /* Foundation.framework in Frameworks */, + 993594CE6B938B65DB75AE710BF38707 /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 94866B4BD4AB763B8258EE680EB6660B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 97CB038F81C5E64081D61038BAF1D603 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - EC50314AA57FA309BCF868954C2942F0 /* Frameworks */ = { + D9D329CBFC0C30CA75A8A9A5D9A9F9FE /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3A74166513B29255A74205844BCAD7DE /* Foundation.framework in Frameworks */, + F27A51D7590876360B21C8CFFB421E38 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -178,22 +215,34 @@ path = "Target Support Files/Pods-ComtradeGramFinalTests"; sourceTree = ""; }; - 2F47B20CF8CC4CB295C5D8DDE49E840F /* Products */ = { + 1E03944030799284B721897308617FDC /* Support Files */ = { isa = PBXGroup; children = ( - B90E1D212E0C0B6DEB78FDE317F8CB94 /* Pods_ComtradeGramFinal.framework */, - 937B8453C2192ADFD4BF8093DC6E3E86 /* Pods_ComtradeGramFinalTests.framework */, - A21140C5740B6CA37E34881B3D2DB30B /* Pods_ComtradeGramFinalUITests.framework */, - FA520C6BBF3CF86593E04C30D7BE2982 /* SwiftInstagram.framework */, + B530FC49F55FC39F428740386ADC80EA /* Info.plist */, + 30F82AC640F9EDB2899AFE0E3CF03374 /* SwiftInstagram.modulemap */, + E57CC4BD6A1E02EAD60677B804441D16 /* SwiftInstagram.xcconfig */, + 4DBC6364F55588C7EF196664B1C98301 /* SwiftInstagram-dummy.m */, + 136D343E3733E4F1625FA931D99F7321 /* SwiftInstagram-prefix.pch */, + A1F2252DE9D803C99DC6F0CCE8F86C7D /* SwiftInstagram-umbrella.h */, ); - name = Products; + name = "Support Files"; + path = "../Target Support Files/SwiftInstagram"; + sourceTree = ""; + }; + 3C0460277FA43257BCD6DA1DCAF9AC18 /* Pods */ = { + isa = PBXGroup; + children = ( + 7F9D01770F7998CA997559ECD076F75E /* LocationPicker */, + 52866A523B922A856DE7B1B0AC63FE54 /* SwiftInstagram */, + ); + name = Pods; sourceTree = ""; }; - 68472651F7683FF944000A598774F88C /* SwiftInstagram */ = { + 52866A523B922A856DE7B1B0AC63FE54 /* SwiftInstagram */ = { isa = PBXGroup; children = ( - 7BD13335F4D10ECAFC072EBFB01224B4 /* Core */, - 9F2960BE71B14BA07664F9E53C5A0F00 /* Support Files */, + 8ACFA231554B46770B9DE983DFFF03E4 /* Core */, + 1E03944030799284B721897308617FDC /* Support Files */, ); name = SwiftInstagram; path = SwiftInstagram; @@ -217,46 +266,61 @@ path = "Target Support Files/Pods-ComtradeGramFinalUITests"; sourceTree = ""; }; - 7BD13335F4D10ECAFC072EBFB01224B4 /* Core */ = { + 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( - CBE3BF0F05A7664F1F42C695F80F9B47 /* Array+SwiftInstagram.swift */, - 2B7CEC94E35675982F345EEAC558A72F /* Comments.swift */, - E1B8940C6D2BAB0448B746CA3C4978EB /* Data+SwiftInstagram.swift */, - 31A1986B5C10A59919C8512EF8A8E3B8 /* Dictionary+SwiftInstagram.swift */, - 20CAF73206390EABD283AF93DC8B9DFD /* Instagram.swift */, - 59F760CDEB68A960E4267FDEA581533E /* InstagramComment.swift */, - 5459F6107395C04B50BDFB4BB890A284 /* InstagramError.swift */, - 9E3EA29F8ED0420088E9D580E96F5E0F /* InstagramLocation.swift */, - 8C7C08AABF9095F154313E01D560401D /* InstagramLoginViewController.swift */, - ED19F41C74969776DE6FEB23624D8F11 /* InstagramMedia.swift */, - C3DE4CBDEA7D62688A0A6BB7BD2D699A /* InstagramRelationship.swift */, - 405FFCC627D63A5C8EED744B986B99B0 /* InstagramResponse.swift */, - AB9A74F984A77EADD1AF2EB353B43A4B /* InstagramScope.swift */, - 3CF983BD43573BC6185CBD50745D474A /* InstagramTag.swift */, - 5EEECD67877547482FCACC81FE2E4CB1 /* InstagramUser.swift */, - 870B5B25E4BE092CAE645810C6F2783C /* KeychainSwiftDistrib.swift */, - 27C2EC661758ADF057FF02E5DE7E21EE /* Likes.swift */, - F512787EC210F96F4C2F104D9BB9B2F0 /* Locations.swift */, - A0D081A4BF2C927FE77599076679B292 /* Media.swift */, - ABFAFE0117CC56867FEE50547A7CBE9A /* Optional+SwiftInstagram.swift */, - 8F663B530A1A4688ACC3B40CD9DA7348 /* Relationships.swift */, - 7DD3DFAB93B367B7CE7D352414031B2A /* Tags.swift */, - 72E9DC0D32FA138583A43B70E0CA70E7 /* URL+SwiftInstagram.swift */, - D1183E03AE537EADBF0C944414A6FF66 /* Users.swift */, + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, + BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */, + 3C0460277FA43257BCD6DA1DCAF9AC18 /* Pods */, + AD1EB7E97ACE0D87B177A9D537F18568 /* Products */, + B2AAB03E2C9F773E564B2F9C38FC1A2D /* Targets Support Files */, ); - name = Core; sourceTree = ""; }; - 7DB346D0F39D3F0E887471402A8071AB = { + 7F9D01770F7998CA997559ECD076F75E /* LocationPicker */ = { isa = PBXGroup; children = ( - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, - BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */, - E3552806942FC55343978980D9F541EB /* Pods */, - 2F47B20CF8CC4CB295C5D8DDE49E840F /* Products */, - B2AAB03E2C9F773E564B2F9C38FC1A2D /* Targets Support Files */, + CDCFD3EB96F42F863BB2C8CC794A8F64 /* Location.swift */, + BAF670456DAE247C84870FB925DF096A /* LocationPicker.h */, + 063600D7A96105AA31C41B77508713DD /* LocationPickerViewController.swift */, + 1A5663669FBB5BA2AD84D4A02F72A3C6 /* LocationSearchResultsViewController.swift */, + 99DBE52DB04CB4E45AB2EB0F2F817DDF /* SearchHistoryManager.swift */, + F2BD2C4B0718E4F529C3354531059101 /* Resources */, + FD30DF2033CF26EC18EBA35943AA2D13 /* Support Files */, + ); + name = LocationPicker; + path = LocationPicker; + sourceTree = ""; + }; + 8ACFA231554B46770B9DE983DFFF03E4 /* Core */ = { + isa = PBXGroup; + children = ( + 2DFE5363F60D26EA1D9795471C5A9F20 /* Array+SwiftInstagram.swift */, + 5EA931AC2F761C92BADE6195BE5920B7 /* Comments.swift */, + BD915AF928FB740071E56EF5832C70C0 /* Data+SwiftInstagram.swift */, + FA0772B2C8FF12BD8ADEE912F7FC7E2E /* Dictionary+SwiftInstagram.swift */, + 91762D9A28FCD3303697C30273B20DED /* Instagram.swift */, + 592EC9EAB200B9FDE27D850AE5B16408 /* InstagramComment.swift */, + A1A3EE86E9F990470B437C692155B2B9 /* InstagramError.swift */, + 1E139277637185FDED2C2762BD3E7A33 /* InstagramLocation.swift */, + 8037846325D3BE7787D0815A0052115A /* InstagramLoginViewController.swift */, + 2DCCBE30E419C5CEB53AB8DA314E6B69 /* InstagramMedia.swift */, + 85298E443B6724CBB793B4D5EE9F6637 /* InstagramRelationship.swift */, + F0F44686FB8C953F35BF061383A641CB /* InstagramResponse.swift */, + D9FF7F8A806D4AAA5997C6545E3F967D /* InstagramScope.swift */, + 5BF53CB9A098A171B9906A25D72D1681 /* InstagramTag.swift */, + 4F5DB1ABE6200886F78F4BB7942A1EDF /* InstagramUser.swift */, + F9F46EB82C6BCC13C8CED5957F68FC6A /* KeychainSwiftDistrib.swift */, + FA5915751A04A6CFA176F24DE8CC8AF1 /* Likes.swift */, + 555769B347B1FCEEF26A0600D888CB61 /* Locations.swift */, + F5E0BF0EF7D087DA1AC2B6FB37AB634C /* Media.swift */, + D821DA4C3EC7587859376693C5BF85DA /* Optional+SwiftInstagram.swift */, + CE52EF3FB6A30EC06FD7DFB8189A81A1 /* Relationships.swift */, + 30CCDE246DC6AE8243A028A9AB90E214 /* Tags.swift */, + D8EAFAEEE6AE6F771C7823A9F50997C8 /* URL+SwiftInstagram.swift */, + F8B1085EBD02F4B94856BA24442DFC91 /* Users.swift */, ); + name = Core; sourceTree = ""; }; 938D12F75180B6394B7C1DDDCBE51923 /* Pods-ComtradeGramFinal */ = { @@ -277,18 +341,16 @@ path = "Target Support Files/Pods-ComtradeGramFinal"; sourceTree = ""; }; - 9F2960BE71B14BA07664F9E53C5A0F00 /* Support Files */ = { + AD1EB7E97ACE0D87B177A9D537F18568 /* Products */ = { isa = PBXGroup; children = ( - 8B14DE1628BAD04E6A7F3DD81F4C84FE /* Info.plist */, - C68B46AE97921A208C66A0AFA6F11391 /* SwiftInstagram.modulemap */, - F12EF9679C96DA88762EE1ECE7CD28B5 /* SwiftInstagram.xcconfig */, - 847F01E2B9C4CF9F45D954359A09BD60 /* SwiftInstagram-dummy.m */, - 73386F2DC02441DE1EA8A8ABA86F8082 /* SwiftInstagram-prefix.pch */, - 3BFA146CD8872FB06C74E3238C7539E5 /* SwiftInstagram-umbrella.h */, + ED4CA94CC9A0A0572D7C7937A7E74A68 /* LocationPicker.framework */, + 89E232246B155B7476FC0FD57D975EFB /* Pods_ComtradeGramFinal.framework */, + 5CA39579306E6DC0D8D65E7C90B39C8C /* Pods_ComtradeGramFinalTests.framework */, + 6BFB400B0B0873D4F88A577069FED801 /* Pods_ComtradeGramFinalUITests.framework */, + 03CD5EBA1F57157A483D6C99E503D441 /* SwiftInstagram.framework */, ); - name = "Support Files"; - path = "../Target Support Files/SwiftInstagram"; + name = Products; sourceTree = ""; }; B2AAB03E2C9F773E564B2F9C38FC1A2D /* Targets Support Files */ = { @@ -317,22 +379,45 @@ name = iOS; sourceTree = ""; }; - E3552806942FC55343978980D9F541EB /* Pods */ = { + F2BD2C4B0718E4F529C3354531059101 /* Resources */ = { isa = PBXGroup; children = ( - 68472651F7683FF944000A598774F88C /* SwiftInstagram */, + B99596250CFCA59D78FF8869DD858BDF /* Images.xcassets */, ); - name = Pods; + name = Resources; + sourceTree = ""; + }; + FD30DF2033CF26EC18EBA35943AA2D13 /* Support Files */ = { + isa = PBXGroup; + children = ( + A9B56404EE4D5DE22CFBE35B6C3F09B6 /* Info.plist */, + 818F6380538864D67E93DC14CAE154DA /* LocationPicker.modulemap */, + 8F9C1712580856D81A3C2C3970AEBBD8 /* LocationPicker.xcconfig */, + B93CA5281383870C8B002C50DB320905 /* LocationPicker-dummy.m */, + 6C4051416667E661A1B1A55D4F412036 /* LocationPicker-prefix.pch */, + D73222EE47F965264739F1B308C40749 /* LocationPicker-umbrella.h */, + ); + name = "Support Files"; + path = "../Target Support Files/LocationPicker"; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 4B9DE721C926075E8E26DC5C225F1416 /* Headers */ = { + 4D46A5D638301B7530184DF41ED156EF /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 0139BCAAF0A6CE4CDA811DEBE64D6E63 /* LocationPicker-umbrella.h in Headers */, + ED8B487DDD3F9F6AE0EDCAEAB6C406AF /* LocationPicker.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 915A96A1E7035C29FEB5DF2AA902A8AB /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 6A55961A65AE67D4A6579D9662EDDB63 /* Pods-ComtradeGramFinal-umbrella.h in Headers */, + C6C0DECB2CCF25ACF8446C7E249E913C /* SwiftInstagram-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -344,11 +429,11 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DF83E5647BB7683EE524AC02BF449F61 /* Headers */ = { + 9B93C0482DB10C615065020F6D2A5D10 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 9F78029007ADF150DF4F7FCC2AE9891B /* SwiftInstagram-umbrella.h in Headers */, + E4149840596E5186B6AFC47B1B6484A2 /* Pods-ComtradeGramFinal-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -363,38 +448,39 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 01AE8BF7196BF9EFBE221A8F1155F203 /* SwiftInstagram */ = { + 49558A954C0BA7E65B4A64143BE8B71C /* Pods-ComtradeGramFinalTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 413DF85F28EA1DC7025DCCBFA1C753CF /* Build configuration list for PBXNativeTarget "SwiftInstagram" */; + buildConfigurationList = 227E16014ADF37215B26365AF6BDB52C /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinalTests" */; buildPhases = ( - 0F1F672A2FF8041DE42344BE4E9EB915 /* Sources */, - EC50314AA57FA309BCF868954C2942F0 /* Frameworks */, - DF83E5647BB7683EE524AC02BF449F61 /* Headers */, + AC12AD64F01804738F15A2086D49D03E /* Sources */, + F2FA92950BB4C76D252E566B71D60280 /* Frameworks */, + 96D71A32DD94710BE080611F05872049 /* Headers */, ); buildRules = ( ); dependencies = ( ); - name = SwiftInstagram; - productName = SwiftInstagram; - productReference = FA520C6BBF3CF86593E04C30D7BE2982 /* SwiftInstagram.framework */; + name = "Pods-ComtradeGramFinalTests"; + productName = "Pods-ComtradeGramFinalTests"; + productReference = 5CA39579306E6DC0D8D65E7C90B39C8C /* Pods_ComtradeGramFinalTests.framework */; productType = "com.apple.product-type.framework"; }; - 49558A954C0BA7E65B4A64143BE8B71C /* Pods-ComtradeGramFinalTests */ = { + 6270B7E559D4DAE3057E9BC530994201 /* LocationPicker */ = { isa = PBXNativeTarget; - buildConfigurationList = 227E16014ADF37215B26365AF6BDB52C /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinalTests" */; + buildConfigurationList = 9229B3CF2A2625DEA2BD95319565B62F /* Build configuration list for PBXNativeTarget "LocationPicker" */; buildPhases = ( - AC12AD64F01804738F15A2086D49D03E /* Sources */, - F2FA92950BB4C76D252E566B71D60280 /* Frameworks */, - 96D71A32DD94710BE080611F05872049 /* Headers */, + 3C27784F0D8A3243AE35CE2BB11BC250 /* Sources */, + 94866B4BD4AB763B8258EE680EB6660B /* Frameworks */, + 4D46A5D638301B7530184DF41ED156EF /* Headers */, + 2D7FD623EBAA9B5A8B4A1BEACCCD3EBC /* Resources */, ); buildRules = ( ); dependencies = ( ); - name = "Pods-ComtradeGramFinalTests"; - productName = "Pods-ComtradeGramFinalTests"; - productReference = 937B8453C2192ADFD4BF8093DC6E3E86 /* Pods_ComtradeGramFinalTests.framework */; + name = LocationPicker; + productName = LocationPicker; + productReference = ED4CA94CC9A0A0572D7C7937A7E74A68 /* LocationPicker.framework */; productType = "com.apple.product-type.framework"; }; 85B9478DEB09EF6E2DF3555E8F6527C9 /* Pods-ComtradeGramFinalUITests */ = { @@ -411,25 +497,43 @@ ); name = "Pods-ComtradeGramFinalUITests"; productName = "Pods-ComtradeGramFinalUITests"; - productReference = A21140C5740B6CA37E34881B3D2DB30B /* Pods_ComtradeGramFinalUITests.framework */; + productReference = 6BFB400B0B0873D4F88A577069FED801 /* Pods_ComtradeGramFinalUITests.framework */; productType = "com.apple.product-type.framework"; }; - 8E868E2A2F8101716FCEF4E97025335D /* Pods-ComtradeGramFinal */ = { + C718B4B9A322B71550C47FB3D6392690 /* SwiftInstagram */ = { isa = PBXNativeTarget; - buildConfigurationList = 47D9B0073F437A94CAAC3A7C9C8C2979 /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinal" */; + buildConfigurationList = 9455150A84C133D0401928B0DAE01FB4 /* Build configuration list for PBXNativeTarget "SwiftInstagram" */; buildPhases = ( - A6223B06C6EFE683E03FB22789F0F75D /* Sources */, - 8268A53B3C79FFD32AF1DB65AC8CF869 /* Frameworks */, - 4B9DE721C926075E8E26DC5C225F1416 /* Headers */, + FCC80C0696EFDC8BB7E514D51B77ABD5 /* Sources */, + 8232D65D255B4D2322BE640ED66EEF91 /* Frameworks */, + 915A96A1E7035C29FEB5DF2AA902A8AB /* Headers */, ); buildRules = ( ); dependencies = ( - A37A33FFBC3F3D177C6AAB20365DE203 /* PBXTargetDependency */, + ); + name = SwiftInstagram; + productName = SwiftInstagram; + productReference = 03CD5EBA1F57157A483D6C99E503D441 /* SwiftInstagram.framework */; + productType = "com.apple.product-type.framework"; + }; + EACBF4FCE0593F78ABD4F86B18C850C1 /* Pods-ComtradeGramFinal */ = { + isa = PBXNativeTarget; + buildConfigurationList = C4103C5778FE452967A0B94DC2C7DC07 /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinal" */; + buildPhases = ( + A68F8A6C007E56CAE11B9249287ECDC7 /* Sources */, + 3498D7607F139346D732A39E436896F5 /* Frameworks */, + 9B93C0482DB10C615065020F6D2A5D10 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + DA547F0A2A4258FC6CB670F1A2415C9E /* PBXTargetDependency */, + 47BAD29102165A91909A8834485CF2E2 /* PBXTargetDependency */, ); name = "Pods-ComtradeGramFinal"; productName = "Pods-ComtradeGramFinal"; - productReference = B90E1D212E0C0B6DEB78FDE317F8CB94 /* Pods_ComtradeGramFinal.framework */; + productReference = 89E232246B155B7476FC0FD57D975EFB /* Pods_ComtradeGramFinal.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -449,18 +553,30 @@ en, ); mainGroup = 7DB346D0F39D3F0E887471402A8071AB; - productRefGroup = 2F47B20CF8CC4CB295C5D8DDE49E840F /* Products */; + productRefGroup = AD1EB7E97ACE0D87B177A9D537F18568 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 8E868E2A2F8101716FCEF4E97025335D /* Pods-ComtradeGramFinal */, + 6270B7E559D4DAE3057E9BC530994201 /* LocationPicker */, + EACBF4FCE0593F78ABD4F86B18C850C1 /* Pods-ComtradeGramFinal */, 49558A954C0BA7E65B4A64143BE8B71C /* Pods-ComtradeGramFinalTests */, 85B9478DEB09EF6E2DF3555E8F6527C9 /* Pods-ComtradeGramFinalUITests */, - 01AE8BF7196BF9EFBE221A8F1155F203 /* SwiftInstagram */, + C718B4B9A322B71550C47FB3D6392690 /* SwiftInstagram */, ); }; /* End PBXProject section */ +/* Begin PBXResourcesBuildPhase section */ + 2D7FD623EBAA9B5A8B4A1BEACCCD3EBC /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B0C9122E6BFE7200340798095E2AA5EC /* Images.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 056D9D65E4F71C0D92BD5136E8F9CACE /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -470,43 +586,23 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 0F1F672A2FF8041DE42344BE4E9EB915 /* Sources */ = { + 3C27784F0D8A3243AE35CE2BB11BC250 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 407B312B0B3673C61934225658944838 /* Array+SwiftInstagram.swift in Sources */, - 7D8D064B5DA638A911A3B53BB55972B1 /* Comments.swift in Sources */, - 702CFD91F1F450895992F6FDC1304FB5 /* Data+SwiftInstagram.swift in Sources */, - F2EB987E1565BBA474D55F51B6D15EE8 /* Dictionary+SwiftInstagram.swift in Sources */, - 71385E6DEF1A6E1F368303930DC77B0A /* Instagram.swift in Sources */, - 65F6362A5812EA164FCEB7821C7CA041 /* InstagramComment.swift in Sources */, - BD09B2BB8159C9527542F2465A12E973 /* InstagramError.swift in Sources */, - D0000A75039CE3596C55C26EA5588D82 /* InstagramLocation.swift in Sources */, - EA5CCA5A93393E99D05F9681CFE8AE39 /* InstagramLoginViewController.swift in Sources */, - 0D4A40C1AA3B51D6339CB606629755C0 /* InstagramMedia.swift in Sources */, - 652C8D62897955E73072E16D82DE425C /* InstagramRelationship.swift in Sources */, - 1B31817B781605AC5C54BE1F90804C33 /* InstagramResponse.swift in Sources */, - 9B667DA0E7B6FDF11EDEFA7B4D8E856F /* InstagramScope.swift in Sources */, - B094D7527E999F5BEC10F3F577A4F8A6 /* InstagramTag.swift in Sources */, - 4EE9D92E75872611409DD635D10F5515 /* InstagramUser.swift in Sources */, - DBF1BADB1DFA19262ED3BF75D03A85D8 /* KeychainSwiftDistrib.swift in Sources */, - 0527C0E5D22450735307E084A8BAA96F /* Likes.swift in Sources */, - 91B0671B8FECDBC3D66C1921D50B8971 /* Locations.swift in Sources */, - 79E5666C7FC21F71EAD7D5DEF9E5033F /* Media.swift in Sources */, - F5F0CD706B709C06D191919A956C4A12 /* Optional+SwiftInstagram.swift in Sources */, - A2B196FF43AD8C1342FED458F25BD46B /* Relationships.swift in Sources */, - CF9C6FC312FF32F0E4FBB3CFBEA9B818 /* SwiftInstagram-dummy.m in Sources */, - EFC4066853B1008A38B67F0B13E20DA1 /* Tags.swift in Sources */, - 7A7541C4902D42378EDB4F1FEC47C684 /* URL+SwiftInstagram.swift in Sources */, - 5E39C8152D56B32451096ACB8A487F69 /* Users.swift in Sources */, + 23F74A95837B053199B75F28238AD247 /* Location.swift in Sources */, + 0EDA0271052D30E5D223D9291C6E98D4 /* LocationPicker-dummy.m in Sources */, + D10BB1011BDA0F12FC603850B6034411 /* LocationPickerViewController.swift in Sources */, + 303F8538B20258E1D5B24B8DCADA6418 /* LocationSearchResultsViewController.swift in Sources */, + 6033313CAA69561C82844D25233AC72D /* SearchHistoryManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - A6223B06C6EFE683E03FB22789F0F75D /* Sources */ = { + A68F8A6C007E56CAE11B9249287ECDC7 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 920B9A4599DFD409990071212F280F86 /* Pods-ComtradeGramFinal-dummy.m in Sources */, + 35576FE2893E084F4203FFE311A057DB /* Pods-ComtradeGramFinal-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -518,14 +614,52 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FCC80C0696EFDC8BB7E514D51B77ABD5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 900866ABAEA73F8155565371637467A7 /* Array+SwiftInstagram.swift in Sources */, + BE313785DB0D335FA9EC60B5CDE7F27F /* Comments.swift in Sources */, + F68DEB6B2BCA1AF7A6BCD5F9A5E7732B /* Data+SwiftInstagram.swift in Sources */, + 270A25D95A75607634A818A4230D2BED /* Dictionary+SwiftInstagram.swift in Sources */, + 3A4744238E59176B10462C3FB0226FB9 /* Instagram.swift in Sources */, + 95746E78253C50DC572BE3F11B98D6FE /* InstagramComment.swift in Sources */, + EF23270C16A870B07DD8DE3AB15D2D99 /* InstagramError.swift in Sources */, + 3F204C58C15128D22FA14C59241889EB /* InstagramLocation.swift in Sources */, + 00F96C8B36A460C09122C67A0CCD1E11 /* InstagramLoginViewController.swift in Sources */, + A493853B243FAA58FC0F3E6601E3BC78 /* InstagramMedia.swift in Sources */, + 8182BD80C91F01F93C964CF570A1EB22 /* InstagramRelationship.swift in Sources */, + 9F85B97442140DE41E6E43CA5468C070 /* InstagramResponse.swift in Sources */, + B8704D7D58C8CB99592B79B291F17E33 /* InstagramScope.swift in Sources */, + 6F4692CEFF03EA40C85B4AF36EFD1092 /* InstagramTag.swift in Sources */, + 9CB6385FCC102DEA70A913D98C1623FB /* InstagramUser.swift in Sources */, + E7A09D5DBDD3A0284B7AE4D5F134EF7E /* KeychainSwiftDistrib.swift in Sources */, + 7E88CB586C3022DCE67D389C11C33900 /* Likes.swift in Sources */, + 9386FC6533090B5D9DBA7DEA4F356329 /* Locations.swift in Sources */, + 62E6C86B5F4E79EFC5657D9E15F5DD70 /* Media.swift in Sources */, + 9F67E77889536E2BAD6FDB7C69AE7691 /* Optional+SwiftInstagram.swift in Sources */, + 3E2EEB8F11A76948506FE4923BD64286 /* Relationships.swift in Sources */, + AB2A2527FB20BDAED024495A039B47DC /* SwiftInstagram-dummy.m in Sources */, + 0F44C64373D1D6BB0C07E919DE8B43E6 /* Tags.swift in Sources */, + EB2D9E42BB8A1CE044D9377F60812CD6 /* URL+SwiftInstagram.swift in Sources */, + 150B6E4BDEF2F5BE30503072312697C5 /* Users.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - A37A33FFBC3F3D177C6AAB20365DE203 /* PBXTargetDependency */ = { + 47BAD29102165A91909A8834485CF2E2 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = SwiftInstagram; - target = 01AE8BF7196BF9EFBE221A8F1155F203 /* SwiftInstagram */; - targetProxy = 784A1480F67CE7E911AF99393B53F188 /* PBXContainerItemProxy */; + target = C718B4B9A322B71550C47FB3D6392690 /* SwiftInstagram */; + targetProxy = 8BF4168FC1B8D01E2CB67265D691B9BA /* PBXContainerItemProxy */; + }; + DA547F0A2A4258FC6CB670F1A2415C9E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = LocationPicker; + target = 6270B7E559D4DAE3057E9BC530994201 /* LocationPicker */; + targetProxy = 1025F922819FD1FF2D1A3C311F696293 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -622,6 +756,40 @@ }; name = Debug; }; + 43DA719C8684C2D4D4A02CE86591CDA5 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = B67487A4FAF59C996F6E79F61AD0B45A /* Pods-ComtradeGramFinal.release.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Target Support Files/Pods-ComtradeGramFinal/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.2; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = Pods_ComtradeGramFinal; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; 552DED13A8BC3B69A29CF51D822F6EA7 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 7F9B42FE7D2F2682EB370C3E23121122 /* Pods-ComtradeGramFinalTests.release.xcconfig */; @@ -687,9 +855,9 @@ }; name = Debug; }; - 687E87373AB77477E0381A075B80CD35 /* Debug */ = { + 82A14D042E0DCB10692E3CC9374EAFC9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3CF40225CE77019B9E9B4A9F8D7C9B80 /* Pods-ComtradeGramFinal.debug.xcconfig */; + baseConfigurationReference = E57CC4BD6A1E02EAD60677B804441D16 /* SwiftInstagram.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -700,30 +868,27 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-ComtradeGramFinal/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/SwiftInstagram/SwiftInstagram-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/SwiftInstagram/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.2; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_ComtradeGramFinal; + MODULEMAP_FILE = "Target Support Files/SwiftInstagram/SwiftInstagram.modulemap"; + PRODUCT_NAME = SwiftInstagram; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 7A1B9C47191AAAB2777DC05C021F2A13 /* Release */ = { + 89650BD86CC7D20546DC7A1AAB21F279 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F12EF9679C96DA88762EE1ECE7CD28B5 /* SwiftInstagram.xcconfig */; + baseConfigurationReference = E57CC4BD6A1E02EAD60677B804441D16 /* SwiftInstagram.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -808,9 +973,9 @@ }; name = Release; }; - 9258D6A7E2C144D5A6082DC02CC1DBEC /* Release */ = { + B6CF70CCA567D68FCB34CD320AEB0309 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B67487A4FAF59C996F6E79F61AD0B45A /* Pods-ComtradeGramFinal.release.xcconfig */; + baseConfigurationReference = 8F9C1712580856D81A3C2C3970AEBBD8 /* LocationPicker.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -821,20 +986,50 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-ComtradeGramFinal/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/LocationPicker/LocationPicker-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/LocationPicker/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/LocationPicker/LocationPicker.modulemap"; + PRODUCT_NAME = LocationPicker; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + E051149295BA0A54BE40A91B864F135E /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3128216E6BFFEA437638008C85A96D45 /* Pods-ComtradeGramFinalUITests.release.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Target Support Files/Pods-ComtradeGramFinalUITests/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal.modulemap"; + MODULEMAP_FILE = "Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.modulemap"; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_ComtradeGramFinal; + PRODUCT_NAME = Pods_ComtradeGramFinalUITests; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -842,9 +1037,9 @@ }; name = Release; }; - C716DA104DFC4F4C1E6CA1249679CC2E /* Debug */ = { + EB4FF940435E14452C3B31BCE26F6B30 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F12EF9679C96DA88762EE1ECE7CD28B5 /* SwiftInstagram.xcconfig */; + baseConfigurationReference = 3CF40225CE77019B9E9B4A9F8D7C9B80 /* Pods-ComtradeGramFinal.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -855,27 +1050,30 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/SwiftInstagram/SwiftInstagram-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/SwiftInstagram/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-ComtradeGramFinal/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/SwiftInstagram/SwiftInstagram.modulemap"; - PRODUCT_NAME = SwiftInstagram; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = Pods_ComtradeGramFinal; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - E051149295BA0A54BE40A91B864F135E /* Release */ = { + EED2A1AA8908366F91FCC019470E69F2 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3128216E6BFFEA437638008C85A96D45 /* Pods-ComtradeGramFinalUITests.release.xcconfig */; + baseConfigurationReference = 8F9C1712580856D81A3C2C3970AEBBD8 /* LocationPicker.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -886,19 +1084,18 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-ComtradeGramFinalUITests/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/LocationPicker/LocationPicker-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/LocationPicker/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.2; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_ComtradeGramFinalUITests; + MODULEMAP_FILE = "Target Support Files/LocationPicker/LocationPicker.modulemap"; + PRODUCT_NAME = LocationPicker; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -927,29 +1124,38 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 413DF85F28EA1DC7025DCCBFA1C753CF /* Build configuration list for PBXNativeTarget "SwiftInstagram" */ = { + 624F405AE074B968980E4BD6B0394141 /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinalUITests" */ = { isa = XCConfigurationList; buildConfigurations = ( - C716DA104DFC4F4C1E6CA1249679CC2E /* Debug */, - 7A1B9C47191AAAB2777DC05C021F2A13 /* Release */, + 3BACA1D3B2DAE5A9E30131E508AE7234 /* Debug */, + E051149295BA0A54BE40A91B864F135E /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 47D9B0073F437A94CAAC3A7C9C8C2979 /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinal" */ = { + 9229B3CF2A2625DEA2BD95319565B62F /* Build configuration list for PBXNativeTarget "LocationPicker" */ = { isa = XCConfigurationList; buildConfigurations = ( - 687E87373AB77477E0381A075B80CD35 /* Debug */, - 9258D6A7E2C144D5A6082DC02CC1DBEC /* Release */, + B6CF70CCA567D68FCB34CD320AEB0309 /* Debug */, + EED2A1AA8908366F91FCC019470E69F2 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 624F405AE074B968980E4BD6B0394141 /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinalUITests" */ = { + 9455150A84C133D0401928B0DAE01FB4 /* Build configuration list for PBXNativeTarget "SwiftInstagram" */ = { isa = XCConfigurationList; buildConfigurations = ( - 3BACA1D3B2DAE5A9E30131E508AE7234 /* Debug */, - E051149295BA0A54BE40A91B864F135E /* Release */, + 82A14D042E0DCB10692E3CC9374EAFC9 /* Debug */, + 89650BD86CC7D20546DC7A1AAB21F279 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C4103C5778FE452967A0B94DC2C7DC07 /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinal" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + EB4FF940435E14452C3B31BCE26F6B30 /* Debug */, + 43DA719C8684C2D4D4A02CE86591CDA5 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.markdown b/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.markdown index 959fc81..a98213a 100644 --- a/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.markdown +++ b/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.markdown @@ -1,6 +1,31 @@ # Acknowledgements This application makes use of the following third party libraries: +## LocationPicker + +The MIT License (MIT) + +Copyright (c) 2015, Almas Sapargali + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + ## SwiftInstagram MIT License diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.plist b/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.plist index 5e99f1b..badf10d 100644 --- a/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.plist @@ -12,6 +12,37 @@ Type PSGroupSpecifier + + FooterText + The MIT License (MIT) + +Copyright (c) 2015, Almas Sapargali + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + License + MIT + Title + LocationPicker + Type + PSGroupSpecifier + FooterText MIT License diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-frameworks.sh b/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-frameworks.sh index 1937ded..d85e7e1 100755 --- a/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-frameworks.sh +++ b/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-frameworks.sh @@ -6,10 +6,14 @@ mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# Used as a return value for each invocation of `strip_invalid_archs` function. +STRIP_BINARY_RETVAL=0 + # This protects against multiple targets copying the same framework dependency at the same time. The solution # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") +# Copies and strips a vendored framework install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -58,12 +62,31 @@ install_framework() fi } -# Copies the dSYM of a vendored framework +# Copies and strips a vendored dSYM install_dsym() { local source="$1" if [ -r "$source" ]; then - echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\"" - rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}" + # Copy the dSYM into a the targets temp dir. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}" + + local basename + basename="$(basename -s .framework.dSYM "$source")" + binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}" + + # Strip invalid architectures so "fat" simulator / device frameworks work on device + if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then + strip_invalid_archs "$binary" + fi + + if [[ $STRIP_BINARY_RETVAL == 1 ]]; then + # Move the stripped file into its final destination. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}" + else + # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. + touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" + fi fi } @@ -85,10 +108,18 @@ code_sign_if_enabled() { # Strip invalid architectures strip_invalid_archs() { binary="$1" - # Get architectures for current file - archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" + # Get architectures for current target binary + binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" + # Intersect them with the architectures we are building for + intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)" + # If there are no archs supported by this binary then warn the user + if [[ -z "$intersected_archs" ]]; then + echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + STRIP_BINARY_RETVAL=0 + return + fi stripped="" - for arch in $archs; do + for arch in $binary_archs; do if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 @@ -98,13 +129,16 @@ strip_invalid_archs() { if [[ "$stripped" ]]; then echo "Stripped $binary of architectures:$stripped" fi + STRIP_BINARY_RETVAL=1 } if [[ "$CONFIGURATION" == "Debug" ]]; then + install_framework "${BUILT_PRODUCTS_DIR}/LocationPicker/LocationPicker.framework" install_framework "${BUILT_PRODUCTS_DIR}/SwiftInstagram/SwiftInstagram.framework" fi if [[ "$CONFIGURATION" == "Release" ]]; then + install_framework "${BUILT_PRODUCTS_DIR}/LocationPicker/LocationPicker.framework" install_framework "${BUILT_PRODUCTS_DIR}/SwiftInstagram/SwiftInstagram.framework" fi if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests-frameworks.sh b/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests-frameworks.sh index 88dd537..881cbae 100755 --- a/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests-frameworks.sh +++ b/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests-frameworks.sh @@ -6,10 +6,14 @@ mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# Used as a return value for each invocation of `strip_invalid_archs` function. +STRIP_BINARY_RETVAL=0 + # This protects against multiple targets copying the same framework dependency at the same time. The solution # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") +# Copies and strips a vendored framework install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -58,12 +62,31 @@ install_framework() fi } -# Copies the dSYM of a vendored framework +# Copies and strips a vendored dSYM install_dsym() { local source="$1" if [ -r "$source" ]; then - echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\"" - rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}" + # Copy the dSYM into a the targets temp dir. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}" + + local basename + basename="$(basename -s .framework.dSYM "$source")" + binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}" + + # Strip invalid architectures so "fat" simulator / device frameworks work on device + if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then + strip_invalid_archs "$binary" + fi + + if [[ $STRIP_BINARY_RETVAL == 1 ]]; then + # Move the stripped file into its final destination. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}" + else + # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. + touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" + fi fi } @@ -85,10 +108,18 @@ code_sign_if_enabled() { # Strip invalid architectures strip_invalid_archs() { binary="$1" - # Get architectures for current file - archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" + # Get architectures for current target binary + binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" + # Intersect them with the architectures we are building for + intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)" + # If there are no archs supported by this binary then warn the user + if [[ -z "$intersected_archs" ]]; then + echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + STRIP_BINARY_RETVAL=0 + return + fi stripped="" - for arch in $archs; do + for arch in $binary_archs; do if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 @@ -98,6 +129,7 @@ strip_invalid_archs() { if [[ "$stripped" ]]; then echo "Stripped $binary of architectures:$stripped" fi + STRIP_BINARY_RETVAL=1 } if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.debug.xcconfig b/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.debug.xcconfig index 19da66e..3c44ee0 100644 --- a/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.debug.xcconfig +++ b/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.debug.xcconfig @@ -1,8 +1,8 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/SwiftInstagram" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/SwiftInstagram/SwiftInstagram.framework/Headers" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker/LocationPicker.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram/SwiftInstagram.framework/Headers" +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.release.xcconfig b/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.release.xcconfig index 19da66e..3c44ee0 100644 --- a/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.release.xcconfig +++ b/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.release.xcconfig @@ -1,8 +1,8 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/SwiftInstagram" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/SwiftInstagram/SwiftInstagram.framework/Headers" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker/LocationPicker.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram/SwiftInstagram.framework/Headers" +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests-frameworks.sh b/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests-frameworks.sh index 88dd537..881cbae 100755 --- a/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests-frameworks.sh +++ b/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests-frameworks.sh @@ -6,10 +6,14 @@ mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# Used as a return value for each invocation of `strip_invalid_archs` function. +STRIP_BINARY_RETVAL=0 + # This protects against multiple targets copying the same framework dependency at the same time. The solution # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") +# Copies and strips a vendored framework install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -58,12 +62,31 @@ install_framework() fi } -# Copies the dSYM of a vendored framework +# Copies and strips a vendored dSYM install_dsym() { local source="$1" if [ -r "$source" ]; then - echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\"" - rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}" + # Copy the dSYM into a the targets temp dir. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}" + + local basename + basename="$(basename -s .framework.dSYM "$source")" + binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}" + + # Strip invalid architectures so "fat" simulator / device frameworks work on device + if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then + strip_invalid_archs "$binary" + fi + + if [[ $STRIP_BINARY_RETVAL == 1 ]]; then + # Move the stripped file into its final destination. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}" + else + # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. + touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" + fi fi } @@ -85,10 +108,18 @@ code_sign_if_enabled() { # Strip invalid architectures strip_invalid_archs() { binary="$1" - # Get architectures for current file - archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" + # Get architectures for current target binary + binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" + # Intersect them with the architectures we are building for + intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)" + # If there are no archs supported by this binary then warn the user + if [[ -z "$intersected_archs" ]]; then + echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + STRIP_BINARY_RETVAL=0 + return + fi stripped="" - for arch in $archs; do + for arch in $binary_archs; do if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 @@ -98,6 +129,7 @@ strip_invalid_archs() { if [[ "$stripped" ]]; then echo "Stripped $binary of architectures:$stripped" fi + STRIP_BINARY_RETVAL=1 } if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.debug.xcconfig b/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.debug.xcconfig index 19da66e..3c44ee0 100644 --- a/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.debug.xcconfig +++ b/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.debug.xcconfig @@ -1,8 +1,8 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/SwiftInstagram" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/SwiftInstagram/SwiftInstagram.framework/Headers" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker/LocationPicker.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram/SwiftInstagram.framework/Headers" +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.release.xcconfig b/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.release.xcconfig index 19da66e..3c44ee0 100644 --- a/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.release.xcconfig +++ b/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.release.xcconfig @@ -1,8 +1,8 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/SwiftInstagram" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/SwiftInstagram/SwiftInstagram.framework/Headers" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker/LocationPicker.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram/SwiftInstagram.framework/Headers" +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Pods/Target Support Files/SwiftInstagram/SwiftInstagram.xcconfig b/Pods/Target Support Files/SwiftInstagram/SwiftInstagram.xcconfig index 1544350..671094f 100644 --- a/Pods/Target Support Files/SwiftInstagram/SwiftInstagram.xcconfig +++ b/Pods/Target Support Files/SwiftInstagram/SwiftInstagram.xcconfig @@ -1,10 +1,10 @@ -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/SwiftInstagram +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" OTHER_LDFLAGS = -framework "Foundation" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/SwiftInstagram PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} From 5d120107ca9e4f512e679c9575d079dee9dfd2d5 Mon Sep 17 00:00:00 2001 From: Miroslav Mirovic Date: Sun, 11 Feb 2018 19:40:06 +0100 Subject: [PATCH 2/8] bez dodatog prozora --- ComtradeGramFinal/Base.lproj/Main.storyboard | 206 +++++++++++++++++- .../ViewControllers/MapViewController.swift | 8 +- 2 files changed, 206 insertions(+), 8 deletions(-) diff --git a/ComtradeGramFinal/Base.lproj/Main.storyboard b/ComtradeGramFinal/Base.lproj/Main.storyboard index 95367e9..9261ed3 100644 --- a/ComtradeGramFinal/Base.lproj/Main.storyboard +++ b/ComtradeGramFinal/Base.lproj/Main.storyboard @@ -58,16 +58,16 @@ - + - + - + @@ -276,7 +276,7 @@ - + @@ -334,6 +334,204 @@ + + +YnBsaXN0MDDUAQIDBAUGVVZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK8QEgcI +ExQZHh8jJCsuMTtDR0tPUlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdz +Vk5TUmVwc1dOU0NvbG9ygAKAERIgwAAAgAOAC1h7MzIsIDMyfdIVChYYWk5TLm9iamVjdHOhF4AEgArS +FQoaHaIbHIAFgAaACRAA0iAKISJfEBROU1RJRkZSZXByZXNlbnRhdGlvboAHgAhPERi2TU0AKgAAEAgA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAsAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAFAAAAIoAAADkAAAA/wAAAP8AAADjAAAAiAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAEEAAADqAAAA0QAAAGwAAAA7AAAAOwAAAG0AAADTAAAA6QAAAD8AAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAnAAAA8gAAAJYAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAMAAACZAAAA8QAAACQA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAALcAAAC5AAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA +AAC8AAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAA/gAAADkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAADwAAAD+AAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFIAAAD1AAAAAgAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAwAAAPYAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZQAAAOEAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4QAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmAAAA4AAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAZgAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGYA +AADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAABmAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAZgAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4AAAAGYA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAABbAAAA6wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AADsAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAD/AAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAGQAAAP8AAAA2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAOMAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAB7AAAA4QAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYwAAAPYAAAAyAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAMwAAAPYAAABhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAmQAAAPIA +AAA7AAAAAAAAAAAAAAAAAAAAAAAAADwAAADyAAAAmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAABAAAA3AAAAHEAAAAAAAAAAAAAAAAAAAAAAAAAcQAAANwAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAADWAAAAcQAAAAAAAAAAAAAAAAAAAAAAAABxAAAA1gAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAANYAAABxAAAAAAAAAAAAAAAAAAAAAAAAAHEAAADWAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA8wAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAPMA +AAA9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAABEAAAAsgAAAPwAAACaAAAAAwAAAAAAAAAAAAAAAAAAAAAA +AAADAAAAmgAAAP0AAACyAAAAQwAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAABXAAAA1AAAAPwAAACsAAAAPAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAPAAAAK0AAAD8AAAA1AAAAFcAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAyAAAAPkAAACQAAAAHwAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAACQAAAA+QAAAMYAAAAbAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAOQAAADIAAAAIgAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAygAAAOQA +AAApAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADVAAAAvgAAAAoAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAKAAAAvwAAANMAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAPoAAAAiAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAjAAAA+gAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACnAAAAxAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADFAAAApQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMUA +AADyAAAA3QAAAN0AAADdAAAA3QAAAN0AAADdAAAA3QAAAN0AAADdAAAA3QAAAN0AAADdAAAA3QAAAN0A +AADdAAAA3QAAAN0AAADdAAAA3QAAAN0AAADdAAAA3QAAAPIAAADEAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAUgAAAGYAAABmAAAAZgAAAGYAAABmAAAAZgAAAGYAAABmAAAAZgAAAGYAAABmAAAAZgAAAGYA +AABmAAAAZgAAAGYAAABmAAAAZgAAAGYAAABmAAAAZgAAAGYAAABmAAAAZgAAAFIAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAABABAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAAEM4BAwADAAAA +AQABAAABBgADAAAAAQACAAABCgADAAAAAQABAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAA +AQAEAAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABHAADAAAAAQABAAABKAADAAAAAQACAAABUgADAAAA +AQABAAABUwADAAAABAAAENaHcwAHAAAH2AAAEN4AAAAAAAgACAAIAAgAAQABAAEAAQAAB9hhcHBsAiAA +AG1udHJSR0IgWFlaIAfZAAIAGQALABoAC2Fjc3BBUFBMAAAAAGFwcGwAAAAAAAAAAAAAAAAAAAAAAAD2 +1gABAAAAANMtYXBwbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +C2Rlc2MAAAEIAAAAb2RzY20AAAF4AAAFnGNwcnQAAAcUAAAAOHd0cHQAAAdMAAAAFHJYWVoAAAdgAAAA +FGdYWVoAAAd0AAAAFGJYWVoAAAeIAAAAFHJUUkMAAAecAAAADmNoYWQAAAesAAAALGJUUkMAAAecAAAA +DmdUUkMAAAecAAAADmRlc2MAAAAAAAAAFEdlbmVyaWMgUkdCIFByb2ZpbGUAAAAAAAAAAAAAABRHZW5l +cmljIFJHQiBQcm9maWxlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAABtbHVjAAAAAAAAAB8AAAAMc2tTSwAAACgAAAGEZGFESwAAAC4AAAGsY2FFUwAAACQAAAHadmlW +TgAAACQAAAH+cHRCUgAAACYAAAIidWtVQQAAACoAAAJIZnJGVQAAACgAAAJyaHVIVQAAACgAAAKaemhU +VwAAABYAAALCbmJOTwAAACYAAALYY3NDWgAAACIAAAL+aGVJTAAAAB4AAAMgaXRJVAAAACgAAAM+cm9S +TwAAACQAAANmZGVERQAAACwAAAOKa29LUgAAABYAAAO2c3ZTRQAAACYAAALYemhDTgAAABYAAAPMamFK +UAAAABoAAAPiZWxHUgAAACIAAAP8cHRQTwAAACYAAAQebmxOTAAAACgAAAREZXNFUwAAACYAAAQedGhU +SAAAACQAAARsdHJUUgAAACIAAASQZmlGSQAAACgAAASyaHJIUgAAACgAAATacGxQTAAAACwAAAUCcnVS +VQAAACIAAAUuYXJFRwAAACYAAAVQZW5VUwAAACYAAAV2AFYBYQBlAG8AYgBlAGMAbgD9ACAAUgBHAEIA +IABwAHIAbwBmAGkAbABHAGUAbgBlAHIAZQBsACAAUgBHAEIALQBiAGUAcwBrAHIAaQB2AGUAbABzAGUA +UABlAHIAZgBpAGwAIABSAEcAQgAgAGcAZQBuAOgAcgBpAGMAQx6lAHUAIABoAOwAbgBoACAAUgBHAEIA +IABDAGgAdQBuAGcAUABlAHIAZgBpAGwAIABSAEcAQgAgAEcAZQBuAOkAcgBpAGMAbwQXBDAEMwQwBDsE +TAQ9BDgEOQAgBD8EQAQ+BEQEMAQ5BDsAIABSAEcAQgBQAHIAbwBmAGkAbAAgAGcA6QBuAOkAcgBpAHEA +dQBlACAAUgBWAEIAwQBsAHQAYQBsAOEAbgBvAHMAIABSAEcAQgAgAHAAcgBvAGYAaQBskBp1KAAgAFIA +RwBCACCCcl9pY8+P8ABHAGUAbgBlAHIAaQBzAGsAIABSAEcAQgAtAHAAcgBvAGYAaQBsAE8AYgBlAGMA +bgD9ACAAUgBHAEIAIABwAHIAbwBmAGkAbAXkBegF1QXkBdkF3AAgAFIARwBCACAF2wXcBdwF2QBQAHIA +bwBmAGkAbABvACAAUgBHAEIAIABnAGUAbgBlAHIAaQBjAG8AUAByAG8AZgBpAGwAIABSAEcAQgAgAGcA +ZQBuAGUAcgBpAGMAQQBsAGwAZwBlAG0AZQBpAG4AZQBzACAAUgBHAEIALQBQAHIAbwBmAGkAbMd8vBgA +IABSAEcAQgAg1QS4XNMMx3xmbpAaACAAUgBHAEIAIGPPj/Blh072TgCCLAAgAFIARwBCACAw1zDtMNUw +oTCkMOsDkwO1A70DuQO6A8wAIAPAA8EDvwPGA68DuwAgAFIARwBCAFAAZQByAGYAaQBsACAAUgBHAEIA +IABnAGUAbgDpAHIAaQBjAG8AQQBsAGcAZQBtAGUAZQBuACAAUgBHAEIALQBwAHIAbwBmAGkAZQBsDkIO +Gw4jDkQOHw4lDkwAIABSAEcAQgAgDhcOMQ5IDicORA4bAEcAZQBuAGUAbAAgAFIARwBCACAAUAByAG8A +ZgBpAGwAaQBZAGwAZQBpAG4AZQBuACAAUgBHAEIALQBwAHIAbwBmAGkAaQBsAGkARwBlAG4AZQByAGkB +DQBrAGkAIABSAEcAQgAgAHAAcgBvAGYAaQBsAFUAbgBpAHcAZQByAHMAYQBsAG4AeQAgAHAAcgBvAGYA +aQBsACAAUgBHAEIEHgQxBEkEOAQ5ACAEPwRABD4ERAQ4BDsETAAgAFIARwBCBkUGRAZBACAGKgY5BjEG +SgZBACAAUgBHAEIAIAYnBkQGOQYnBkUARwBlAG4AZQByAGkAYwAgAFIARwBCACAAUAByAG8AZgBpAGwA +ZXRleHQAAAAAQ29weXJpZ2h0IDIwMDcgQXBwbGUgSW5jLiwgYWxsIHJpZ2h0cyByZXNlcnZlZC4AWFla +IAAAAAAAAPNSAAEAAAABFs9YWVogAAAAAAAAdE0AAD3uAAAD0FhZWiAAAAAAAABadQAArHMAABc0WFla +IAAAAAAAACgaAAAVnwAAuDZjdXJ2AAAAAAAAAAEBzQAAc2YzMgAAAAAAAQxCAAAF3v//8yYAAAeSAAD9 +kf//+6L///2jAAAD3AAAwGzSJSYnKFokY2xhc3NuYW1lWCRjbGFzc2VzXxAQTlNCaXRtYXBJbWFnZVJl +cKMnKSpaTlNJbWFnZVJlcFhOU09iamVjdNIlJiwtV05TQXJyYXmiLCrSJSYvMF5OU011dGFibGVBcnJh +eaMvLCrVMjM0NQo2Nzg5OldOU1doaXRlXE5TQ29tcG9uZW50c1xOU0NvbG9yU3BhY2VfEBJOU0N1c3Rv +bUNvbG9yU3BhY2VEMCAwAEMwIDAQA4AMgBDUPD0+Cj9AQUJUTlNJRFVOU0lDQ1dOU01vZGVsEAmADRAA +gA/SRApFRldOUy5kYXRhTxERaAAAEWhhcHBsAgAAAG1udHJHUkFZWFlaIAfcAAgAFwAPAC4AD2Fjc3BB +UFBMAAAAAG5vbmUAAAAAAAAAAAAAAAAAAAAAAAD21gABAAAAANMtYXBwbAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABWRlc2MAAADAAAAAeWRzY20AAAE8AAAH6GNwcnQA +AAkkAAAAI3d0cHQAAAlIAAAAFGtUUkMAAAlcAAAIDGRlc2MAAAAAAAAAH0dlbmVyaWMgR3JheSBHYW1t +YSAyLjIgUHJvZmlsZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAAB8AAAAMc2tTSwAAAC4A +AAGEZGFESwAAADgAAAGyY2FFUwAAADgAAAHqdmlWTgAAAEAAAAIicHRCUgAAAEoAAAJidWtVQQAAACwA +AAKsZnJGVQAAAD4AAALYaHVIVQAAADQAAAMWemhUVwAAAB4AAANKbmJOTwAAADoAAANoY3NDWgAAACgA +AAOiaGVJTAAAACQAAAPKaXRJVAAAAE4AAAPucm9STwAAACoAAAQ8ZGVERQAAAE4AAARma29LUgAAACIA +AAS0c3ZTRQAAADgAAAGyemhDTgAAAB4AAATWamFKUAAAACYAAAT0ZWxHUgAAACoAAAUacHRQTwAAAFIA +AAVEbmxOTAAAAEAAAAWWZXNFUwAAAEwAAAXWdGhUSAAAADIAAAYidHJUUgAAACQAAAZUZmlGSQAAAEYA +AAZ4aHJIUgAAAD4AAAa+cGxQTAAAAEoAAAb8cnVSVQAAADoAAAdGZW5VUwAAADwAAAeAYXJFRwAAACwA +AAe8AFYBYQBlAG8AYgBlAGMAbgDhACAAcwBpAHYA4QAgAGcAYQBtAGEAIAAyACwAMgBHAGUAbgBlAHIA +aQBzAGsAIABnAHIA5QAgADIALAAyACAAZwBhAG0AbQBhAHAAcgBvAGYAaQBsAEcAYQBtAG0AYQAgAGQA +ZQAgAGcAcgBpAHMAbwBzACAAZwBlAG4A6AByAGkAYwBhACAAMgAuADIAQx6lAHUAIABoAOwAbgBoACAA +TQDgAHUAIAB4AOEAbQAgAEMAaAB1AG4AZwAgAEcAYQBtAG0AYQAgADIALgAyAFAAZQByAGYAaQBsACAA +RwBlAG4A6QByAGkAYwBvACAAZABhACAARwBhAG0AYQAgAGQAZQAgAEMAaQBuAHoAYQBzACAAMgAsADIE +FwQwBDMEMAQ7BEwEPQQwACAARwByAGEAeQAtBDMEMAQ8BDAAIAAyAC4AMgBQAHIAbwBmAGkAbAAgAGcA +6QBuAOkAcgBpAHEAdQBlACAAZwByAGkAcwAgAGcAYQBtAG0AYQAgADIALAAyAMEAbAB0AGEAbADhAG4A +bwBzACAAcwB6APwAcgBrAGUAIABnAGEAbQBtAGEAIAAyAC4AMpAadShwcJaOUUlepgAgADIALgAyACCC +cl9pY8+P8ABHAGUAbgBlAHIAaQBzAGsAIABnAHIA5QAgAGcAYQBtAG0AYQAgADIALAAyAC0AcAByAG8A +ZgBpAGwATwBiAGUAYwBuAOEAIAFhAGUAZADhACAAZwBhAG0AYQAgADIALgAyBdIF0AXeBdQAIAXQBeQF +1QXoACAF2wXcBdwF2QAgADIALgAyAFAAcgBvAGYAaQBsAG8AIABnAHIAaQBnAGkAbwAgAGcAZQBuAGUA +cgBpAGMAbwAgAGQAZQBsAGwAYQAgAGcAYQBtAG0AYQAgADIALAAyAEcAYQBtAGEAIABnAHIAaQAgAGcA +ZQBuAGUAcgBpAGMBAwAgADIALAAyAEEAbABsAGcAZQBtAGUAaQBuAGUAcwAgAEcAcgBhAHUAcwB0AHUA +ZgBlAG4ALQBQAHIAbwBmAGkAbAAgAEcAYQBtAG0AYQAgADIALAAyx3y8GAAg1ozAyQAgrBC5yAAgADIA +LgAyACDVBLhc0wzHfGZukBpwcF6mfPtlcAAgADIALgAyACBjz4/wZYdO9k4AgiwwsDDsMKQwrDDzMN4A +IAAyAC4AMgAgMNcw7TDVMKEwpDDrA5MDtQO9A7kDugPMACADkwO6A8EDuQAgA5MDrAO8A7wDsQAgADIA +LgAyAFAAZQByAGYAaQBsACAAZwBlAG4A6QByAGkAYwBvACAAZABlACAAYwBpAG4AegBlAG4AdABvAHMA +IABkAGEAIABHAGEAbQBtAGEAIAAyACwAMgBBAGwAZwBlAG0AZQBlAG4AIABnAHIAaQBqAHMAIABnAGEA +bQBtAGEAIAAyACwAMgAtAHAAcgBvAGYAaQBlAGwAUABlAHIAZgBpAGwAIABnAGUAbgDpAHIAaQBjAG8A +IABkAGUAIABnAGEAbQBtAGEAIABkAGUAIABnAHIAaQBzAGUAcwAgADIALAAyDiMOMQ4HDioONQ5BDgEO +IQ4hDjIOQA4BDiMOIg5MDhcOMQ5IDicORA4bACAAMgAuADIARwBlAG4AZQBsACAARwByAGkAIABHAGEA +bQBhACAAMgAsADIAWQBsAGUAaQBuAGUAbgAgAGgAYQByAG0AYQBhAG4AIABnAGEAbQBtAGEAIAAyACwA +MgAgAC0AcAByAG8AZgBpAGkAbABpAEcAZQBuAGUAcgBpAQ0AawBpACAARwByAGEAeQAgAEcAYQBtAG0A +YQAgADIALgAyACAAcAByAG8AZgBpAGwAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAAcAByAG8AZgBpAGwA +IABzAHoAYQByAG8BWwBjAGkAIABnAGEAbQBtAGEAIAAyACwAMgQeBDEESQQwBE8AIARBBDUEQAQwBE8A +IAQzBDAEPAQ8BDAAIAAyACwAMgAtBD8EQAQ+BEQEOAQ7BEwARwBlAG4AZQByAGkAYwAgAEcAcgBhAHkA +IABHAGEAbQBtAGEAIAAyAC4AMgAgAFAAcgBvAGYAaQBsAGUGOgYnBkUGJwAgADIALgAyACAGRAZIBkYA +IAYxBkUGJwYvBkoAIAY5BicGRXRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIEluYy4sIDIwMTIAAFhZWiAA +AAAAAADzUQABAAAAARbMY3VydgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAoAC0AMgA3ADsAQABFAEoA +TwBUAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKQAqQCuALIAtwC8AMEAxgDLANAA1QDbAOAA +5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEyATgBPgFFAUwBUgFZAWABZwFuAXUBfAGDAYsBkgGaAaEB +qQGxAbkBwQHJAdEB2QHhAekB8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJnAnECegKEAo4CmAKiAqwC +tgLBAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOuA7oDxwPTA+AD7AP5BAYE +EwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJBVgFZwV3BYYFlgWmBbUF +xQXVBeUF9gYGBhYGJwY3BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9B08HYQd0B4YHmQesB78H +0gflB/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmPCaQJugnPCeUJ+woRCicK +PQpUCmoKgQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxDDFwMdQyODKcMwAzZDPMN +DQ0mDUANWg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9eD3oPlg+zD88P7BAJECYQ +QxBhEH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLjEwMTIxNDE2MTgxOkE8UT +5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYDFiYWSRZsFo8WshbWFvoXHRdBF2UXiReuF9IX +9xgbGEAYZRiKGK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7G2MbihuyG9ocAhwqHFIc +exyjHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAVIEEgbCCYIMQg8CEcIUgh +dSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVoJZclxyX3JicmVyaHJrcm +6CcYJ0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2K2krnSvRLAUsOSxuLKIs +1y0MLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGCMbox8jIqMmMymzLUMw0z +RjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDecN9c4FDhQOIw4yDkFOUI5fzm8Ofk6 +Njp0OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+iP+JAI0BkQKZA50EpQWpB +rEHuQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7R8BIBUhLSJFI10kdSWNJ +qUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4lTm5Ot08AT0lPk0/dUCdQcVC7UQZRUFGbUeZS +MVJ8UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYPVlxWqVb3V0RXklfgWC9YfVjLWRpZaVm4WgdaVlqmWvVb +RVuVW+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBXYKpg/GFPYaJh9WJJYpxi8GNDY5dj62RAZJRk +6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpIap9q92tPa6dr/2xXbK9tCG1gbbluEm5rbsRv +Hm94b9FwK3CGcOBxOnGVcfByS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4d1Z3s3gReG54zHkqeYl5 +53pGeqV7BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIwgpKC9INXg7qEHYSAhOOF +R4Wrhg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/jmaOzo82j56QBpBukNaR +P5GokhGSepLjk02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/JpomtWbQpuvnByciZz3nWSd +0p5Anq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adup+CoUqjEqTepqaocqo+r +Aqt1q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUTtYq2AbZ5tvC3aLfguFm4 +0blKucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NYw9TEUcTOxUvFyMZGxsPH +Qce/yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/0sHTRNPG1EnUy9VO1dHW +VdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM4lPi2+Nj4+vkc+T85YTm +DeaW5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/8ozzGfOn9DT0wvVQ9d72 +bfb794r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t//+ADtIlJkhJXU5TTXV0YWJsZURhdGGjSEoq +Vk5TRGF0YdIlJkxNXE5TQ29sb3JTcGFjZaJOKlxOU0NvbG9yU3BhY2XSJSZQUVdOU0NvbG9yolAq0iUm +U1RXTlNJbWFnZaJTKl8QD05TS2V5ZWRBcmNoaXZlctFXWFRyb290gAEACAARABoAIwAtADIANwBMAFIA +XQBkAGsAeAB/AIcAiQCLAJAAkgCUAJ0AogCtAK8AsQCzALgAuwC9AL8AwQDDAMgA3wDhAOMZnRmiGa0Z +thnJGc0Z2BnhGeYZ7hnxGfYaBRoJGhQaHBopGjYaSxpQGlQaVhpYGloaYxpoGm4adhp4GnoafBp+GoMa +iyv3K/kr/iwMLBAsFywcLCksLCw5LD4sRixJLE4sVixZLGssbixzAAAAAAAAAgEAAAAAAAAAWQAAAAAA +AAAAAAAAAAAALHU + + diff --git a/ComtradeGramFinal/ViewControllers/MapViewController.swift b/ComtradeGramFinal/ViewControllers/MapViewController.swift index e2c8ac9..860ff38 100644 --- a/ComtradeGramFinal/ViewControllers/MapViewController.swift +++ b/ComtradeGramFinal/ViewControllers/MapViewController.swift @@ -11,7 +11,7 @@ import SwiftInstagram import LocationPicker import CoreLocation -class MapViewController: UIViewController { +class MapViewController: LocationPickerViewController { var post: InstagramMedia? @@ -23,8 +23,8 @@ class MapViewController: UIViewController { let locationPicker = LocationPickerViewController() // you can optionally set initial location - _ = CLLocation(latitude: 44.834561, longitude: 20.411077) -// let initialLocation = Location(name: "Comtrade-Code", location: location) +// _ = CLLocation(latitude: 44.834561, longitude: 20.411077) +// let initialLocation = Location(name: "Comtrade-Code", location: Location) // locationPicker.location = initialLocation // button placed on right bottom corner @@ -46,7 +46,7 @@ class MapViewController: UIViewController { locationPicker.searchHistoryLabel = "Previously searched" // default: "Search History" // optional region distance to be used for creation region when user selects place from search results - locationPicker.resultRegionDistance = 500 // default: 600 + locationPicker.resultRegionDistance = 600 // default: 600 locationPicker.completion = { location in // do some awesome stuff with location From 62a4ebff6a86ede5b46ef2d5906200ed7f097b81 Mon Sep 17 00:00:00 2001 From: Miroslav Mirovic Date: Tue, 13 Feb 2018 22:47:35 +0100 Subject: [PATCH 3/8] pred final --- ComtradeGramFinal.xcodeproj/project.pbxproj | 4 + ComtradeGramFinal/Base.lproj/Main.storyboard | 21 +- .../ViewControllers/MapViewController.swift | 269 ++++++++++++++++-- 3 files changed, 263 insertions(+), 31 deletions(-) diff --git a/ComtradeGramFinal.xcodeproj/project.pbxproj b/ComtradeGramFinal.xcodeproj/project.pbxproj index 756a03c..aebd45a 100644 --- a/ComtradeGramFinal.xcodeproj/project.pbxproj +++ b/ComtradeGramFinal.xcodeproj/project.pbxproj @@ -25,6 +25,7 @@ 0784C4DB2019196F000E942E /* UIImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0784C4DA2019196F000E942E /* UIImageView.swift */; }; 90C2055B863CC46A8EC5F904 /* Pods_ComtradeGramFinalTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DE6CDDB43799CA87D77C0B2 /* Pods_ComtradeGramFinalTests.framework */; }; B2DB6D372B1B2596201149ED /* Pods_ComtradeGramFinal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA36AD9161F49952F5BD6D08 /* Pods_ComtradeGramFinal.framework */; }; + D146B64620337E350060983D /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D146B64520337E350060983D /* MapKit.framework */; }; EB1FCA11AEBC2E7CA61E80C9 /* Pods_ComtradeGramFinalUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5972BEBF5F29AFF33D431699 /* Pods_ComtradeGramFinalUITests.framework */; }; /* End PBXBuildFile section */ @@ -76,6 +77,7 @@ 9CAB271CD111DF6FF66E1E89 /* Pods-ComtradeGramFinal.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ComtradeGramFinal.release.xcconfig"; path = "Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal.release.xcconfig"; sourceTree = ""; }; A3A5C9D7385833C8A86AED69 /* Pods-ComtradeGramFinalUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ComtradeGramFinalUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.debug.xcconfig"; sourceTree = ""; }; C8497E9560F46BE726082DDE /* Pods-ComtradeGramFinalUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ComtradeGramFinalUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.release.xcconfig"; sourceTree = ""; }; + D146B64520337E350060983D /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; DA36AD9161F49952F5BD6D08 /* Pods_ComtradeGramFinal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ComtradeGramFinal.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -84,6 +86,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D146B64620337E350060983D /* MapKit.framework in Frameworks */, B2DB6D372B1B2596201149ED /* Pods_ComtradeGramFinal.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -201,6 +204,7 @@ 6457A64ECC6A6717543B3257 /* Frameworks */ = { isa = PBXGroup; children = ( + D146B64520337E350060983D /* MapKit.framework */, DA36AD9161F49952F5BD6D08 /* Pods_ComtradeGramFinal.framework */, 0DE6CDDB43799CA87D77C0B2 /* Pods_ComtradeGramFinalTests.framework */, 5972BEBF5F29AFF33D431699 /* Pods_ComtradeGramFinalUITests.framework */, diff --git a/ComtradeGramFinal/Base.lproj/Main.storyboard b/ComtradeGramFinal/Base.lproj/Main.storyboard index 9261ed3..877728a 100644 --- a/ComtradeGramFinal/Base.lproj/Main.storyboard +++ b/ComtradeGramFinal/Base.lproj/Main.storyboard @@ -60,14 +60,31 @@ - + + + + + + + + + + + + + + + + + + - + diff --git a/ComtradeGramFinal/ViewControllers/MapViewController.swift b/ComtradeGramFinal/ViewControllers/MapViewController.swift index 860ff38..92d0280 100644 --- a/ComtradeGramFinal/ViewControllers/MapViewController.swift +++ b/ComtradeGramFinal/ViewControllers/MapViewController.swift @@ -8,60 +8,271 @@ import UIKit import SwiftInstagram -import LocationPicker -import CoreLocation +import MapKit -class MapViewController: LocationPickerViewController { + +class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewDelegate { var post: InstagramMedia? + @IBOutlet weak var mapView: MKMapView! + let distanceSpan: Double = 500 + let postPin = MKPointAnnotation() + + var locationManager: CLLocationManager? + override func viewDidLoad() { super.viewDidLoad() - // Do any additional setup after loading the view, typically from a nib. - let locationPicker = LocationPickerViewController() + locationManager = CLLocationManager() + locationManager!.delegate = self - // you can optionally set initial location -// _ = CLLocation(latitude: 44.834561, longitude: 20.411077) -// let initialLocation = Location(name: "Comtrade-Code", location: Location) -// locationPicker.location = initialLocation + locationManager!.delegate = self + locationManager!.desiredAccuracy = kCLLocationAccuracyBestForNavigation + locationManager!.requestAlwaysAuthorization() + locationManager!.distanceFilter = 50 - // button placed on right bottom corner - locationPicker.showCurrentLocationButton = true // default: true + if CLLocationManager.authorizationStatus() == .authorizedWhenInUse { + locationManager!.startUpdatingLocation() + } else { + locationManager!.requestWhenInUseAuthorization() + } - // default: navigation bar's `barTintColor` or `.whiteColor()` - locationPicker.currentLocationButtonBackground = .red + } + + //https://stackoverflow.com/questions/35685006/how-i-can-center-the-map-on-users-location-in-swift + + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + print(self.post?.location?.coordinates.latitude) + self.updatePostLocation() + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + func locationManager(_ manager: CLLocationManager, didStartMonitoringFor region: CLRegion) { - // ignored if initial location is given, shows that location instead - locationPicker.showCurrentLocationInitially = true // default: true + } + + func locationManager(manager: CLLocationManager, didChangeAuthorizationStatus status: CLAuthorizationStatus) { - locationPicker.mapType = .standard // default: .Hybrid - // for searching, see `MKLocalSearchRequest`'s `region` property - locationPicker.useCurrentLocationAsHint = true // default: false + switch status { + case .notDetermined: + print("NotDetermined") + case .restricted: + print("Restricted") + case .denied: + print("Denied") + case .authorizedAlways: + print("AuthorizedAlways") + case .authorizedWhenInUse: + print("AuthorizedWhenInUse") + locationManager!.startUpdatingLocation() + } + } + + func locationManager(manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) { + + let location = locations.first! + let coordinateRegion = MKCoordinateRegionMakeWithDistance(location.coordinate, 500, 500) + mapView.setRegion(coordinateRegion, animated: true) + locationManager?.stopUpdatingLocation() + locationManager = nil + } + + func locationManager(manager: CLLocationManager, didFailWithError error: NSError) { + print("Failed to initialize GPS: ", error.description) + } + + + // present user location on map + // get post location latitude and longitude and present it's pointer + // add annotation view with title: postName and description + + + func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? + { + if annotation is MKUserLocation {return nil} - locationPicker.searchBarPlaceholder = "Search places" // default: "Search or enter an address" + let reuseId = "pin" - locationPicker.searchHistoryLabel = "Previously searched" // default: "Search History" + var pinView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseId) as? MKPinAnnotationView + if pinView == nil { + pinView = MKPinAnnotationView(annotation: annotation, reuseIdentifier: reuseId) + pinView!.canShowCallout = true + pinView!.animatesDrop = true + let calloutButton = UIButton(type: .detailDisclosure) + pinView!.rightCalloutAccessoryView = calloutButton + pinView!.sizeToFit() + } + else { + pinView!.annotation = annotation + } - // optional region distance to be used for creation region when user selects place from search results - locationPicker.resultRegionDistance = 600 // default: 600 - locationPicker.completion = { location in - // do some awesome stuff with location - + return pinView + } + + func mapView(_ mapView: MKMapView, annotationView view: MKAnnotationView, calloutAccessoryControlTapped control: UIControl) { + if control == view.rightCalloutAccessoryView { + print("button tapped") } + } + + + func locationManager(manager: CLLocationManager!, didUpdateLocations locations: [AnyObject]!) { + let userLocation = locations[0] as! CLLocation + + locationManager?.stopUpdatingLocation() + + let location = CLLocationCoordinate2D(latitude: userLocation.coordinate.latitude, longitude: userLocation.coordinate.longitude) + + let span = MKCoordinateSpanMake(1.0, 1.0) + + let region = MKCoordinateRegion(center: location, span: span) - navigationController?.pushViewController(locationPicker, animated: true) + self.mapView.setRegion(region, animated: false) } - override func didReceiveMemoryWarning() { - super.didReceiveMemoryWarning() - // Dispose of any resources that can be recreated. + func updatePostLocation() { + if let mapView = self.mapView { + let location = self.post?.location + let center = self.post?.location?.coordinates + + let region = MKCoordinateRegion(center: center!, span: MKCoordinateSpan(latitudeDelta: 0.01, longitudeDelta: 0.01)) + mapView.setRegion(region, animated: true) + mapView.showsUserLocation = true + + mapView.removeAnnotation(self.postPin) + + + + //set region on the map + mapView.setRegion(region, animated: true) + + if let coordinates = location?.coordinates { + postPin.coordinate = coordinates + mapView.addAnnotation(postPin) + } + + +// var annotation = MKPointAnnotation.init() +// annotation.coordinate = CLLocationCoordinate2D(latitude: 11.12, longitude: 12.11) +// mapView.addAnnotation(annotation) + + + + } } + func locationManager(manager: CLLocationManager, didUpdateToLocation newLocation: CLLocation, fromLocation oldLocation: CLLocation) { + if let mapView = self.mapView { + let region = MKCoordinateRegionMakeWithDistance(newLocation.coordinate, self.distanceSpan, self.distanceSpan) + mapView.setRegion(region, animated: true) + mapView.showsUserLocation = true + } + } } + + + + + + + + + + + + + + + + + + + + + + +// +// +//// +//// ViewController.swift +//// ComtradeGramFinal +//// +//// Created by Predrag Jevtic on 1/10/18. +//// Copyright © 2018 com.comtrade.Gram. All rights reserved. +//// +// +//import UIKit +//import SwiftInstagram +//import LocationPicker +//import CoreLocation +// +//class MapViewController: UIViewController { +// +// var post: InstagramMedia? +// +// let locationPicker = LocationPickerViewController() +// +// override func viewDidLoad() { +// super.viewDidLoad() +// +// // Do any additional setup after loading the view, typically from a nib. +// +// +// +// // you can optionally set initial location +//// _ = CLLocation(latitude: 44.834561, longitude: 20.411077) +//// let initialLocation = Location(name: "Comtrade-Code", location: Location) +//// locationPicker.location = initialLocation +// +// // button placed on right bottom corner +// locationPicker.showCurrentLocationButton = true // default: true +// +// // default: navigation bar's `barTintColor` or `.whiteColor()` +// locationPicker.currentLocationButtonBackground = .red +// +// // ignored if initial location is given, shows that location instead +// locationPicker.showCurrentLocationInitially = true // default: true +// +// locationPicker.mapType = .standard // default: .Hybrid +// +// // for searching, see `MKLocalSearchRequest`'s `region` property +// locationPicker.useCurrentLocationAsHint = true // default: false +// +// locationPicker.searchBarPlaceholder = "Search places" // default: "Search or enter an address" +// +// locationPicker.searchHistoryLabel = "Previously searched" // default: "Search History" +// +// // optional region distance to be used for creation region when user selects place from search results +// locationPicker.resultRegionDistance = 600 // default: 600 +// +// locationPicker.completion = { location in +// // do some awesome stuff with location +// +// } +// +// navigationController?.pushViewController(locationPicker, animated: true) +// +// } +// +// override func didReceiveMemoryWarning() { +// super.didReceiveMemoryWarning() +// // Dispose of any resources that can be recreated. +// } +// +// +//} +// +// From 8bde8030279b351fdf2a49822150681f61d9674b Mon Sep 17 00:00:00 2001 From: Miroslav Mirovic Date: Tue, 13 Feb 2018 22:56:18 +0100 Subject: [PATCH 4/8] pre final 2 --- ComtradeGramFinal/ViewControllers/MapViewController.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ComtradeGramFinal/ViewControllers/MapViewController.swift b/ComtradeGramFinal/ViewControllers/MapViewController.swift index 92d0280..6d4ec47 100644 --- a/ComtradeGramFinal/ViewControllers/MapViewController.swift +++ b/ComtradeGramFinal/ViewControllers/MapViewController.swift @@ -33,6 +33,8 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD locationManager!.requestAlwaysAuthorization() locationManager!.distanceFilter = 50 + self.mapView.showsUserLocation = true + if CLLocationManager.authorizationStatus() == .authorizedWhenInUse { locationManager!.startUpdatingLocation() } else { From 900bef62118973443b3126e2cc0a8b5ccbd8d8fc Mon Sep 17 00:00:00 2001 From: Miroslav Mirovic Date: Wed, 14 Feb 2018 11:44:07 +0100 Subject: [PATCH 5/8] Task show post location --- .../ViewControllers/MapViewController.swift | 111 +----------------- 1 file changed, 2 insertions(+), 109 deletions(-) diff --git a/ComtradeGramFinal/ViewControllers/MapViewController.swift b/ComtradeGramFinal/ViewControllers/MapViewController.swift index 6d4ec47..88a87eb 100644 --- a/ComtradeGramFinal/ViewControllers/MapViewController.swift +++ b/ComtradeGramFinal/ViewControllers/MapViewController.swift @@ -26,8 +26,6 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD // Do any additional setup after loading the view, typically from a nib. locationManager = CLLocationManager() - locationManager!.delegate = self - locationManager!.delegate = self locationManager!.desiredAccuracy = kCLLocationAccuracyBestForNavigation locationManager!.requestAlwaysAuthorization() @@ -43,9 +41,6 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD } - //https://stackoverflow.com/questions/35685006/how-i-can-center-the-map-on-users-location-in-swift - - override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) print(self.post?.location?.coordinates.latitude) @@ -153,9 +148,9 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD mapView.showsUserLocation = true mapView.removeAnnotation(self.postPin) - - + + //set region on the map mapView.setRegion(region, animated: true) @@ -163,14 +158,6 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD postPin.coordinate = coordinates mapView.addAnnotation(postPin) } - - -// var annotation = MKPointAnnotation.init() -// annotation.coordinate = CLLocationCoordinate2D(latitude: 11.12, longitude: 12.11) -// mapView.addAnnotation(annotation) - - - } } @@ -184,97 +171,3 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD } - - - - - - - - - - - - - - - - - - - - - - -// -// -//// -//// ViewController.swift -//// ComtradeGramFinal -//// -//// Created by Predrag Jevtic on 1/10/18. -//// Copyright © 2018 com.comtrade.Gram. All rights reserved. -//// -// -//import UIKit -//import SwiftInstagram -//import LocationPicker -//import CoreLocation -// -//class MapViewController: UIViewController { -// -// var post: InstagramMedia? -// -// let locationPicker = LocationPickerViewController() -// -// override func viewDidLoad() { -// super.viewDidLoad() -// -// // Do any additional setup after loading the view, typically from a nib. -// -// -// -// // you can optionally set initial location -//// _ = CLLocation(latitude: 44.834561, longitude: 20.411077) -//// let initialLocation = Location(name: "Comtrade-Code", location: Location) -//// locationPicker.location = initialLocation -// -// // button placed on right bottom corner -// locationPicker.showCurrentLocationButton = true // default: true -// -// // default: navigation bar's `barTintColor` or `.whiteColor()` -// locationPicker.currentLocationButtonBackground = .red -// -// // ignored if initial location is given, shows that location instead -// locationPicker.showCurrentLocationInitially = true // default: true -// -// locationPicker.mapType = .standard // default: .Hybrid -// -// // for searching, see `MKLocalSearchRequest`'s `region` property -// locationPicker.useCurrentLocationAsHint = true // default: false -// -// locationPicker.searchBarPlaceholder = "Search places" // default: "Search or enter an address" -// -// locationPicker.searchHistoryLabel = "Previously searched" // default: "Search History" -// -// // optional region distance to be used for creation region when user selects place from search results -// locationPicker.resultRegionDistance = 600 // default: 600 -// -// locationPicker.completion = { location in -// // do some awesome stuff with location -// -// } -// -// navigationController?.pushViewController(locationPicker, animated: true) -// -// } -// -// override func didReceiveMemoryWarning() { -// super.didReceiveMemoryWarning() -// // Dispose of any resources that can be recreated. -// } -// -// -//} -// -// From 548a2e36f766a074e0d53b25e385bd217edba698 Mon Sep 17 00:00:00 2001 From: Miroslav Mirovic Date: Wed, 14 Feb 2018 12:09:04 +0100 Subject: [PATCH 6/8] doodad PinAnnotation swift file --- ComtradeGramFinal.xcodeproj/project.pbxproj | 6 +- .../ViewControllers/PinAnnotation.swift | 22 + Podfile | 2 +- Podfile.lock | 5 +- Pods/Manifest.lock | 5 +- Pods/Pods.xcodeproj/project.pbxproj | 678 ++++++------------ ...omtradeGramFinal-acknowledgements.markdown | 25 - ...s-ComtradeGramFinal-acknowledgements.plist | 31 - .../Pods-ComtradeGramFinal-frameworks.sh | 2 - ...Pods-ComtradeGramFinalTests.debug.xcconfig | 4 +- ...ds-ComtradeGramFinalTests.release.xcconfig | 4 +- ...ds-ComtradeGramFinalUITests.debug.xcconfig | 4 +- ...-ComtradeGramFinalUITests.release.xcconfig | 4 +- 13 files changed, 273 insertions(+), 519 deletions(-) create mode 100644 ComtradeGramFinal/ViewControllers/PinAnnotation.swift diff --git a/ComtradeGramFinal.xcodeproj/project.pbxproj b/ComtradeGramFinal.xcodeproj/project.pbxproj index aebd45a..42f2d4e 100644 --- a/ComtradeGramFinal.xcodeproj/project.pbxproj +++ b/ComtradeGramFinal.xcodeproj/project.pbxproj @@ -25,6 +25,7 @@ 0784C4DB2019196F000E942E /* UIImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0784C4DA2019196F000E942E /* UIImageView.swift */; }; 90C2055B863CC46A8EC5F904 /* Pods_ComtradeGramFinalTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DE6CDDB43799CA87D77C0B2 /* Pods_ComtradeGramFinalTests.framework */; }; B2DB6D372B1B2596201149ED /* Pods_ComtradeGramFinal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA36AD9161F49952F5BD6D08 /* Pods_ComtradeGramFinal.framework */; }; + D13019AF20344E7C00803D15 /* PinAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D13019AE20344E7C00803D15 /* PinAnnotation.swift */; }; D146B64620337E350060983D /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D146B64520337E350060983D /* MapKit.framework */; }; EB1FCA11AEBC2E7CA61E80C9 /* Pods_ComtradeGramFinalUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5972BEBF5F29AFF33D431699 /* Pods_ComtradeGramFinalUITests.framework */; }; /* End PBXBuildFile section */ @@ -77,6 +78,7 @@ 9CAB271CD111DF6FF66E1E89 /* Pods-ComtradeGramFinal.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ComtradeGramFinal.release.xcconfig"; path = "Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal.release.xcconfig"; sourceTree = ""; }; A3A5C9D7385833C8A86AED69 /* Pods-ComtradeGramFinalUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ComtradeGramFinalUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.debug.xcconfig"; sourceTree = ""; }; C8497E9560F46BE726082DDE /* Pods-ComtradeGramFinalUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ComtradeGramFinalUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.release.xcconfig"; sourceTree = ""; }; + D13019AE20344E7C00803D15 /* PinAnnotation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinAnnotation.swift; sourceTree = ""; }; D146B64520337E350060983D /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; DA36AD9161F49952F5BD6D08 /* Pods_ComtradeGramFinal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ComtradeGramFinal.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -119,6 +121,7 @@ 071CE9A42025C7D700BEEAAD /* SearchViewController copy.swift */, 071E5FD82018F667001B8FE6 /* LoginViewController.swift */, 071CE99E2025C79F00BEEAAD /* MapViewController.swift */, + D13019AE20344E7C00803D15 /* PinAnnotation.swift */, 071CE9A62025D47400BEEAAD /* SettingsViewController.swift */, 073C19472006891100F7816E /* HomeViewController.swift */, ); @@ -406,12 +409,10 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/LocationPicker/LocationPicker.framework", "${BUILT_PRODUCTS_DIR}/SwiftInstagram/SwiftInstagram.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LocationPicker.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftInstagram.framework", ); runOnlyForDeploymentPostprocessing = 0; @@ -511,6 +512,7 @@ 0784C4DB2019196F000E942E /* UIImageView.swift in Sources */, 073C19482006891100F7816E /* HomeViewController.swift in Sources */, 073C194E2006891100F7816E /* ComtradeGramFinal.xcdatamodeld in Sources */, + D13019AF20344E7C00803D15 /* PinAnnotation.swift in Sources */, 071CE99D2025C78600BEEAAD /* ProfileViewController.swift in Sources */, 071CE99F2025C79F00BEEAAD /* MapViewController.swift in Sources */, 071CE9A52025C7D700BEEAAD /* SearchViewController copy.swift in Sources */, diff --git a/ComtradeGramFinal/ViewControllers/PinAnnotation.swift b/ComtradeGramFinal/ViewControllers/PinAnnotation.swift new file mode 100644 index 0000000..79384bb --- /dev/null +++ b/ComtradeGramFinal/ViewControllers/PinAnnotation.swift @@ -0,0 +1,22 @@ +// +// PinAnnotation.swift +// ComtradeGramFinal +// +// Created by Miroslav Mirovic on 2/14/18. +// Copyright © 2018 com.comtrade.Gram. All rights reserved. +// + + +import MapKit + +class PinAnnotation: NSObject, MKAnnotation { + var title: String? + var subtitle: String? + var coordinate: CLLocationCoordinate2D + + init(title: String, subtitle: String, coordinate: CLLocationCoordinate2D) { + self.title = title + self.subtitle = subtitle + self.coordinate = coordinate + } +} diff --git a/Podfile b/Podfile index 0624a67..bc3b150 100644 --- a/Podfile +++ b/Podfile @@ -8,7 +8,7 @@ target 'ComtradeGramFinal' do # Pods for ComtradeGramFinal pod 'SwiftInstagram', '~> 1.1.0' -pod 'LocationPicker' + target 'ComtradeGramFinalTests' do inherit! :search_paths diff --git a/Podfile.lock b/Podfile.lock index 0cf3453..cb0def7 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,17 +1,14 @@ PODS: - - LocationPicker (1.1.0) - SwiftInstagram (1.1.0): - SwiftInstagram/Core (= 1.1.0) - SwiftInstagram/Core (1.1.0) DEPENDENCIES: - - LocationPicker - SwiftInstagram (~> 1.1.0) SPEC CHECKSUMS: - LocationPicker: 94dbd15ee053646d5c275d44b4dfce8634d66041 SwiftInstagram: 90d5c143d8ebe1c790e06a138b8da3c8f2a9ba16 -PODFILE CHECKSUM: 6b094d6ec7e99a91f952bcac61b548d0a1be522c +PODFILE CHECKSUM: 06c43a2e950450c1134aaf25922f6568b528dc0e COCOAPODS: 1.4.0 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 0cf3453..cb0def7 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -1,17 +1,14 @@ PODS: - - LocationPicker (1.1.0) - SwiftInstagram (1.1.0): - SwiftInstagram/Core (= 1.1.0) - SwiftInstagram/Core (1.1.0) DEPENDENCIES: - - LocationPicker - SwiftInstagram (~> 1.1.0) SPEC CHECKSUMS: - LocationPicker: 94dbd15ee053646d5c275d44b4dfce8634d66041 SwiftInstagram: 90d5c143d8ebe1c790e06a138b8da3c8f2a9ba16 -PODFILE CHECKSUM: 6b094d6ec7e99a91f952bcac61b548d0a1be522c +PODFILE CHECKSUM: 06c43a2e950450c1134aaf25922f6568b528dc0e COCOAPODS: 1.4.0 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index c64c164..57fedcc 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -7,182 +7,145 @@ objects = { /* Begin PBXBuildFile section */ - 00F96C8B36A460C09122C67A0CCD1E11 /* InstagramLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8037846325D3BE7787D0815A0052115A /* InstagramLoginViewController.swift */; }; - 0139BCAAF0A6CE4CDA811DEBE64D6E63 /* LocationPicker-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D73222EE47F965264739F1B308C40749 /* LocationPicker-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0527C0E5D22450735307E084A8BAA96F /* Likes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27C2EC661758ADF057FF02E5DE7E21EE /* Likes.swift */; }; 097F32CAF71028B957E2C4CF0857CD34 /* Pods-ComtradeGramFinalUITests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 6233FD9354650EB139A9E6F199255AC7 /* Pods-ComtradeGramFinalUITests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0EDA0271052D30E5D223D9291C6E98D4 /* LocationPicker-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = B93CA5281383870C8B002C50DB320905 /* LocationPicker-dummy.m */; }; - 0F44C64373D1D6BB0C07E919DE8B43E6 /* Tags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30CCDE246DC6AE8243A028A9AB90E214 /* Tags.swift */; }; - 150B6E4BDEF2F5BE30503072312697C5 /* Users.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8B1085EBD02F4B94856BA24442DFC91 /* Users.swift */; }; + 0D4A40C1AA3B51D6339CB606629755C0 /* InstagramMedia.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED19F41C74969776DE6FEB23624D8F11 /* InstagramMedia.swift */; }; + 1B31817B781605AC5C54BE1F90804C33 /* InstagramResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 405FFCC627D63A5C8EED744B986B99B0 /* InstagramResponse.swift */; }; 220E209AC3EC1C1B913BCCD674729901 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; - 23F74A95837B053199B75F28238AD247 /* Location.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCFD3EB96F42F863BB2C8CC794A8F64 /* Location.swift */; }; 2402B0670DC241A13C8F917CF76D0206 /* Pods-ComtradeGramFinalTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 86C62026671E2C88B9BA337A058FFD93 /* Pods-ComtradeGramFinalTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 270A25D95A75607634A818A4230D2BED /* Dictionary+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA0772B2C8FF12BD8ADEE912F7FC7E2E /* Dictionary+SwiftInstagram.swift */; }; - 303F8538B20258E1D5B24B8DCADA6418 /* LocationSearchResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A5663669FBB5BA2AD84D4A02F72A3C6 /* LocationSearchResultsViewController.swift */; }; - 35576FE2893E084F4203FFE311A057DB /* Pods-ComtradeGramFinal-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = ADCB8062A627A00376019EA75609D3F0 /* Pods-ComtradeGramFinal-dummy.m */; }; 35642470519F0DD3713754980E6427F0 /* Pods-ComtradeGramFinalUITests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A0093C572B52EC6B29C22E74F17F4A7 /* Pods-ComtradeGramFinalUITests-dummy.m */; }; - 3A4744238E59176B10462C3FB0226FB9 /* Instagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91762D9A28FCD3303697C30273B20DED /* Instagram.swift */; }; - 3E2EEB8F11A76948506FE4923BD64286 /* Relationships.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE52EF3FB6A30EC06FD7DFB8189A81A1 /* Relationships.swift */; }; - 3F204C58C15128D22FA14C59241889EB /* InstagramLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E139277637185FDED2C2762BD3E7A33 /* InstagramLocation.swift */; }; - 6033313CAA69561C82844D25233AC72D /* SearchHistoryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99DBE52DB04CB4E45AB2EB0F2F817DDF /* SearchHistoryManager.swift */; }; - 62E6C86B5F4E79EFC5657D9E15F5DD70 /* Media.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5E0BF0EF7D087DA1AC2B6FB37AB634C /* Media.swift */; }; - 6F4692CEFF03EA40C85B4AF36EFD1092 /* InstagramTag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF53CB9A098A171B9906A25D72D1681 /* InstagramTag.swift */; }; - 7E88CB586C3022DCE67D389C11C33900 /* Likes.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA5915751A04A6CFA176F24DE8CC8AF1 /* Likes.swift */; }; - 8182BD80C91F01F93C964CF570A1EB22 /* InstagramRelationship.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85298E443B6724CBB793B4D5EE9F6637 /* InstagramRelationship.swift */; }; - 900866ABAEA73F8155565371637467A7 /* Array+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DFE5363F60D26EA1D9795471C5A9F20 /* Array+SwiftInstagram.swift */; }; - 9386FC6533090B5D9DBA7DEA4F356329 /* Locations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 555769B347B1FCEEF26A0600D888CB61 /* Locations.swift */; }; - 95746E78253C50DC572BE3F11B98D6FE /* InstagramComment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 592EC9EAB200B9FDE27D850AE5B16408 /* InstagramComment.swift */; }; - 97CB038F81C5E64081D61038BAF1D603 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; - 993594CE6B938B65DB75AE710BF38707 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; - 9982E62992E525E7973BB4A4695E2E37 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; - 9CB6385FCC102DEA70A913D98C1623FB /* InstagramUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F5DB1ABE6200886F78F4BB7942A1EDF /* InstagramUser.swift */; }; - 9F67E77889536E2BAD6FDB7C69AE7691 /* Optional+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = D821DA4C3EC7587859376693C5BF85DA /* Optional+SwiftInstagram.swift */; }; - 9F85B97442140DE41E6E43CA5468C070 /* InstagramResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0F44686FB8C953F35BF061383A641CB /* InstagramResponse.swift */; }; - A493853B243FAA58FC0F3E6601E3BC78 /* InstagramMedia.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DCCBE30E419C5CEB53AB8DA314E6B69 /* InstagramMedia.swift */; }; - AB2A2527FB20BDAED024495A039B47DC /* SwiftInstagram-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DBC6364F55588C7EF196664B1C98301 /* SwiftInstagram-dummy.m */; }; - B0C9122E6BFE7200340798095E2AA5EC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B99596250CFCA59D78FF8869DD858BDF /* Images.xcassets */; }; + 3A74166513B29255A74205844BCAD7DE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; + 407B312B0B3673C61934225658944838 /* Array+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBE3BF0F05A7664F1F42C695F80F9B47 /* Array+SwiftInstagram.swift */; }; + 4EE9D92E75872611409DD635D10F5515 /* InstagramUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EEECD67877547482FCACC81FE2E4CB1 /* InstagramUser.swift */; }; + 5E39C8152D56B32451096ACB8A487F69 /* Users.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1183E03AE537EADBF0C944414A6FF66 /* Users.swift */; }; + 652C8D62897955E73072E16D82DE425C /* InstagramRelationship.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3DE4CBDEA7D62688A0A6BB7BD2D699A /* InstagramRelationship.swift */; }; + 65F6362A5812EA164FCEB7821C7CA041 /* InstagramComment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59F760CDEB68A960E4267FDEA581533E /* InstagramComment.swift */; }; + 6A55961A65AE67D4A6579D9662EDDB63 /* Pods-ComtradeGramFinal-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 8DDFEC1CB32443ECA2E76A1F5A2E2096 /* Pods-ComtradeGramFinal-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 702CFD91F1F450895992F6FDC1304FB5 /* Data+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1B8940C6D2BAB0448B746CA3C4978EB /* Data+SwiftInstagram.swift */; }; + 71385E6DEF1A6E1F368303930DC77B0A /* Instagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20CAF73206390EABD283AF93DC8B9DFD /* Instagram.swift */; }; + 79E5666C7FC21F71EAD7D5DEF9E5033F /* Media.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0D081A4BF2C927FE77599076679B292 /* Media.swift */; }; + 7A7541C4902D42378EDB4F1FEC47C684 /* URL+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72E9DC0D32FA138583A43B70E0CA70E7 /* URL+SwiftInstagram.swift */; }; + 7D8D064B5DA638A911A3B53BB55972B1 /* Comments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B7CEC94E35675982F345EEAC558A72F /* Comments.swift */; }; + 81AF9F1A94D84A816E9F84648D283966 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; + 91B0671B8FECDBC3D66C1921D50B8971 /* Locations.swift in Sources */ = {isa = PBXBuildFile; fileRef = F512787EC210F96F4C2F104D9BB9B2F0 /* Locations.swift */; }; + 920B9A4599DFD409990071212F280F86 /* Pods-ComtradeGramFinal-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = ADCB8062A627A00376019EA75609D3F0 /* Pods-ComtradeGramFinal-dummy.m */; }; + 9B667DA0E7B6FDF11EDEFA7B4D8E856F /* InstagramScope.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB9A74F984A77EADD1AF2EB353B43A4B /* InstagramScope.swift */; }; + 9F78029007ADF150DF4F7FCC2AE9891B /* SwiftInstagram-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BFA146CD8872FB06C74E3238C7539E5 /* SwiftInstagram-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A2B196FF43AD8C1342FED458F25BD46B /* Relationships.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F663B530A1A4688ACC3B40CD9DA7348 /* Relationships.swift */; }; + B094D7527E999F5BEC10F3F577A4F8A6 /* InstagramTag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CF983BD43573BC6185CBD50745D474A /* InstagramTag.swift */; }; B7B0E953C47FE98E316DEF6120621075 /* Pods-ComtradeGramFinalTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6952E10C2562D093D2EE5A6B838D3499 /* Pods-ComtradeGramFinalTests-dummy.m */; }; - B8704D7D58C8CB99592B79B291F17E33 /* InstagramScope.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9FF7F8A806D4AAA5997C6545E3F967D /* InstagramScope.swift */; }; - BE313785DB0D335FA9EC60B5CDE7F27F /* Comments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EA931AC2F761C92BADE6195BE5920B7 /* Comments.swift */; }; - C6C0DECB2CCF25ACF8446C7E249E913C /* SwiftInstagram-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = A1F2252DE9D803C99DC6F0CCE8F86C7D /* SwiftInstagram-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - D10BB1011BDA0F12FC603850B6034411 /* LocationPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063600D7A96105AA31C41B77508713DD /* LocationPickerViewController.swift */; }; - E4149840596E5186B6AFC47B1B6484A2 /* Pods-ComtradeGramFinal-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 8DDFEC1CB32443ECA2E76A1F5A2E2096 /* Pods-ComtradeGramFinal-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E7A09D5DBDD3A0284B7AE4D5F134EF7E /* KeychainSwiftDistrib.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F46EB82C6BCC13C8CED5957F68FC6A /* KeychainSwiftDistrib.swift */; }; - EB2D9E42BB8A1CE044D9377F60812CD6 /* URL+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8EAFAEEE6AE6F771C7823A9F50997C8 /* URL+SwiftInstagram.swift */; }; - ED8B487DDD3F9F6AE0EDCAEAB6C406AF /* LocationPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = BAF670456DAE247C84870FB925DF096A /* LocationPicker.h */; settings = {ATTRIBUTES = (Public, ); }; }; - EF23270C16A870B07DD8DE3AB15D2D99 /* InstagramError.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1A3EE86E9F990470B437C692155B2B9 /* InstagramError.swift */; }; + BD09B2BB8159C9527542F2465A12E973 /* InstagramError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5459F6107395C04B50BDFB4BB890A284 /* InstagramError.swift */; }; + CF9C6FC312FF32F0E4FBB3CFBEA9B818 /* SwiftInstagram-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 847F01E2B9C4CF9F45D954359A09BD60 /* SwiftInstagram-dummy.m */; }; + D0000A75039CE3596C55C26EA5588D82 /* InstagramLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E3EA29F8ED0420088E9D580E96F5E0F /* InstagramLocation.swift */; }; + DBF1BADB1DFA19262ED3BF75D03A85D8 /* KeychainSwiftDistrib.swift in Sources */ = {isa = PBXBuildFile; fileRef = 870B5B25E4BE092CAE645810C6F2783C /* KeychainSwiftDistrib.swift */; }; + EA5CCA5A93393E99D05F9681CFE8AE39 /* InstagramLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C7C08AABF9095F154313E01D560401D /* InstagramLoginViewController.swift */; }; + EFC4066853B1008A38B67F0B13E20DA1 /* Tags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DD3DFAB93B367B7CE7D352414031B2A /* Tags.swift */; }; F27A51D7590876360B21C8CFFB421E38 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; - F68DEB6B2BCA1AF7A6BCD5F9A5E7732B /* Data+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD915AF928FB740071E56EF5832C70C0 /* Data+SwiftInstagram.swift */; }; + F2EB987E1565BBA474D55F51B6D15EE8 /* Dictionary+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A1986B5C10A59919C8512EF8A8E3B8 /* Dictionary+SwiftInstagram.swift */; }; + F5F0CD706B709C06D191919A956C4A12 /* Optional+SwiftInstagram.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABFAFE0117CC56867FEE50547A7CBE9A /* Optional+SwiftInstagram.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 1025F922819FD1FF2D1A3C311F696293 /* PBXContainerItemProxy */ = { + 784A1480F67CE7E911AF99393B53F188 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 6270B7E559D4DAE3057E9BC530994201; - remoteInfo = LocationPicker; - }; - 8BF4168FC1B8D01E2CB67265D691B9BA /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; - proxyType = 1; - remoteGlobalIDString = C718B4B9A322B71550C47FB3D6392690; + remoteGlobalIDString = 01AE8BF7196BF9EFBE221A8F1155F203; remoteInfo = SwiftInstagram; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 02BC0BCCDCA39772BCE8638E4AE87209 /* Pods-ComtradeGramFinal.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-ComtradeGramFinal.modulemap"; sourceTree = ""; }; - 03CD5EBA1F57157A483D6C99E503D441 /* SwiftInstagram.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SwiftInstagram.framework; path = SwiftInstagram.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 063600D7A96105AA31C41B77508713DD /* LocationPickerViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LocationPickerViewController.swift; path = LocationPicker/LocationPickerViewController.swift; sourceTree = ""; }; 0EC2ED43E4B8CDCA408471459E02B196 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0F1F98F44EA86EE775FF474BD9C41E50 /* Pods-ComtradeGramFinalTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ComtradeGramFinalTests-acknowledgements.plist"; sourceTree = ""; }; 1321DE22E844F58B6A60203CCAE5B325 /* Pods-ComtradeGramFinalUITests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ComtradeGramFinalUITests-acknowledgements.markdown"; sourceTree = ""; }; - 136D343E3733E4F1625FA931D99F7321 /* SwiftInstagram-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SwiftInstagram-prefix.pch"; sourceTree = ""; }; - 1A5663669FBB5BA2AD84D4A02F72A3C6 /* LocationSearchResultsViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LocationSearchResultsViewController.swift; path = LocationPicker/LocationSearchResultsViewController.swift; sourceTree = ""; }; - 1E139277637185FDED2C2762BD3E7A33 /* InstagramLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramLocation.swift; path = Sources/Models/InstagramLocation.swift; sourceTree = ""; }; - 2DCCBE30E419C5CEB53AB8DA314E6B69 /* InstagramMedia.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramMedia.swift; path = Sources/Models/InstagramMedia.swift; sourceTree = ""; }; - 2DFE5363F60D26EA1D9795471C5A9F20 /* Array+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Array+SwiftInstagram.swift"; path = "Sources/Extensions/Array+SwiftInstagram.swift"; sourceTree = ""; }; - 30CCDE246DC6AE8243A028A9AB90E214 /* Tags.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Tags.swift; path = Sources/Endpoints/Tags.swift; sourceTree = ""; }; - 30F82AC640F9EDB2899AFE0E3CF03374 /* SwiftInstagram.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = SwiftInstagram.modulemap; sourceTree = ""; }; + 20CAF73206390EABD283AF93DC8B9DFD /* Instagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Instagram.swift; path = Sources/Instagram.swift; sourceTree = ""; }; + 27C2EC661758ADF057FF02E5DE7E21EE /* Likes.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Likes.swift; path = Sources/Endpoints/Likes.swift; sourceTree = ""; }; + 2B7CEC94E35675982F345EEAC558A72F /* Comments.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Comments.swift; path = Sources/Endpoints/Comments.swift; sourceTree = ""; }; 3128216E6BFFEA437638008C85A96D45 /* Pods-ComtradeGramFinalUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinalUITests.release.xcconfig"; sourceTree = ""; }; + 31A1986B5C10A59919C8512EF8A8E3B8 /* Dictionary+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Dictionary+SwiftInstagram.swift"; path = "Sources/Extensions/Dictionary+SwiftInstagram.swift"; sourceTree = ""; }; 382869D374EA909FA3677ABAACED9E5D /* Pods-ComtradeGramFinal-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinal-frameworks.sh"; sourceTree = ""; }; + 3BFA146CD8872FB06C74E3238C7539E5 /* SwiftInstagram-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SwiftInstagram-umbrella.h"; sourceTree = ""; }; 3CF40225CE77019B9E9B4A9F8D7C9B80 /* Pods-ComtradeGramFinal.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinal.debug.xcconfig"; sourceTree = ""; }; + 3CF983BD43573BC6185CBD50745D474A /* InstagramTag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramTag.swift; path = Sources/Models/InstagramTag.swift; sourceTree = ""; }; + 405FFCC627D63A5C8EED744B986B99B0 /* InstagramResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramResponse.swift; path = Sources/Models/InstagramResponse.swift; sourceTree = ""; }; 4A0093C572B52EC6B29C22E74F17F4A7 /* Pods-ComtradeGramFinalUITests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ComtradeGramFinalUITests-dummy.m"; sourceTree = ""; }; - 4DBC6364F55588C7EF196664B1C98301 /* SwiftInstagram-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SwiftInstagram-dummy.m"; sourceTree = ""; }; - 4F5DB1ABE6200886F78F4BB7942A1EDF /* InstagramUser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramUser.swift; path = Sources/Models/InstagramUser.swift; sourceTree = ""; }; 5364C7ECB0B54F05C662D5BD7AECC715 /* Pods-ComtradeGramFinalTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-ComtradeGramFinalTests.modulemap"; sourceTree = ""; }; - 555769B347B1FCEEF26A0600D888CB61 /* Locations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Locations.swift; path = Sources/Endpoints/Locations.swift; sourceTree = ""; }; - 592EC9EAB200B9FDE27D850AE5B16408 /* InstagramComment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramComment.swift; path = Sources/Models/InstagramComment.swift; sourceTree = ""; }; + 5459F6107395C04B50BDFB4BB890A284 /* InstagramError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramError.swift; path = Sources/Models/InstagramError.swift; sourceTree = ""; }; + 59F760CDEB68A960E4267FDEA581533E /* InstagramComment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramComment.swift; path = Sources/Models/InstagramComment.swift; sourceTree = ""; }; 5A8D05B1D818E99A709030388A5C776B /* Pods-ComtradeGramFinal-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ComtradeGramFinal-acknowledgements.markdown"; sourceTree = ""; }; - 5BF53CB9A098A171B9906A25D72D1681 /* InstagramTag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramTag.swift; path = Sources/Models/InstagramTag.swift; sourceTree = ""; }; - 5CA39579306E6DC0D8D65E7C90B39C8C /* Pods_ComtradeGramFinalTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinalTests.framework; path = "Pods-ComtradeGramFinalTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5EA931AC2F761C92BADE6195BE5920B7 /* Comments.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Comments.swift; path = Sources/Endpoints/Comments.swift; sourceTree = ""; }; + 5EEECD67877547482FCACC81FE2E4CB1 /* InstagramUser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramUser.swift; path = Sources/Models/InstagramUser.swift; sourceTree = ""; }; 6233FD9354650EB139A9E6F199255AC7 /* Pods-ComtradeGramFinalUITests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-ComtradeGramFinalUITests-umbrella.h"; sourceTree = ""; }; 64CA6678FEF9FD10F1B362CAE896AB37 /* Pods-ComtradeGramFinalUITests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinalUITests-resources.sh"; sourceTree = ""; }; 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; 6952E10C2562D093D2EE5A6B838D3499 /* Pods-ComtradeGramFinalTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ComtradeGramFinalTests-dummy.m"; sourceTree = ""; }; 6BE16F74625E8874E57C596D69F3C091 /* Pods-ComtradeGramFinalUITests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-ComtradeGramFinalUITests.modulemap"; sourceTree = ""; }; - 6BFB400B0B0873D4F88A577069FED801 /* Pods_ComtradeGramFinalUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinalUITests.framework; path = "Pods-ComtradeGramFinalUITests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 6C4051416667E661A1B1A55D4F412036 /* LocationPicker-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "LocationPicker-prefix.pch"; sourceTree = ""; }; + 72E9DC0D32FA138583A43B70E0CA70E7 /* URL+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+SwiftInstagram.swift"; path = "Sources/Extensions/URL+SwiftInstagram.swift"; sourceTree = ""; }; + 73386F2DC02441DE1EA8A8ABA86F8082 /* SwiftInstagram-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SwiftInstagram-prefix.pch"; sourceTree = ""; }; + 7DD3DFAB93B367B7CE7D352414031B2A /* Tags.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Tags.swift; path = Sources/Endpoints/Tags.swift; sourceTree = ""; }; 7E70F066EB661C08FCFECDCF8BB78E53 /* Pods-ComtradeGramFinalUITests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinalUITests-frameworks.sh"; sourceTree = ""; }; 7F9B42FE7D2F2682EB370C3E23121122 /* Pods-ComtradeGramFinalTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinalTests.release.xcconfig"; sourceTree = ""; }; - 8037846325D3BE7787D0815A0052115A /* InstagramLoginViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramLoginViewController.swift; path = Sources/Views/InstagramLoginViewController.swift; sourceTree = ""; }; - 818F6380538864D67E93DC14CAE154DA /* LocationPicker.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = LocationPicker.modulemap; sourceTree = ""; }; - 85298E443B6724CBB793B4D5EE9F6637 /* InstagramRelationship.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramRelationship.swift; path = Sources/Models/InstagramRelationship.swift; sourceTree = ""; }; + 847F01E2B9C4CF9F45D954359A09BD60 /* SwiftInstagram-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SwiftInstagram-dummy.m"; sourceTree = ""; }; 86C62026671E2C88B9BA337A058FFD93 /* Pods-ComtradeGramFinalTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-ComtradeGramFinalTests-umbrella.h"; sourceTree = ""; }; - 89E232246B155B7476FC0FD57D975EFB /* Pods_ComtradeGramFinal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinal.framework; path = "Pods-ComtradeGramFinal.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 870B5B25E4BE092CAE645810C6F2783C /* KeychainSwiftDistrib.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = KeychainSwiftDistrib.swift; path = Sources/Helpers/KeychainSwiftDistrib.swift; sourceTree = ""; }; + 8B14DE1628BAD04E6A7F3DD81F4C84FE /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 8C7C08AABF9095F154313E01D560401D /* InstagramLoginViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramLoginViewController.swift; path = Sources/Views/InstagramLoginViewController.swift; sourceTree = ""; }; 8DDFEC1CB32443ECA2E76A1F5A2E2096 /* Pods-ComtradeGramFinal-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-ComtradeGramFinal-umbrella.h"; sourceTree = ""; }; 8ED58EB51A048A153C2C85825C7291F1 /* Pods-ComtradeGramFinal-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ComtradeGramFinal-acknowledgements.plist"; sourceTree = ""; }; - 8F9C1712580856D81A3C2C3970AEBBD8 /* LocationPicker.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = LocationPicker.xcconfig; sourceTree = ""; }; - 91762D9A28FCD3303697C30273B20DED /* Instagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Instagram.swift; path = Sources/Instagram.swift; sourceTree = ""; }; + 8F663B530A1A4688ACC3B40CD9DA7348 /* Relationships.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Relationships.swift; path = Sources/Endpoints/Relationships.swift; sourceTree = ""; }; + 937B8453C2192ADFD4BF8093DC6E3E86 /* Pods_ComtradeGramFinalTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinalTests.framework; path = "Pods-ComtradeGramFinalTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 99DBE52DB04CB4E45AB2EB0F2F817DDF /* SearchHistoryManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SearchHistoryManager.swift; path = LocationPicker/SearchHistoryManager.swift; sourceTree = ""; }; 9C6F566B5FA4830FDEECE6B316873BFF /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A1A3EE86E9F990470B437C692155B2B9 /* InstagramError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramError.swift; path = Sources/Models/InstagramError.swift; sourceTree = ""; }; + 9E3EA29F8ED0420088E9D580E96F5E0F /* InstagramLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramLocation.swift; path = Sources/Models/InstagramLocation.swift; sourceTree = ""; }; + A0D081A4BF2C927FE77599076679B292 /* Media.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Media.swift; path = Sources/Endpoints/Media.swift; sourceTree = ""; }; A1E1A853F8A9B1B3130405C1490E2380 /* Pods-ComtradeGramFinalTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ComtradeGramFinalTests-acknowledgements.markdown"; sourceTree = ""; }; - A1F2252DE9D803C99DC6F0CCE8F86C7D /* SwiftInstagram-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SwiftInstagram-umbrella.h"; sourceTree = ""; }; + A21140C5740B6CA37E34881B3D2DB30B /* Pods_ComtradeGramFinalUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinalUITests.framework; path = "Pods-ComtradeGramFinalUITests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; A5DB8FFEB1A5981DBC1D4A43D7731D0A /* Pods-ComtradeGramFinalUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinalUITests.debug.xcconfig"; sourceTree = ""; }; - A9B56404EE4D5DE22CFBE35B6C3F09B6 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + AB9A74F984A77EADD1AF2EB353B43A4B /* InstagramScope.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramScope.swift; path = Sources/InstagramScope.swift; sourceTree = ""; }; + ABFAFE0117CC56867FEE50547A7CBE9A /* Optional+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Optional+SwiftInstagram.swift"; path = "Sources/Extensions/Optional+SwiftInstagram.swift"; sourceTree = ""; }; ADCB8062A627A00376019EA75609D3F0 /* Pods-ComtradeGramFinal-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ComtradeGramFinal-dummy.m"; sourceTree = ""; }; B0ABF5C3522F46B69ACB5FED61DB5606 /* Pods-ComtradeGramFinalUITests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ComtradeGramFinalUITests-acknowledgements.plist"; sourceTree = ""; }; B0D63E01ED81DA8497AF0E58E3DCD233 /* Pods-ComtradeGramFinalTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinalTests-frameworks.sh"; sourceTree = ""; }; B105EECE766BC05A2F36B9C72C1EC8F1 /* Pods-ComtradeGramFinal-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinal-resources.sh"; sourceTree = ""; }; - B530FC49F55FC39F428740386ADC80EA /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; B67487A4FAF59C996F6E79F61AD0B45A /* Pods-ComtradeGramFinal.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinal.release.xcconfig"; sourceTree = ""; }; - B93CA5281383870C8B002C50DB320905 /* LocationPicker-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "LocationPicker-dummy.m"; sourceTree = ""; }; - B99596250CFCA59D78FF8869DD858BDF /* Images.xcassets */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = LocationPicker/Images.xcassets; sourceTree = ""; }; - BAF670456DAE247C84870FB925DF096A /* LocationPicker.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LocationPicker.h; path = LocationPicker/LocationPicker.h; sourceTree = ""; }; - BD915AF928FB740071E56EF5832C70C0 /* Data+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Data+SwiftInstagram.swift"; path = "Sources/Extensions/Data+SwiftInstagram.swift"; sourceTree = ""; }; - CDCFD3EB96F42F863BB2C8CC794A8F64 /* Location.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Location.swift; path = LocationPicker/Location.swift; sourceTree = ""; }; - CE52EF3FB6A30EC06FD7DFB8189A81A1 /* Relationships.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Relationships.swift; path = Sources/Endpoints/Relationships.swift; sourceTree = ""; }; + B90E1D212E0C0B6DEB78FDE317F8CB94 /* Pods_ComtradeGramFinal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinal.framework; path = "Pods-ComtradeGramFinal.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + C3DE4CBDEA7D62688A0A6BB7BD2D699A /* InstagramRelationship.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramRelationship.swift; path = Sources/Models/InstagramRelationship.swift; sourceTree = ""; }; + C68B46AE97921A208C66A0AFA6F11391 /* SwiftInstagram.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = SwiftInstagram.modulemap; sourceTree = ""; }; + CBE3BF0F05A7664F1F42C695F80F9B47 /* Array+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Array+SwiftInstagram.swift"; path = "Sources/Extensions/Array+SwiftInstagram.swift"; sourceTree = ""; }; + D1183E03AE537EADBF0C944414A6FF66 /* Users.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Users.swift; path = Sources/Endpoints/Users.swift; sourceTree = ""; }; D177ADBC65430373F205689C1F03841B /* Pods-ComtradeGramFinalTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinalTests.debug.xcconfig"; sourceTree = ""; }; - D73222EE47F965264739F1B308C40749 /* LocationPicker-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "LocationPicker-umbrella.h"; sourceTree = ""; }; - D821DA4C3EC7587859376693C5BF85DA /* Optional+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Optional+SwiftInstagram.swift"; path = "Sources/Extensions/Optional+SwiftInstagram.swift"; sourceTree = ""; }; - D8EAFAEEE6AE6F771C7823A9F50997C8 /* URL+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+SwiftInstagram.swift"; path = "Sources/Extensions/URL+SwiftInstagram.swift"; sourceTree = ""; }; - D9FF7F8A806D4AAA5997C6545E3F967D /* InstagramScope.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramScope.swift; path = Sources/InstagramScope.swift; sourceTree = ""; }; - E57CC4BD6A1E02EAD60677B804441D16 /* SwiftInstagram.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SwiftInstagram.xcconfig; sourceTree = ""; }; - ED4CA94CC9A0A0572D7C7937A7E74A68 /* LocationPicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = LocationPicker.framework; path = LocationPicker.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + E1B8940C6D2BAB0448B746CA3C4978EB /* Data+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Data+SwiftInstagram.swift"; path = "Sources/Extensions/Data+SwiftInstagram.swift"; sourceTree = ""; }; + ED19F41C74969776DE6FEB23624D8F11 /* InstagramMedia.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramMedia.swift; path = Sources/Models/InstagramMedia.swift; sourceTree = ""; }; EE5665149C7D372703711D2F23E10942 /* Pods-ComtradeGramFinalTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinalTests-resources.sh"; sourceTree = ""; }; - F0F44686FB8C953F35BF061383A641CB /* InstagramResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramResponse.swift; path = Sources/Models/InstagramResponse.swift; sourceTree = ""; }; - F5E0BF0EF7D087DA1AC2B6FB37AB634C /* Media.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Media.swift; path = Sources/Endpoints/Media.swift; sourceTree = ""; }; - F8B1085EBD02F4B94856BA24442DFC91 /* Users.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Users.swift; path = Sources/Endpoints/Users.swift; sourceTree = ""; }; - F9F46EB82C6BCC13C8CED5957F68FC6A /* KeychainSwiftDistrib.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = KeychainSwiftDistrib.swift; path = Sources/Helpers/KeychainSwiftDistrib.swift; sourceTree = ""; }; - FA0772B2C8FF12BD8ADEE912F7FC7E2E /* Dictionary+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Dictionary+SwiftInstagram.swift"; path = "Sources/Extensions/Dictionary+SwiftInstagram.swift"; sourceTree = ""; }; - FA5915751A04A6CFA176F24DE8CC8AF1 /* Likes.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Likes.swift; path = Sources/Endpoints/Likes.swift; sourceTree = ""; }; + F12EF9679C96DA88762EE1ECE7CD28B5 /* SwiftInstagram.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SwiftInstagram.xcconfig; sourceTree = ""; }; + F512787EC210F96F4C2F104D9BB9B2F0 /* Locations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Locations.swift; path = Sources/Endpoints/Locations.swift; sourceTree = ""; }; + FA520C6BBF3CF86593E04C30D7BE2982 /* SwiftInstagram.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SwiftInstagram.framework; path = SwiftInstagram.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FE0DFDC8DBE8AFC553E99BF12A903672 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 3498D7607F139346D732A39E436896F5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 9982E62992E525E7973BB4A4695E2E37 /* Foundation.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8232D65D255B4D2322BE640ED66EEF91 /* Frameworks */ = { + 8268A53B3C79FFD32AF1DB65AC8CF869 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 993594CE6B938B65DB75AE710BF38707 /* Foundation.framework in Frameworks */, + 81AF9F1A94D84A816E9F84648D283966 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 94866B4BD4AB763B8258EE680EB6660B /* Frameworks */ = { + D9D329CBFC0C30CA75A8A9A5D9A9F9FE /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 97CB038F81C5E64081D61038BAF1D603 /* Foundation.framework in Frameworks */, + F27A51D7590876360B21C8CFFB421E38 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - D9D329CBFC0C30CA75A8A9A5D9A9F9FE /* Frameworks */ = { + EC50314AA57FA309BCF868954C2942F0 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F27A51D7590876360B21C8CFFB421E38 /* Foundation.framework in Frameworks */, + 3A74166513B29255A74205844BCAD7DE /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -215,34 +178,22 @@ path = "Target Support Files/Pods-ComtradeGramFinalTests"; sourceTree = ""; }; - 1E03944030799284B721897308617FDC /* Support Files */ = { + 2F47B20CF8CC4CB295C5D8DDE49E840F /* Products */ = { isa = PBXGroup; children = ( - B530FC49F55FC39F428740386ADC80EA /* Info.plist */, - 30F82AC640F9EDB2899AFE0E3CF03374 /* SwiftInstagram.modulemap */, - E57CC4BD6A1E02EAD60677B804441D16 /* SwiftInstagram.xcconfig */, - 4DBC6364F55588C7EF196664B1C98301 /* SwiftInstagram-dummy.m */, - 136D343E3733E4F1625FA931D99F7321 /* SwiftInstagram-prefix.pch */, - A1F2252DE9D803C99DC6F0CCE8F86C7D /* SwiftInstagram-umbrella.h */, + B90E1D212E0C0B6DEB78FDE317F8CB94 /* Pods_ComtradeGramFinal.framework */, + 937B8453C2192ADFD4BF8093DC6E3E86 /* Pods_ComtradeGramFinalTests.framework */, + A21140C5740B6CA37E34881B3D2DB30B /* Pods_ComtradeGramFinalUITests.framework */, + FA520C6BBF3CF86593E04C30D7BE2982 /* SwiftInstagram.framework */, ); - name = "Support Files"; - path = "../Target Support Files/SwiftInstagram"; - sourceTree = ""; - }; - 3C0460277FA43257BCD6DA1DCAF9AC18 /* Pods */ = { - isa = PBXGroup; - children = ( - 7F9D01770F7998CA997559ECD076F75E /* LocationPicker */, - 52866A523B922A856DE7B1B0AC63FE54 /* SwiftInstagram */, - ); - name = Pods; + name = Products; sourceTree = ""; }; - 52866A523B922A856DE7B1B0AC63FE54 /* SwiftInstagram */ = { + 68472651F7683FF944000A598774F88C /* SwiftInstagram */ = { isa = PBXGroup; children = ( - 8ACFA231554B46770B9DE983DFFF03E4 /* Core */, - 1E03944030799284B721897308617FDC /* Support Files */, + 7BD13335F4D10ECAFC072EBFB01224B4 /* Core */, + 9F2960BE71B14BA07664F9E53C5A0F00 /* Support Files */, ); name = SwiftInstagram; path = SwiftInstagram; @@ -266,61 +217,46 @@ path = "Target Support Files/Pods-ComtradeGramFinalUITests"; sourceTree = ""; }; - 7DB346D0F39D3F0E887471402A8071AB = { - isa = PBXGroup; - children = ( - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, - BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */, - 3C0460277FA43257BCD6DA1DCAF9AC18 /* Pods */, - AD1EB7E97ACE0D87B177A9D537F18568 /* Products */, - B2AAB03E2C9F773E564B2F9C38FC1A2D /* Targets Support Files */, - ); - sourceTree = ""; - }; - 7F9D01770F7998CA997559ECD076F75E /* LocationPicker */ = { + 7BD13335F4D10ECAFC072EBFB01224B4 /* Core */ = { isa = PBXGroup; children = ( - CDCFD3EB96F42F863BB2C8CC794A8F64 /* Location.swift */, - BAF670456DAE247C84870FB925DF096A /* LocationPicker.h */, - 063600D7A96105AA31C41B77508713DD /* LocationPickerViewController.swift */, - 1A5663669FBB5BA2AD84D4A02F72A3C6 /* LocationSearchResultsViewController.swift */, - 99DBE52DB04CB4E45AB2EB0F2F817DDF /* SearchHistoryManager.swift */, - F2BD2C4B0718E4F529C3354531059101 /* Resources */, - FD30DF2033CF26EC18EBA35943AA2D13 /* Support Files */, + CBE3BF0F05A7664F1F42C695F80F9B47 /* Array+SwiftInstagram.swift */, + 2B7CEC94E35675982F345EEAC558A72F /* Comments.swift */, + E1B8940C6D2BAB0448B746CA3C4978EB /* Data+SwiftInstagram.swift */, + 31A1986B5C10A59919C8512EF8A8E3B8 /* Dictionary+SwiftInstagram.swift */, + 20CAF73206390EABD283AF93DC8B9DFD /* Instagram.swift */, + 59F760CDEB68A960E4267FDEA581533E /* InstagramComment.swift */, + 5459F6107395C04B50BDFB4BB890A284 /* InstagramError.swift */, + 9E3EA29F8ED0420088E9D580E96F5E0F /* InstagramLocation.swift */, + 8C7C08AABF9095F154313E01D560401D /* InstagramLoginViewController.swift */, + ED19F41C74969776DE6FEB23624D8F11 /* InstagramMedia.swift */, + C3DE4CBDEA7D62688A0A6BB7BD2D699A /* InstagramRelationship.swift */, + 405FFCC627D63A5C8EED744B986B99B0 /* InstagramResponse.swift */, + AB9A74F984A77EADD1AF2EB353B43A4B /* InstagramScope.swift */, + 3CF983BD43573BC6185CBD50745D474A /* InstagramTag.swift */, + 5EEECD67877547482FCACC81FE2E4CB1 /* InstagramUser.swift */, + 870B5B25E4BE092CAE645810C6F2783C /* KeychainSwiftDistrib.swift */, + 27C2EC661758ADF057FF02E5DE7E21EE /* Likes.swift */, + F512787EC210F96F4C2F104D9BB9B2F0 /* Locations.swift */, + A0D081A4BF2C927FE77599076679B292 /* Media.swift */, + ABFAFE0117CC56867FEE50547A7CBE9A /* Optional+SwiftInstagram.swift */, + 8F663B530A1A4688ACC3B40CD9DA7348 /* Relationships.swift */, + 7DD3DFAB93B367B7CE7D352414031B2A /* Tags.swift */, + 72E9DC0D32FA138583A43B70E0CA70E7 /* URL+SwiftInstagram.swift */, + D1183E03AE537EADBF0C944414A6FF66 /* Users.swift */, ); - name = LocationPicker; - path = LocationPicker; + name = Core; sourceTree = ""; }; - 8ACFA231554B46770B9DE983DFFF03E4 /* Core */ = { + 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( - 2DFE5363F60D26EA1D9795471C5A9F20 /* Array+SwiftInstagram.swift */, - 5EA931AC2F761C92BADE6195BE5920B7 /* Comments.swift */, - BD915AF928FB740071E56EF5832C70C0 /* Data+SwiftInstagram.swift */, - FA0772B2C8FF12BD8ADEE912F7FC7E2E /* Dictionary+SwiftInstagram.swift */, - 91762D9A28FCD3303697C30273B20DED /* Instagram.swift */, - 592EC9EAB200B9FDE27D850AE5B16408 /* InstagramComment.swift */, - A1A3EE86E9F990470B437C692155B2B9 /* InstagramError.swift */, - 1E139277637185FDED2C2762BD3E7A33 /* InstagramLocation.swift */, - 8037846325D3BE7787D0815A0052115A /* InstagramLoginViewController.swift */, - 2DCCBE30E419C5CEB53AB8DA314E6B69 /* InstagramMedia.swift */, - 85298E443B6724CBB793B4D5EE9F6637 /* InstagramRelationship.swift */, - F0F44686FB8C953F35BF061383A641CB /* InstagramResponse.swift */, - D9FF7F8A806D4AAA5997C6545E3F967D /* InstagramScope.swift */, - 5BF53CB9A098A171B9906A25D72D1681 /* InstagramTag.swift */, - 4F5DB1ABE6200886F78F4BB7942A1EDF /* InstagramUser.swift */, - F9F46EB82C6BCC13C8CED5957F68FC6A /* KeychainSwiftDistrib.swift */, - FA5915751A04A6CFA176F24DE8CC8AF1 /* Likes.swift */, - 555769B347B1FCEEF26A0600D888CB61 /* Locations.swift */, - F5E0BF0EF7D087DA1AC2B6FB37AB634C /* Media.swift */, - D821DA4C3EC7587859376693C5BF85DA /* Optional+SwiftInstagram.swift */, - CE52EF3FB6A30EC06FD7DFB8189A81A1 /* Relationships.swift */, - 30CCDE246DC6AE8243A028A9AB90E214 /* Tags.swift */, - D8EAFAEEE6AE6F771C7823A9F50997C8 /* URL+SwiftInstagram.swift */, - F8B1085EBD02F4B94856BA24442DFC91 /* Users.swift */, + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, + BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */, + E3552806942FC55343978980D9F541EB /* Pods */, + 2F47B20CF8CC4CB295C5D8DDE49E840F /* Products */, + B2AAB03E2C9F773E564B2F9C38FC1A2D /* Targets Support Files */, ); - name = Core; sourceTree = ""; }; 938D12F75180B6394B7C1DDDCBE51923 /* Pods-ComtradeGramFinal */ = { @@ -341,16 +277,18 @@ path = "Target Support Files/Pods-ComtradeGramFinal"; sourceTree = ""; }; - AD1EB7E97ACE0D87B177A9D537F18568 /* Products */ = { + 9F2960BE71B14BA07664F9E53C5A0F00 /* Support Files */ = { isa = PBXGroup; children = ( - ED4CA94CC9A0A0572D7C7937A7E74A68 /* LocationPicker.framework */, - 89E232246B155B7476FC0FD57D975EFB /* Pods_ComtradeGramFinal.framework */, - 5CA39579306E6DC0D8D65E7C90B39C8C /* Pods_ComtradeGramFinalTests.framework */, - 6BFB400B0B0873D4F88A577069FED801 /* Pods_ComtradeGramFinalUITests.framework */, - 03CD5EBA1F57157A483D6C99E503D441 /* SwiftInstagram.framework */, + 8B14DE1628BAD04E6A7F3DD81F4C84FE /* Info.plist */, + C68B46AE97921A208C66A0AFA6F11391 /* SwiftInstagram.modulemap */, + F12EF9679C96DA88762EE1ECE7CD28B5 /* SwiftInstagram.xcconfig */, + 847F01E2B9C4CF9F45D954359A09BD60 /* SwiftInstagram-dummy.m */, + 73386F2DC02441DE1EA8A8ABA86F8082 /* SwiftInstagram-prefix.pch */, + 3BFA146CD8872FB06C74E3238C7539E5 /* SwiftInstagram-umbrella.h */, ); - name = Products; + name = "Support Files"; + path = "../Target Support Files/SwiftInstagram"; sourceTree = ""; }; B2AAB03E2C9F773E564B2F9C38FC1A2D /* Targets Support Files */ = { @@ -379,45 +317,22 @@ name = iOS; sourceTree = ""; }; - F2BD2C4B0718E4F529C3354531059101 /* Resources */ = { - isa = PBXGroup; - children = ( - B99596250CFCA59D78FF8869DD858BDF /* Images.xcassets */, - ); - name = Resources; - sourceTree = ""; - }; - FD30DF2033CF26EC18EBA35943AA2D13 /* Support Files */ = { + E3552806942FC55343978980D9F541EB /* Pods */ = { isa = PBXGroup; children = ( - A9B56404EE4D5DE22CFBE35B6C3F09B6 /* Info.plist */, - 818F6380538864D67E93DC14CAE154DA /* LocationPicker.modulemap */, - 8F9C1712580856D81A3C2C3970AEBBD8 /* LocationPicker.xcconfig */, - B93CA5281383870C8B002C50DB320905 /* LocationPicker-dummy.m */, - 6C4051416667E661A1B1A55D4F412036 /* LocationPicker-prefix.pch */, - D73222EE47F965264739F1B308C40749 /* LocationPicker-umbrella.h */, + 68472651F7683FF944000A598774F88C /* SwiftInstagram */, ); - name = "Support Files"; - path = "../Target Support Files/LocationPicker"; + name = Pods; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 4D46A5D638301B7530184DF41ED156EF /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 0139BCAAF0A6CE4CDA811DEBE64D6E63 /* LocationPicker-umbrella.h in Headers */, - ED8B487DDD3F9F6AE0EDCAEAB6C406AF /* LocationPicker.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 915A96A1E7035C29FEB5DF2AA902A8AB /* Headers */ = { + 4B9DE721C926075E8E26DC5C225F1416 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - C6C0DECB2CCF25ACF8446C7E249E913C /* SwiftInstagram-umbrella.h in Headers */, + 6A55961A65AE67D4A6579D9662EDDB63 /* Pods-ComtradeGramFinal-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -429,11 +344,11 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9B93C0482DB10C615065020F6D2A5D10 /* Headers */ = { + DF83E5647BB7683EE524AC02BF449F61 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - E4149840596E5186B6AFC47B1B6484A2 /* Pods-ComtradeGramFinal-umbrella.h in Headers */, + 9F78029007ADF150DF4F7FCC2AE9891B /* SwiftInstagram-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -448,39 +363,38 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 49558A954C0BA7E65B4A64143BE8B71C /* Pods-ComtradeGramFinalTests */ = { + 01AE8BF7196BF9EFBE221A8F1155F203 /* SwiftInstagram */ = { isa = PBXNativeTarget; - buildConfigurationList = 227E16014ADF37215B26365AF6BDB52C /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinalTests" */; + buildConfigurationList = 413DF85F28EA1DC7025DCCBFA1C753CF /* Build configuration list for PBXNativeTarget "SwiftInstagram" */; buildPhases = ( - AC12AD64F01804738F15A2086D49D03E /* Sources */, - F2FA92950BB4C76D252E566B71D60280 /* Frameworks */, - 96D71A32DD94710BE080611F05872049 /* Headers */, + 0F1F672A2FF8041DE42344BE4E9EB915 /* Sources */, + EC50314AA57FA309BCF868954C2942F0 /* Frameworks */, + DF83E5647BB7683EE524AC02BF449F61 /* Headers */, ); buildRules = ( ); dependencies = ( ); - name = "Pods-ComtradeGramFinalTests"; - productName = "Pods-ComtradeGramFinalTests"; - productReference = 5CA39579306E6DC0D8D65E7C90B39C8C /* Pods_ComtradeGramFinalTests.framework */; + name = SwiftInstagram; + productName = SwiftInstagram; + productReference = FA520C6BBF3CF86593E04C30D7BE2982 /* SwiftInstagram.framework */; productType = "com.apple.product-type.framework"; }; - 6270B7E559D4DAE3057E9BC530994201 /* LocationPicker */ = { + 49558A954C0BA7E65B4A64143BE8B71C /* Pods-ComtradeGramFinalTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 9229B3CF2A2625DEA2BD95319565B62F /* Build configuration list for PBXNativeTarget "LocationPicker" */; + buildConfigurationList = 227E16014ADF37215B26365AF6BDB52C /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinalTests" */; buildPhases = ( - 3C27784F0D8A3243AE35CE2BB11BC250 /* Sources */, - 94866B4BD4AB763B8258EE680EB6660B /* Frameworks */, - 4D46A5D638301B7530184DF41ED156EF /* Headers */, - 2D7FD623EBAA9B5A8B4A1BEACCCD3EBC /* Resources */, + AC12AD64F01804738F15A2086D49D03E /* Sources */, + F2FA92950BB4C76D252E566B71D60280 /* Frameworks */, + 96D71A32DD94710BE080611F05872049 /* Headers */, ); buildRules = ( ); dependencies = ( ); - name = LocationPicker; - productName = LocationPicker; - productReference = ED4CA94CC9A0A0572D7C7937A7E74A68 /* LocationPicker.framework */; + name = "Pods-ComtradeGramFinalTests"; + productName = "Pods-ComtradeGramFinalTests"; + productReference = 937B8453C2192ADFD4BF8093DC6E3E86 /* Pods_ComtradeGramFinalTests.framework */; productType = "com.apple.product-type.framework"; }; 85B9478DEB09EF6E2DF3555E8F6527C9 /* Pods-ComtradeGramFinalUITests */ = { @@ -497,43 +411,25 @@ ); name = "Pods-ComtradeGramFinalUITests"; productName = "Pods-ComtradeGramFinalUITests"; - productReference = 6BFB400B0B0873D4F88A577069FED801 /* Pods_ComtradeGramFinalUITests.framework */; + productReference = A21140C5740B6CA37E34881B3D2DB30B /* Pods_ComtradeGramFinalUITests.framework */; productType = "com.apple.product-type.framework"; }; - C718B4B9A322B71550C47FB3D6392690 /* SwiftInstagram */ = { + 8E868E2A2F8101716FCEF4E97025335D /* Pods-ComtradeGramFinal */ = { isa = PBXNativeTarget; - buildConfigurationList = 9455150A84C133D0401928B0DAE01FB4 /* Build configuration list for PBXNativeTarget "SwiftInstagram" */; + buildConfigurationList = 47D9B0073F437A94CAAC3A7C9C8C2979 /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinal" */; buildPhases = ( - FCC80C0696EFDC8BB7E514D51B77ABD5 /* Sources */, - 8232D65D255B4D2322BE640ED66EEF91 /* Frameworks */, - 915A96A1E7035C29FEB5DF2AA902A8AB /* Headers */, + A6223B06C6EFE683E03FB22789F0F75D /* Sources */, + 8268A53B3C79FFD32AF1DB65AC8CF869 /* Frameworks */, + 4B9DE721C926075E8E26DC5C225F1416 /* Headers */, ); buildRules = ( ); dependencies = ( - ); - name = SwiftInstagram; - productName = SwiftInstagram; - productReference = 03CD5EBA1F57157A483D6C99E503D441 /* SwiftInstagram.framework */; - productType = "com.apple.product-type.framework"; - }; - EACBF4FCE0593F78ABD4F86B18C850C1 /* Pods-ComtradeGramFinal */ = { - isa = PBXNativeTarget; - buildConfigurationList = C4103C5778FE452967A0B94DC2C7DC07 /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinal" */; - buildPhases = ( - A68F8A6C007E56CAE11B9249287ECDC7 /* Sources */, - 3498D7607F139346D732A39E436896F5 /* Frameworks */, - 9B93C0482DB10C615065020F6D2A5D10 /* Headers */, - ); - buildRules = ( - ); - dependencies = ( - DA547F0A2A4258FC6CB670F1A2415C9E /* PBXTargetDependency */, - 47BAD29102165A91909A8834485CF2E2 /* PBXTargetDependency */, + A37A33FFBC3F3D177C6AAB20365DE203 /* PBXTargetDependency */, ); name = "Pods-ComtradeGramFinal"; productName = "Pods-ComtradeGramFinal"; - productReference = 89E232246B155B7476FC0FD57D975EFB /* Pods_ComtradeGramFinal.framework */; + productReference = B90E1D212E0C0B6DEB78FDE317F8CB94 /* Pods_ComtradeGramFinal.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -553,30 +449,18 @@ en, ); mainGroup = 7DB346D0F39D3F0E887471402A8071AB; - productRefGroup = AD1EB7E97ACE0D87B177A9D537F18568 /* Products */; + productRefGroup = 2F47B20CF8CC4CB295C5D8DDE49E840F /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 6270B7E559D4DAE3057E9BC530994201 /* LocationPicker */, - EACBF4FCE0593F78ABD4F86B18C850C1 /* Pods-ComtradeGramFinal */, + 8E868E2A2F8101716FCEF4E97025335D /* Pods-ComtradeGramFinal */, 49558A954C0BA7E65B4A64143BE8B71C /* Pods-ComtradeGramFinalTests */, 85B9478DEB09EF6E2DF3555E8F6527C9 /* Pods-ComtradeGramFinalUITests */, - C718B4B9A322B71550C47FB3D6392690 /* SwiftInstagram */, + 01AE8BF7196BF9EFBE221A8F1155F203 /* SwiftInstagram */, ); }; /* End PBXProject section */ -/* Begin PBXResourcesBuildPhase section */ - 2D7FD623EBAA9B5A8B4A1BEACCCD3EBC /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - B0C9122E6BFE7200340798095E2AA5EC /* Images.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 056D9D65E4F71C0D92BD5136E8F9CACE /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -586,23 +470,43 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3C27784F0D8A3243AE35CE2BB11BC250 /* Sources */ = { + 0F1F672A2FF8041DE42344BE4E9EB915 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 23F74A95837B053199B75F28238AD247 /* Location.swift in Sources */, - 0EDA0271052D30E5D223D9291C6E98D4 /* LocationPicker-dummy.m in Sources */, - D10BB1011BDA0F12FC603850B6034411 /* LocationPickerViewController.swift in Sources */, - 303F8538B20258E1D5B24B8DCADA6418 /* LocationSearchResultsViewController.swift in Sources */, - 6033313CAA69561C82844D25233AC72D /* SearchHistoryManager.swift in Sources */, + 407B312B0B3673C61934225658944838 /* Array+SwiftInstagram.swift in Sources */, + 7D8D064B5DA638A911A3B53BB55972B1 /* Comments.swift in Sources */, + 702CFD91F1F450895992F6FDC1304FB5 /* Data+SwiftInstagram.swift in Sources */, + F2EB987E1565BBA474D55F51B6D15EE8 /* Dictionary+SwiftInstagram.swift in Sources */, + 71385E6DEF1A6E1F368303930DC77B0A /* Instagram.swift in Sources */, + 65F6362A5812EA164FCEB7821C7CA041 /* InstagramComment.swift in Sources */, + BD09B2BB8159C9527542F2465A12E973 /* InstagramError.swift in Sources */, + D0000A75039CE3596C55C26EA5588D82 /* InstagramLocation.swift in Sources */, + EA5CCA5A93393E99D05F9681CFE8AE39 /* InstagramLoginViewController.swift in Sources */, + 0D4A40C1AA3B51D6339CB606629755C0 /* InstagramMedia.swift in Sources */, + 652C8D62897955E73072E16D82DE425C /* InstagramRelationship.swift in Sources */, + 1B31817B781605AC5C54BE1F90804C33 /* InstagramResponse.swift in Sources */, + 9B667DA0E7B6FDF11EDEFA7B4D8E856F /* InstagramScope.swift in Sources */, + B094D7527E999F5BEC10F3F577A4F8A6 /* InstagramTag.swift in Sources */, + 4EE9D92E75872611409DD635D10F5515 /* InstagramUser.swift in Sources */, + DBF1BADB1DFA19262ED3BF75D03A85D8 /* KeychainSwiftDistrib.swift in Sources */, + 0527C0E5D22450735307E084A8BAA96F /* Likes.swift in Sources */, + 91B0671B8FECDBC3D66C1921D50B8971 /* Locations.swift in Sources */, + 79E5666C7FC21F71EAD7D5DEF9E5033F /* Media.swift in Sources */, + F5F0CD706B709C06D191919A956C4A12 /* Optional+SwiftInstagram.swift in Sources */, + A2B196FF43AD8C1342FED458F25BD46B /* Relationships.swift in Sources */, + CF9C6FC312FF32F0E4FBB3CFBEA9B818 /* SwiftInstagram-dummy.m in Sources */, + EFC4066853B1008A38B67F0B13E20DA1 /* Tags.swift in Sources */, + 7A7541C4902D42378EDB4F1FEC47C684 /* URL+SwiftInstagram.swift in Sources */, + 5E39C8152D56B32451096ACB8A487F69 /* Users.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - A68F8A6C007E56CAE11B9249287ECDC7 /* Sources */ = { + A6223B06C6EFE683E03FB22789F0F75D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 35576FE2893E084F4203FFE311A057DB /* Pods-ComtradeGramFinal-dummy.m in Sources */, + 920B9A4599DFD409990071212F280F86 /* Pods-ComtradeGramFinal-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -614,52 +518,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - FCC80C0696EFDC8BB7E514D51B77ABD5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 900866ABAEA73F8155565371637467A7 /* Array+SwiftInstagram.swift in Sources */, - BE313785DB0D335FA9EC60B5CDE7F27F /* Comments.swift in Sources */, - F68DEB6B2BCA1AF7A6BCD5F9A5E7732B /* Data+SwiftInstagram.swift in Sources */, - 270A25D95A75607634A818A4230D2BED /* Dictionary+SwiftInstagram.swift in Sources */, - 3A4744238E59176B10462C3FB0226FB9 /* Instagram.swift in Sources */, - 95746E78253C50DC572BE3F11B98D6FE /* InstagramComment.swift in Sources */, - EF23270C16A870B07DD8DE3AB15D2D99 /* InstagramError.swift in Sources */, - 3F204C58C15128D22FA14C59241889EB /* InstagramLocation.swift in Sources */, - 00F96C8B36A460C09122C67A0CCD1E11 /* InstagramLoginViewController.swift in Sources */, - A493853B243FAA58FC0F3E6601E3BC78 /* InstagramMedia.swift in Sources */, - 8182BD80C91F01F93C964CF570A1EB22 /* InstagramRelationship.swift in Sources */, - 9F85B97442140DE41E6E43CA5468C070 /* InstagramResponse.swift in Sources */, - B8704D7D58C8CB99592B79B291F17E33 /* InstagramScope.swift in Sources */, - 6F4692CEFF03EA40C85B4AF36EFD1092 /* InstagramTag.swift in Sources */, - 9CB6385FCC102DEA70A913D98C1623FB /* InstagramUser.swift in Sources */, - E7A09D5DBDD3A0284B7AE4D5F134EF7E /* KeychainSwiftDistrib.swift in Sources */, - 7E88CB586C3022DCE67D389C11C33900 /* Likes.swift in Sources */, - 9386FC6533090B5D9DBA7DEA4F356329 /* Locations.swift in Sources */, - 62E6C86B5F4E79EFC5657D9E15F5DD70 /* Media.swift in Sources */, - 9F67E77889536E2BAD6FDB7C69AE7691 /* Optional+SwiftInstagram.swift in Sources */, - 3E2EEB8F11A76948506FE4923BD64286 /* Relationships.swift in Sources */, - AB2A2527FB20BDAED024495A039B47DC /* SwiftInstagram-dummy.m in Sources */, - 0F44C64373D1D6BB0C07E919DE8B43E6 /* Tags.swift in Sources */, - EB2D9E42BB8A1CE044D9377F60812CD6 /* URL+SwiftInstagram.swift in Sources */, - 150B6E4BDEF2F5BE30503072312697C5 /* Users.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 47BAD29102165A91909A8834485CF2E2 /* PBXTargetDependency */ = { + A37A33FFBC3F3D177C6AAB20365DE203 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = SwiftInstagram; - target = C718B4B9A322B71550C47FB3D6392690 /* SwiftInstagram */; - targetProxy = 8BF4168FC1B8D01E2CB67265D691B9BA /* PBXContainerItemProxy */; - }; - DA547F0A2A4258FC6CB670F1A2415C9E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = LocationPicker; - target = 6270B7E559D4DAE3057E9BC530994201 /* LocationPicker */; - targetProxy = 1025F922819FD1FF2D1A3C311F696293 /* PBXContainerItemProxy */; + target = 01AE8BF7196BF9EFBE221A8F1155F203 /* SwiftInstagram */; + targetProxy = 784A1480F67CE7E911AF99393B53F188 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -756,40 +622,6 @@ }; name = Debug; }; - 43DA719C8684C2D4D4A02CE86591CDA5 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = B67487A4FAF59C996F6E79F61AD0B45A /* Pods-ComtradeGramFinal.release.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-ComtradeGramFinal/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_ComtradeGramFinal; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; 552DED13A8BC3B69A29CF51D822F6EA7 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 7F9B42FE7D2F2682EB370C3E23121122 /* Pods-ComtradeGramFinalTests.release.xcconfig */; @@ -855,9 +687,9 @@ }; name = Debug; }; - 82A14D042E0DCB10692E3CC9374EAFC9 /* Debug */ = { + 687E87373AB77477E0381A075B80CD35 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E57CC4BD6A1E02EAD60677B804441D16 /* SwiftInstagram.xcconfig */; + baseConfigurationReference = 3CF40225CE77019B9E9B4A9F8D7C9B80 /* Pods-ComtradeGramFinal.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -868,27 +700,30 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/SwiftInstagram/SwiftInstagram-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/SwiftInstagram/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-ComtradeGramFinal/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/SwiftInstagram/SwiftInstagram.modulemap"; - PRODUCT_NAME = SwiftInstagram; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = Pods_ComtradeGramFinal; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 89650BD86CC7D20546DC7A1AAB21F279 /* Release */ = { + 7A1B9C47191AAAB2777DC05C021F2A13 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E57CC4BD6A1E02EAD60677B804441D16 /* SwiftInstagram.xcconfig */; + baseConfigurationReference = F12EF9679C96DA88762EE1ECE7CD28B5 /* SwiftInstagram.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -973,40 +808,9 @@ }; name = Release; }; - B6CF70CCA567D68FCB34CD320AEB0309 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 8F9C1712580856D81A3C2C3970AEBBD8 /* LocationPicker.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/LocationPicker/LocationPicker-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/LocationPicker/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/LocationPicker/LocationPicker.modulemap"; - PRODUCT_NAME = LocationPicker; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - E051149295BA0A54BE40A91B864F135E /* Release */ = { + 9258D6A7E2C144D5A6082DC02CC1DBEC /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3128216E6BFFEA437638008C85A96D45 /* Pods-ComtradeGramFinalUITests.release.xcconfig */; + baseConfigurationReference = B67487A4FAF59C996F6E79F61AD0B45A /* Pods-ComtradeGramFinal.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1017,19 +821,20 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-ComtradeGramFinalUITests/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-ComtradeGramFinal/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.modulemap"; + MODULEMAP_FILE = "Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal.modulemap"; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_ComtradeGramFinalUITests; + PRODUCT_NAME = Pods_ComtradeGramFinal; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1037,9 +842,9 @@ }; name = Release; }; - EB4FF940435E14452C3B31BCE26F6B30 /* Debug */ = { + C716DA104DFC4F4C1E6CA1249679CC2E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3CF40225CE77019B9E9B4A9F8D7C9B80 /* Pods-ComtradeGramFinal.debug.xcconfig */; + baseConfigurationReference = F12EF9679C96DA88762EE1ECE7CD28B5 /* SwiftInstagram.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1050,30 +855,27 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-ComtradeGramFinal/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/SwiftInstagram/SwiftInstagram-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/SwiftInstagram/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.2; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_ComtradeGramFinal; + MODULEMAP_FILE = "Target Support Files/SwiftInstagram/SwiftInstagram.modulemap"; + PRODUCT_NAME = SwiftInstagram; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - EED2A1AA8908366F91FCC019470E69F2 /* Release */ = { + E051149295BA0A54BE40A91B864F135E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8F9C1712580856D81A3C2C3970AEBBD8 /* LocationPicker.xcconfig */; + baseConfigurationReference = 3128216E6BFFEA437638008C85A96D45 /* Pods-ComtradeGramFinalUITests.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1084,18 +886,19 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/LocationPicker/LocationPicker-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/LocationPicker/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-ComtradeGramFinalUITests/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/LocationPicker/LocationPicker.modulemap"; - PRODUCT_NAME = LocationPicker; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = Pods_ComtradeGramFinalUITests; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1124,38 +927,29 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 624F405AE074B968980E4BD6B0394141 /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinalUITests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3BACA1D3B2DAE5A9E30131E508AE7234 /* Debug */, - E051149295BA0A54BE40A91B864F135E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 9229B3CF2A2625DEA2BD95319565B62F /* Build configuration list for PBXNativeTarget "LocationPicker" */ = { + 413DF85F28EA1DC7025DCCBFA1C753CF /* Build configuration list for PBXNativeTarget "SwiftInstagram" */ = { isa = XCConfigurationList; buildConfigurations = ( - B6CF70CCA567D68FCB34CD320AEB0309 /* Debug */, - EED2A1AA8908366F91FCC019470E69F2 /* Release */, + C716DA104DFC4F4C1E6CA1249679CC2E /* Debug */, + 7A1B9C47191AAAB2777DC05C021F2A13 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9455150A84C133D0401928B0DAE01FB4 /* Build configuration list for PBXNativeTarget "SwiftInstagram" */ = { + 47D9B0073F437A94CAAC3A7C9C8C2979 /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinal" */ = { isa = XCConfigurationList; buildConfigurations = ( - 82A14D042E0DCB10692E3CC9374EAFC9 /* Debug */, - 89650BD86CC7D20546DC7A1AAB21F279 /* Release */, + 687E87373AB77477E0381A075B80CD35 /* Debug */, + 9258D6A7E2C144D5A6082DC02CC1DBEC /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C4103C5778FE452967A0B94DC2C7DC07 /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinal" */ = { + 624F405AE074B968980E4BD6B0394141 /* Build configuration list for PBXNativeTarget "Pods-ComtradeGramFinalUITests" */ = { isa = XCConfigurationList; buildConfigurations = ( - EB4FF940435E14452C3B31BCE26F6B30 /* Debug */, - 43DA719C8684C2D4D4A02CE86591CDA5 /* Release */, + 3BACA1D3B2DAE5A9E30131E508AE7234 /* Debug */, + E051149295BA0A54BE40A91B864F135E /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.markdown b/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.markdown index a98213a..959fc81 100644 --- a/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.markdown +++ b/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.markdown @@ -1,31 +1,6 @@ # Acknowledgements This application makes use of the following third party libraries: -## LocationPicker - -The MIT License (MIT) - -Copyright (c) 2015, Almas Sapargali - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - ## SwiftInstagram MIT License diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.plist b/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.plist index badf10d..5e99f1b 100644 --- a/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-acknowledgements.plist @@ -12,37 +12,6 @@ Type PSGroupSpecifier - - FooterText - The MIT License (MIT) - -Copyright (c) 2015, Almas Sapargali - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - License - MIT - Title - LocationPicker - Type - PSGroupSpecifier - FooterText MIT License diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-frameworks.sh b/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-frameworks.sh index d85e7e1..d5f60bb 100755 --- a/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-frameworks.sh +++ b/Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal-frameworks.sh @@ -134,11 +134,9 @@ strip_invalid_archs() { if [[ "$CONFIGURATION" == "Debug" ]]; then - install_framework "${BUILT_PRODUCTS_DIR}/LocationPicker/LocationPicker.framework" install_framework "${BUILT_PRODUCTS_DIR}/SwiftInstagram/SwiftInstagram.framework" fi if [[ "$CONFIGURATION" == "Release" ]]; then - install_framework "${BUILT_PRODUCTS_DIR}/LocationPicker/LocationPicker.framework" install_framework "${BUILT_PRODUCTS_DIR}/SwiftInstagram/SwiftInstagram.framework" fi if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.debug.xcconfig b/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.debug.xcconfig index 3c44ee0..41de1d5 100644 --- a/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.debug.xcconfig +++ b/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.debug.xcconfig @@ -1,7 +1,7 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker/LocationPicker.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram/SwiftInstagram.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram/SwiftInstagram.framework/Headers" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.release.xcconfig b/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.release.xcconfig index 3c44ee0..41de1d5 100644 --- a/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.release.xcconfig +++ b/Pods/Target Support Files/Pods-ComtradeGramFinalTests/Pods-ComtradeGramFinalTests.release.xcconfig @@ -1,7 +1,7 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker/LocationPicker.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram/SwiftInstagram.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram/SwiftInstagram.framework/Headers" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.debug.xcconfig b/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.debug.xcconfig index 3c44ee0..41de1d5 100644 --- a/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.debug.xcconfig +++ b/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.debug.xcconfig @@ -1,7 +1,7 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker/LocationPicker.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram/SwiftInstagram.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram/SwiftInstagram.framework/Headers" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.release.xcconfig b/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.release.xcconfig index 3c44ee0..41de1d5 100644 --- a/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.release.xcconfig +++ b/Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.release.xcconfig @@ -1,7 +1,7 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/LocationPicker/LocationPicker.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram/SwiftInstagram.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/SwiftInstagram/SwiftInstagram.framework/Headers" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. From dc34d2ce57a024c6e8f50285ab4431f5d818a604 Mon Sep 17 00:00:00 2001 From: Miroslav Mirovic Date: Wed, 14 Feb 2018 12:39:39 +0100 Subject: [PATCH 7/8] update mapViewControllera - center --- .../ViewControllers/MapViewController.swift | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/ComtradeGramFinal/ViewControllers/MapViewController.swift b/ComtradeGramFinal/ViewControllers/MapViewController.swift index 88a87eb..179624d 100644 --- a/ComtradeGramFinal/ViewControllers/MapViewController.swift +++ b/ComtradeGramFinal/ViewControllers/MapViewController.swift @@ -143,20 +143,22 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD let location = self.post?.location let center = self.post?.location?.coordinates - let region = MKCoordinateRegion(center: center!, span: MKCoordinateSpan(latitudeDelta: 0.01, longitudeDelta: 0.01)) - mapView.setRegion(region, animated: true) - mapView.showsUserLocation = true - - mapView.removeAnnotation(self.postPin) + if let center = center { + let region = MKCoordinateRegion(center: center, span: MKCoordinateSpan(latitudeDelta: 0.01, longitudeDelta: 0.01)) + mapView.setRegion(region, animated: true) + mapView.showsUserLocation = true + + mapView.removeAnnotation(self.postPin) - //set region on the map - mapView.setRegion(region, animated: true) - - if let coordinates = location?.coordinates { - postPin.coordinate = coordinates - mapView.addAnnotation(postPin) + //set region on the map + mapView.setRegion(region, animated: true) + + if let coordinates = location?.coordinates { + postPin.coordinate = coordinates + mapView.addAnnotation(postPin) + } } } } From 0cc2f12558313ff9daff5d6a9774e723e0fdf36b Mon Sep 17 00:00:00 2001 From: Miroslav Mirovic Date: Wed, 14 Feb 2018 13:24:21 +0100 Subject: [PATCH 8/8] Task 5 - Present post Location, post name, post author. --- ComtradeGramFinal.xcodeproj/project.pbxproj | 4 -- .../ViewControllers/MapViewController.swift | 64 +++++++------------ .../ViewControllers/PinAnnotation.swift | 22 ------- Pods/Pods.xcodeproj/project.pbxproj | 24 +++---- 4 files changed, 35 insertions(+), 79 deletions(-) delete mode 100644 ComtradeGramFinal/ViewControllers/PinAnnotation.swift diff --git a/ComtradeGramFinal.xcodeproj/project.pbxproj b/ComtradeGramFinal.xcodeproj/project.pbxproj index 42f2d4e..e8b31a4 100644 --- a/ComtradeGramFinal.xcodeproj/project.pbxproj +++ b/ComtradeGramFinal.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ 0784C4DB2019196F000E942E /* UIImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0784C4DA2019196F000E942E /* UIImageView.swift */; }; 90C2055B863CC46A8EC5F904 /* Pods_ComtradeGramFinalTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DE6CDDB43799CA87D77C0B2 /* Pods_ComtradeGramFinalTests.framework */; }; B2DB6D372B1B2596201149ED /* Pods_ComtradeGramFinal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA36AD9161F49952F5BD6D08 /* Pods_ComtradeGramFinal.framework */; }; - D13019AF20344E7C00803D15 /* PinAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D13019AE20344E7C00803D15 /* PinAnnotation.swift */; }; D146B64620337E350060983D /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D146B64520337E350060983D /* MapKit.framework */; }; EB1FCA11AEBC2E7CA61E80C9 /* Pods_ComtradeGramFinalUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5972BEBF5F29AFF33D431699 /* Pods_ComtradeGramFinalUITests.framework */; }; /* End PBXBuildFile section */ @@ -78,7 +77,6 @@ 9CAB271CD111DF6FF66E1E89 /* Pods-ComtradeGramFinal.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ComtradeGramFinal.release.xcconfig"; path = "Pods/Target Support Files/Pods-ComtradeGramFinal/Pods-ComtradeGramFinal.release.xcconfig"; sourceTree = ""; }; A3A5C9D7385833C8A86AED69 /* Pods-ComtradeGramFinalUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ComtradeGramFinalUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.debug.xcconfig"; sourceTree = ""; }; C8497E9560F46BE726082DDE /* Pods-ComtradeGramFinalUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ComtradeGramFinalUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ComtradeGramFinalUITests/Pods-ComtradeGramFinalUITests.release.xcconfig"; sourceTree = ""; }; - D13019AE20344E7C00803D15 /* PinAnnotation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinAnnotation.swift; sourceTree = ""; }; D146B64520337E350060983D /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; DA36AD9161F49952F5BD6D08 /* Pods_ComtradeGramFinal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ComtradeGramFinal.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -121,7 +119,6 @@ 071CE9A42025C7D700BEEAAD /* SearchViewController copy.swift */, 071E5FD82018F667001B8FE6 /* LoginViewController.swift */, 071CE99E2025C79F00BEEAAD /* MapViewController.swift */, - D13019AE20344E7C00803D15 /* PinAnnotation.swift */, 071CE9A62025D47400BEEAAD /* SettingsViewController.swift */, 073C19472006891100F7816E /* HomeViewController.swift */, ); @@ -512,7 +509,6 @@ 0784C4DB2019196F000E942E /* UIImageView.swift in Sources */, 073C19482006891100F7816E /* HomeViewController.swift in Sources */, 073C194E2006891100F7816E /* ComtradeGramFinal.xcdatamodeld in Sources */, - D13019AF20344E7C00803D15 /* PinAnnotation.swift in Sources */, 071CE99D2025C78600BEEAAD /* ProfileViewController.swift in Sources */, 071CE99F2025C79F00BEEAAD /* MapViewController.swift in Sources */, 071CE9A52025C7D700BEEAAD /* SearchViewController copy.swift in Sources */, diff --git a/ComtradeGramFinal/ViewControllers/MapViewController.swift b/ComtradeGramFinal/ViewControllers/MapViewController.swift index 179624d..cd08337 100644 --- a/ComtradeGramFinal/ViewControllers/MapViewController.swift +++ b/ComtradeGramFinal/ViewControllers/MapViewController.swift @@ -41,9 +41,9 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD } - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - print(self.post?.location?.coordinates.latitude) + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + self.updatePostLocation() } @@ -56,7 +56,7 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD } - func locationManager(manager: CLLocationManager, didChangeAuthorizationStatus status: CLAuthorizationStatus) { + private func locationManager(manager: CLLocationManager, didChangeAuthorizationStatus status: CLAuthorizationStatus) { switch status { @@ -74,46 +74,25 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD } } - func locationManager(manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) { - - let location = locations.first! - let coordinateRegion = MKCoordinateRegionMakeWithDistance(location.coordinate, 500, 500) - mapView.setRegion(coordinateRegion, animated: true) - locationManager?.stopUpdatingLocation() - locationManager = nil - } - - func locationManager(manager: CLLocationManager, didFailWithError error: NSError) { - print("Failed to initialize GPS: ", error.description) - } - // present user location on map // get post location latitude and longitude and present it's pointer // add annotation view with title: postName and description - func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? - { - if annotation is MKUserLocation {return nil} - - let reuseId = "pin" + func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? { + if annotation is MKUserLocation { return nil } - var pinView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseId) as? MKPinAnnotationView - if pinView == nil { - pinView = MKPinAnnotationView(annotation: annotation, reuseIdentifier: reuseId) - pinView!.canShowCallout = true - pinView!.animatesDrop = true - let calloutButton = UIButton(type: .detailDisclosure) - pinView!.rightCalloutAccessoryView = calloutButton - pinView!.sizeToFit() - } - else { - pinView!.annotation = annotation + var annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: "identifier") as? MKPinAnnotationView + if annotationView == nil { + annotationView = MKPinAnnotationView(annotation: annotation, reuseIdentifier: "identifier") + annotationView?.canShowCallout = true + // annotationView?.rightCalloutAccessoryView = UIButton(type: .infoLight) + } else { + annotationView?.annotation = annotation } - - return pinView + return annotationView } func mapView(_ mapView: MKMapView, annotationView view: MKAnnotationView, calloutAccessoryControlTapped control: UIControl) { @@ -141,22 +120,26 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD func updatePostLocation() { if let mapView = self.mapView { let location = self.post?.location - let center = self.post?.location?.coordinates + let center = self.post?.location if let center = center { - let region = MKCoordinateRegion(center: center, span: MKCoordinateSpan(latitudeDelta: 0.01, longitudeDelta: 0.01)) + let region = MKCoordinateRegion(center: center.coordinates, span: MKCoordinateSpan(latitudeDelta: 0.01, longitudeDelta: 0.01)) mapView.setRegion(region, animated: true) mapView.showsUserLocation = true mapView.removeAnnotation(self.postPin) - - - + //set region on the map mapView.setRegion(region, animated: true) if let coordinates = location?.coordinates { postPin.coordinate = coordinates + + // Add an annotation + + postPin.title = self.post?.user.username + postPin.subtitle = self.post?.caption?.text + mapView.addAnnotation(postPin) } } @@ -172,4 +155,3 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, MKMapViewD } } - diff --git a/ComtradeGramFinal/ViewControllers/PinAnnotation.swift b/ComtradeGramFinal/ViewControllers/PinAnnotation.swift deleted file mode 100644 index 79384bb..0000000 --- a/ComtradeGramFinal/ViewControllers/PinAnnotation.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// PinAnnotation.swift -// ComtradeGramFinal -// -// Created by Miroslav Mirovic on 2/14/18. -// Copyright © 2018 com.comtrade.Gram. All rights reserved. -// - - -import MapKit - -class PinAnnotation: NSObject, MKAnnotation { - var title: String? - var subtitle: String? - var coordinate: CLLocationCoordinate2D - - init(title: String, subtitle: String, coordinate: CLLocationCoordinate2D) { - self.title = title - self.subtitle = subtitle - self.coordinate = coordinate - } -} diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 57fedcc..1699d8b 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 48; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -56,7 +56,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 02BC0BCCDCA39772BCE8638E4AE87209 /* Pods-ComtradeGramFinal.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-ComtradeGramFinal.modulemap"; sourceTree = ""; }; + 02BC0BCCDCA39772BCE8638E4AE87209 /* Pods-ComtradeGramFinal.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-ComtradeGramFinal.modulemap"; sourceTree = ""; }; 0EC2ED43E4B8CDCA408471459E02B196 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0F1F98F44EA86EE775FF474BD9C41E50 /* Pods-ComtradeGramFinalTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ComtradeGramFinalTests-acknowledgements.plist"; sourceTree = ""; }; 1321DE22E844F58B6A60203CCAE5B325 /* Pods-ComtradeGramFinalUITests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ComtradeGramFinalUITests-acknowledgements.markdown"; sourceTree = ""; }; @@ -71,7 +71,7 @@ 3CF983BD43573BC6185CBD50745D474A /* InstagramTag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramTag.swift; path = Sources/Models/InstagramTag.swift; sourceTree = ""; }; 405FFCC627D63A5C8EED744B986B99B0 /* InstagramResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramResponse.swift; path = Sources/Models/InstagramResponse.swift; sourceTree = ""; }; 4A0093C572B52EC6B29C22E74F17F4A7 /* Pods-ComtradeGramFinalUITests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ComtradeGramFinalUITests-dummy.m"; sourceTree = ""; }; - 5364C7ECB0B54F05C662D5BD7AECC715 /* Pods-ComtradeGramFinalTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-ComtradeGramFinalTests.modulemap"; sourceTree = ""; }; + 5364C7ECB0B54F05C662D5BD7AECC715 /* Pods-ComtradeGramFinalTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-ComtradeGramFinalTests.modulemap"; sourceTree = ""; }; 5459F6107395C04B50BDFB4BB890A284 /* InstagramError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramError.swift; path = Sources/Models/InstagramError.swift; sourceTree = ""; }; 59F760CDEB68A960E4267FDEA581533E /* InstagramComment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramComment.swift; path = Sources/Models/InstagramComment.swift; sourceTree = ""; }; 5A8D05B1D818E99A709030388A5C776B /* Pods-ComtradeGramFinal-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ComtradeGramFinal-acknowledgements.markdown"; sourceTree = ""; }; @@ -80,7 +80,7 @@ 64CA6678FEF9FD10F1B362CAE896AB37 /* Pods-ComtradeGramFinalUITests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinalUITests-resources.sh"; sourceTree = ""; }; 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; 6952E10C2562D093D2EE5A6B838D3499 /* Pods-ComtradeGramFinalTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ComtradeGramFinalTests-dummy.m"; sourceTree = ""; }; - 6BE16F74625E8874E57C596D69F3C091 /* Pods-ComtradeGramFinalUITests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-ComtradeGramFinalUITests.modulemap"; sourceTree = ""; }; + 6BE16F74625E8874E57C596D69F3C091 /* Pods-ComtradeGramFinalUITests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-ComtradeGramFinalUITests.modulemap"; sourceTree = ""; }; 72E9DC0D32FA138583A43B70E0CA70E7 /* URL+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+SwiftInstagram.swift"; path = "Sources/Extensions/URL+SwiftInstagram.swift"; sourceTree = ""; }; 73386F2DC02441DE1EA8A8ABA86F8082 /* SwiftInstagram-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SwiftInstagram-prefix.pch"; sourceTree = ""; }; 7DD3DFAB93B367B7CE7D352414031B2A /* Tags.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Tags.swift; path = Sources/Endpoints/Tags.swift; sourceTree = ""; }; @@ -94,13 +94,13 @@ 8DDFEC1CB32443ECA2E76A1F5A2E2096 /* Pods-ComtradeGramFinal-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-ComtradeGramFinal-umbrella.h"; sourceTree = ""; }; 8ED58EB51A048A153C2C85825C7291F1 /* Pods-ComtradeGramFinal-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ComtradeGramFinal-acknowledgements.plist"; sourceTree = ""; }; 8F663B530A1A4688ACC3B40CD9DA7348 /* Relationships.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Relationships.swift; path = Sources/Endpoints/Relationships.swift; sourceTree = ""; }; - 937B8453C2192ADFD4BF8093DC6E3E86 /* Pods_ComtradeGramFinalTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinalTests.framework; path = "Pods-ComtradeGramFinalTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 937B8453C2192ADFD4BF8093DC6E3E86 /* Pods_ComtradeGramFinalTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ComtradeGramFinalTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9C6F566B5FA4830FDEECE6B316873BFF /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9E3EA29F8ED0420088E9D580E96F5E0F /* InstagramLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramLocation.swift; path = Sources/Models/InstagramLocation.swift; sourceTree = ""; }; A0D081A4BF2C927FE77599076679B292 /* Media.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Media.swift; path = Sources/Endpoints/Media.swift; sourceTree = ""; }; A1E1A853F8A9B1B3130405C1490E2380 /* Pods-ComtradeGramFinalTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ComtradeGramFinalTests-acknowledgements.markdown"; sourceTree = ""; }; - A21140C5740B6CA37E34881B3D2DB30B /* Pods_ComtradeGramFinalUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinalUITests.framework; path = "Pods-ComtradeGramFinalUITests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + A21140C5740B6CA37E34881B3D2DB30B /* Pods_ComtradeGramFinalUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ComtradeGramFinalUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A5DB8FFEB1A5981DBC1D4A43D7731D0A /* Pods-ComtradeGramFinalUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinalUITests.debug.xcconfig"; sourceTree = ""; }; AB9A74F984A77EADD1AF2EB353B43A4B /* InstagramScope.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramScope.swift; path = Sources/InstagramScope.swift; sourceTree = ""; }; ABFAFE0117CC56867FEE50547A7CBE9A /* Optional+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Optional+SwiftInstagram.swift"; path = "Sources/Extensions/Optional+SwiftInstagram.swift"; sourceTree = ""; }; @@ -109,9 +109,9 @@ B0D63E01ED81DA8497AF0E58E3DCD233 /* Pods-ComtradeGramFinalTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinalTests-frameworks.sh"; sourceTree = ""; }; B105EECE766BC05A2F36B9C72C1EC8F1 /* Pods-ComtradeGramFinal-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinal-resources.sh"; sourceTree = ""; }; B67487A4FAF59C996F6E79F61AD0B45A /* Pods-ComtradeGramFinal.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinal.release.xcconfig"; sourceTree = ""; }; - B90E1D212E0C0B6DEB78FDE317F8CB94 /* Pods_ComtradeGramFinal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ComtradeGramFinal.framework; path = "Pods-ComtradeGramFinal.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + B90E1D212E0C0B6DEB78FDE317F8CB94 /* Pods_ComtradeGramFinal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ComtradeGramFinal.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C3DE4CBDEA7D62688A0A6BB7BD2D699A /* InstagramRelationship.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InstagramRelationship.swift; path = Sources/Models/InstagramRelationship.swift; sourceTree = ""; }; - C68B46AE97921A208C66A0AFA6F11391 /* SwiftInstagram.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = SwiftInstagram.modulemap; sourceTree = ""; }; + C68B46AE97921A208C66A0AFA6F11391 /* SwiftInstagram.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = SwiftInstagram.modulemap; sourceTree = ""; }; CBE3BF0F05A7664F1F42C695F80F9B47 /* Array+SwiftInstagram.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Array+SwiftInstagram.swift"; path = "Sources/Extensions/Array+SwiftInstagram.swift"; sourceTree = ""; }; D1183E03AE537EADBF0C944414A6FF66 /* Users.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Users.swift; path = Sources/Endpoints/Users.swift; sourceTree = ""; }; D177ADBC65430373F205689C1F03841B /* Pods-ComtradeGramFinalTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ComtradeGramFinalTests.debug.xcconfig"; sourceTree = ""; }; @@ -120,7 +120,7 @@ EE5665149C7D372703711D2F23E10942 /* Pods-ComtradeGramFinalTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ComtradeGramFinalTests-resources.sh"; sourceTree = ""; }; F12EF9679C96DA88762EE1ECE7CD28B5 /* SwiftInstagram.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SwiftInstagram.xcconfig; sourceTree = ""; }; F512787EC210F96F4C2F104D9BB9B2F0 /* Locations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Locations.swift; path = Sources/Endpoints/Locations.swift; sourceTree = ""; }; - FA520C6BBF3CF86593E04C30D7BE2982 /* SwiftInstagram.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SwiftInstagram.framework; path = SwiftInstagram.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + FA520C6BBF3CF86593E04C30D7BE2982 /* SwiftInstagram.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftInstagram.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FE0DFDC8DBE8AFC553E99BF12A903672 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -195,7 +195,6 @@ 7BD13335F4D10ECAFC072EBFB01224B4 /* Core */, 9F2960BE71B14BA07664F9E53C5A0F00 /* Support Files */, ); - name = SwiftInstagram; path = SwiftInstagram; sourceTree = ""; }; @@ -439,7 +438,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0700; + LastUpgradeCheck = 0920; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -804,6 +803,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SYMROOT = "${SRCROOT}/../build"; }; name = Release;