From 43258f9116ab6876f00d685fcdba37d77efa0e75 Mon Sep 17 00:00:00 2001 From: Mike Westendorf Date: Wed, 7 Jun 2017 17:46:23 -0400 Subject: [PATCH 1/6] updated VimeoNetworking pod, fixed compiler issues. --- Podfile.lock | 2 +- Pods/Manifest.lock | 2 +- Pods/Pods.xcodeproj/project.pbxproj | 440 ++++++++++-------- ...s-VimeoUpload-iOS-OldUpload.debug.xcconfig | 1 - ...VimeoUpload-iOS-OldUpload.release.xcconfig | 1 - .../Pods-VimeoUpload-iOS.debug.xcconfig | 1 - .../Pods-VimeoUpload-iOS.release.xcconfig | 1 - .../Sources/AppConfiguration.swift | 6 +- .../Sources/AuthenticationController.swift | 16 +- .../VimeoNetworking/Sources/Constants.swift | 2 +- .../Models/SubscriptionCollection.swift | 9 +- .../Sources/Models/VIMModelObject.m | 11 +- .../VimeoNetworking/Sources/Models/VIMUser.h | 2 +- .../VimeoNetworking/Sources/Models/VIMUser.m | 12 +- .../VimeoNetworking/Sources/Models/VIMVideo.m | 2 - .../Sources/Objc_ExceptionCatcher.m | 2 +- .../Sources/Request+Cache.swift | 9 +- .../Sources/ResponseCache.swift | 25 +- .../VimeoNetworking/Sources/VimeoClient.swift | 65 ++- .../VimeoSessionManager+Constructors.swift | 25 +- .../Sources/VimeoSessionManager.swift | 5 +- .../ReachableDescriptorManager.swift | 2 +- .../VimeoRequestSerializer+Thumbnail.swift | 4 +- .../VimeoRequestSerializer+Upload.swift | 2 +- .../VimeoRequestSerializer+OldUpload.swift | 14 +- VimeoUpload/VimeoUploader.swift | 2 +- 26 files changed, 375 insertions(+), 288 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 967a347c..0bcd60c4 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -27,7 +27,7 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: VimeoNetworking: - :commit: 026c0f7c9e7075884c995d8e7e245eecb97d4ef4 + :commit: f50522749886d01fb0c0acceb3e159ac8dc0c4de :git: git@github.com:vimeo/VimeoNetworking.git SPEC CHECKSUMS: diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 967a347c..0bcd60c4 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -27,7 +27,7 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: VimeoNetworking: - :commit: 026c0f7c9e7075884c995d8e7e245eecb97d4ef4 + :commit: f50522749886d01fb0c0acceb3e159ac8dc0c4de :git: git@github.com:vimeo/VimeoNetworking.git SPEC CHECKSUMS: diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index b95df792..6b50c4f6 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -27,7 +27,6 @@ 1E2A6D057E20BE8F5ED3E594F7B8C286 /* AFNetworking-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 13485EB89727E5D2EC453EE2ACF262B1 /* AFNetworking-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; 20B1A3A44C5B99E3C0E0111980E2D166 /* VIMUploadQuota.m in Sources */ = {isa = PBXBuildFile; fileRef = D91BABF53F46F9B94488819367CB559E /* VIMUploadQuota.m */; }; 2158EA68FF692EC0E79E21A1868DDADC /* VIMVideo+VOD.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EDADBD03E681FF52A2DE74B6E5A00A4 /* VIMVideo+VOD.m */; }; - 23EFB184AD12FB1014FFC765CE0D710A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D39D513DA3519FA56B3F9657B9F9990 /* Security.framework */; }; 247BEC62A7A059F149C2F1DEE37EC117 /* VimeoSessionManager+Constructors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E61F34F2E6B1E414299E9F4D8B5FFF8 /* VimeoSessionManager+Constructors.swift */; }; 25C7F1E0679C775BC68F3F91A41898AB /* VIMGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = FA2516A7CB0A50CB9CD1053367E53327 /* VIMGroup.h */; settings = {ATTRIBUTES = (Public, ); }; }; 290A5C980B9B4A45125C22A3C6F4D52E /* VIMConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 635406386C5C563BE8F30C456CF4EBDE /* VIMConnection.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -39,6 +38,7 @@ 2D99923831FFCE9F73C0C7D1E9F850E2 /* AppConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = E658A3C4548684F7BC6D6A4843EBEE23 /* AppConfiguration.swift */; }; 2E50A1D999933C0305B3BD6C8E3DB6A8 /* VIMUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 49FDC86C4F0DDC07BF2B3A89084F05AF /* VIMUser.m */; }; 301E7201FA2B9D755BCB08E3159E9F50 /* Request+Soundtrack.swift in Sources */ = {isa = PBXBuildFile; fileRef = A287772AED26189394F852F1383AC103 /* Request+Soundtrack.swift */; }; + 30F0BAE1DBB79BBB6CBD957EA8B89E4B /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72BF022BF820248A7DC00916D1CC4205 /* MobileCoreServices.framework */; }; 32076D3DD644045CF79DFFEBB6BFF3F2 /* UIButton+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 9181B76CF70F368A91B6164CF5EA35AF /* UIButton+AFNetworking.m */; }; 325DB73E71BF50607177ED27D34C4DEA /* VIMInteraction.m in Sources */ = {isa = PBXBuildFile; fileRef = D8008689D0B9CEE5A8B4F22EDD838235 /* VIMInteraction.m */; }; 32F90DCD5121984682C68D40A51EC126 /* VIMThumbnailUploadTicket.h in Headers */ = {isa = PBXBuildFile; fileRef = 58E8E3B2AB8BBBBA38D3F57103C1E48D /* VIMThumbnailUploadTicket.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -56,9 +56,11 @@ 3D0097FB9A164EF53868F633A5D83647 /* Request+User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D775ED9A8AEEA1BBA968B5740A34BFD /* Request+User.swift */; }; 3DB6964EE0B28369CE1F7A6892E75CCA /* VIMVideoProgressiveFile.h in Headers */ = {isa = PBXBuildFile; fileRef = D3BA141A5553BAF7C116D19D1C669DC6 /* VIMVideoProgressiveFile.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3DD477AEFC34A1B8BE6C21CB3737112D /* VIMSoundtrack.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AF82FDAADDBD52AD4A5E5FD40451B8F /* VIMSoundtrack.m */; }; + 3E5288CBF6B2BE080B33EB12E809F2B4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB7FF3305C3F3E726189CE6DC03B4A6 /* Foundation.framework */; }; 40630E6FBAF3FA1BA0316B7DEAB82F44 /* VIMVideo+VOD.h in Headers */ = {isa = PBXBuildFile; fileRef = 149A190283760F475F91178FCB276A53 /* VIMVideo+VOD.h */; settings = {ATTRIBUTES = (Public, ); }; }; 409A333CEF46B3875FD07DFD2D9C351B /* AuthenticationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A17090BB86BF96FF7E88156C3CB28957 /* AuthenticationController.swift */; }; 41056CE5FE3FF5AEB88B9F37047F717A /* Pods-VimeoUpload-iOS-OldUploadTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 712E55059FAF64DCE6FDA02F37A5AA2E /* Pods-VimeoUpload-iOS-OldUploadTests-dummy.m */; }; + 42AF1BB1ED090CC9E588A463441D09E3 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B665811DA7B0645668081A93D378BB87 /* SystemConfiguration.framework */; }; 430264544D67783EE06E5CBD9F8A7538 /* VIMCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B92013945EAA4735C74F5F20F119CB /* VIMCategory.m */; }; 43E008C211B853777039F3785D922B98 /* VIMBadge.swift in Sources */ = {isa = PBXBuildFile; fileRef = C550175B7EC7075E2835E8C7DCC2723F /* VIMBadge.swift */; }; 4442D8453D210EFC13CFE2CAF862ED1D /* AFHTTPSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F6FB24A5536DD004B48F00834B72CAAA /* AFHTTPSessionManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -78,7 +80,6 @@ 5BA9E478846DD5BD2F10533663C65DB0 /* VimeoNetworking-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A0A4AB2432D657C9297E64DCDDB03A9 /* VimeoNetworking-dummy.m */; }; 5D3BDA09F740ECC2062E1876B3E9397C /* VimeoRequestSerializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12603000BA159A15FCFE312613690391 /* VimeoRequestSerializer.swift */; }; 5D862A3CE5B17C76E3F21ED62FBDB757 /* VIMActivity.h in Headers */ = {isa = PBXBuildFile; fileRef = 14988764C33C43F624F78A9FD05EA2D7 /* VIMActivity.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 5EA767C86F29A119AC69EC5AE832A73B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 159245C1D8294EF16CB016833D763E42 /* Foundation.framework */; }; 5FF671C4F478DAC06FFC03103078E43C /* Request+Configs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9717512502B2CBB64AF956ABFD3ECF10 /* Request+Configs.swift */; }; 6002D7357AE628BBDB572FC9EFB211B0 /* VIMVideoHLSFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D06933F7D0190E13136B6084CCF19FD /* VIMVideoHLSFile.h */; settings = {ATTRIBUTES = (Public, ); }; }; 643CE7142699088977B0ACB353A4FE6B /* Objc_ExceptionCatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F622C8797560A4BC9EDB9A36960BB2C /* Objc_ExceptionCatcher.m */; }; @@ -89,13 +90,15 @@ 69B1AF537561D8F581165B58FCDD81FB /* VIMVideoDASHFile.h in Headers */ = {isa = PBXBuildFile; fileRef = DB074C96C719EAE42367359FBE57E21F /* VIMVideoDASHFile.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6A4FBD31811C902A97F3B75EE81B0ADD /* VIMActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 08D1BA8A90EDC00E8EB28A886F2B4CD7 /* VIMActivity.m */; }; 6B0432E81EC7132ADF0516729B74C724 /* VIMSizeQuota.h in Headers */ = {isa = PBXBuildFile; fileRef = CF8F7E3CBB1B67B094851E251BC41BC2 /* VIMSizeQuota.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CB3E0E344A7E19BA2ADE572A9E91C7F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB7FF3305C3F3E726189CE6DC03B4A6 /* Foundation.framework */; }; 6DF3CEDD6910937636F93F666E1FEF2C /* NSError+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7907829F15403992DC9A4B548CD41E1 /* NSError+Extensions.swift */; }; 6E4D1B3AADC1FD45199854A24E146F0C /* Request+Video.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44AB41921F9D9B0620A5C3553FE4B72 /* Request+Video.swift */; }; 7093D03FB36F62140CD7CB962C129184 /* Request+Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B32A79195E4789E0D38A7C199CAB76A /* Request+Channel.swift */; }; 719B05BF832EB807BD9313C39D9C1923 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D38065BB0B23FBE674985A0F8B72EC9 /* Result.swift */; }; - 72BE65E696A388D4CC0D75BE461FEF1B /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ADAF03A765A3FCAC6E0673E44664E07 /* MobileCoreServices.framework */; }; 7417910A809FB46D7CBE239E1E41F40E /* VimeoSessionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FBA6678CB2E7680B2E44F4375609022 /* VimeoSessionManager.swift */; }; + 7715E1A66A2F21A0C5F8B913E79FC9F8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB7FF3305C3F3E726189CE6DC03B4A6 /* Foundation.framework */; }; 778D21F2C8E74994835AF74CF639561E /* VIMVideoPlayRepresentation.m in Sources */ = {isa = PBXBuildFile; fileRef = 494E66C69C53C64522E95F995B56BAB5 /* VIMVideoPlayRepresentation.m */; }; + 789D749690B308852115FF20CD982A69 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEAA2896C0F3DE743E13BA30642E91F1 /* CoreGraphics.framework */; }; 78A21D825370B0C218AEF351105AC567 /* VIMVideoUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = C9EA8CD923B36DA3EAD55FD3879A502F /* VIMVideoUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7A112C0F21A62CB6F1AA8D917A6EEA6C /* AFNetworkActivityIndicatorManager.h in Headers */ = {isa = PBXBuildFile; fileRef = FB6A99CF789B5BEA9456117EA2855947 /* AFNetworkActivityIndicatorManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7CE16B1BF75DF396768A0A3CFD968DB1 /* UIWebView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = F9A28D7473445BAC2DF8ED3294808DCF /* UIWebView+AFNetworking.m */; }; @@ -103,8 +106,8 @@ 7F7668339CCE57BC809523B5613E0BCF /* Pods-VimeoUpload-iOSTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = BBC4BAA3C77B593AEF959B3D4C03A3EE /* Pods-VimeoUpload-iOSTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; 80E8BEBDC57B013AB61A2D4AFED25076 /* VIMVideoFairPlayFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 90087B0D4E77D07B4E9F1D217680CB6B /* VIMVideoFairPlayFile.h */; settings = {ATTRIBUTES = (Public, ); }; }; 82752C5EBCDE2118D9B50C7623D5BF3B /* VIMAppeal.m in Sources */ = {isa = PBXBuildFile; fileRef = DF54671CD48BA10A8DA67E5817580E1A /* VIMAppeal.m */; }; + 82D554EC9FB9A62D935B6555325F5898 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C29192B1F683D403AFFD632D65221D49 /* Security.framework */; }; 84F4F2115F97F8FE14D0BEBE38A772E0 /* VIMVideo.h in Headers */ = {isa = PBXBuildFile; fileRef = F321BEF3CBD2446312D1D121E254290F /* VIMVideo.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8538C8D5BBE70CFF543EBE6C911B43EF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 159245C1D8294EF16CB016833D763E42 /* Foundation.framework */; }; 85849DB10CF2386821DEB59E77404730 /* VIMUploadTicket.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E79D6C3283CB5EF1812B0021DA11FC5 /* VIMUploadTicket.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8588C695824D58E2A9EAAE4D4A0E1BB9 /* VIMPictureCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DD953AC1282A72EB724028504DB991B /* VIMPictureCollection.m */; }; 862CA2F597532E9D63DB4C787AD17AA7 /* VIMPicture.h in Headers */ = {isa = PBXBuildFile; fileRef = 95DCAF0CD8E8A04FB849D0EB3ED32D01 /* VIMPicture.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -121,6 +124,7 @@ 91DFEC02233D3AB83A35E5756A18A36C /* VIMUserBadge.m in Sources */ = {isa = PBXBuildFile; fileRef = 1541E9FB35206F5192232467FC5B429D /* VIMUserBadge.m */; }; 9264BD69AFA8EE74F0D7F0EBD74F762F /* UIImage+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = BFECB493111928B6FBC7E30A53CD6C0C /* UIImage+AFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; }; 93096AB36C54BB032194725968A44EA3 /* VIMTag.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C1DAA99F189991E9808E85A60902767 /* VIMTag.m */; }; + 9336820057A592619B89406F1DF4AEC9 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB7FF3305C3F3E726189CE6DC03B4A6 /* Foundation.framework */; }; 93DFC0CC12E763AE770017349EE009D1 /* AFNetworkReachabilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 40C278A2D7295B9C745A8F7C78D039A3 /* AFNetworkReachabilityManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; 948458DC0A9308A2D8C018C37FB7BBDD /* AFURLResponseSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = F482E1B7506500767CF4C18ED47EC41B /* AFURLResponseSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; 95FFAABEF0F35C113EC0189D39FF80A0 /* ResponseCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2608F23A5BD6202F176337A9F85D70 /* ResponseCache.swift */; }; @@ -132,10 +136,10 @@ A280ED07778424BB4FB5E2596B927323 /* VIMQuantityQuota.h in Headers */ = {isa = PBXBuildFile; fileRef = D39B2D537CC8914B5AB105B380641859 /* VIMQuantityQuota.h */; settings = {ATTRIBUTES = (Public, ); }; }; A346ABB83FE181956A7DC49EDF3EF2DB /* VIMVideoPlayRepresentation.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CFEC28DA0D60B074FCFDEBB948B940 /* VIMVideoPlayRepresentation.h */; settings = {ATTRIBUTES = (Public, ); }; }; A3591DEDA776B48C026E7F9144981E58 /* AFAutoPurgingImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 600D472EDC99CA818353A5D89F987011 /* AFAutoPurgingImageCache.m */; }; - A38929893CE0A6F5A077ECF7D20BC10F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 159245C1D8294EF16CB016833D763E42 /* Foundation.framework */; }; A398D63C8DED664D99A864D79881A13C /* AFImageDownloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BFCEC6FBC3145714CC6CF4DFC949341 /* AFImageDownloader.m */; }; A4CD0619CCDE6268C1769EF1379D3C5F /* Request+Comment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3955D9A7EC2CD5C86E892193E62E9E0F /* Request+Comment.swift */; }; A73687DB3AA0983108BAEBF72C2340ED /* VIMPrivacy.m in Sources */ = {isa = PBXBuildFile; fileRef = A95F8642BCADE8FFFF3519DABF17AB95 /* VIMPrivacy.m */; }; + A8C297643282E0CF5E7DF9CB6E23A0D4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB7FF3305C3F3E726189CE6DC03B4A6 /* Foundation.framework */; }; A8E116A9A098FE44D9CEAA85FCF9D408 /* VIMTag.h in Headers */ = {isa = PBXBuildFile; fileRef = CA212CD04BA30762B1CD913421957487 /* VIMTag.h */; settings = {ATTRIBUTES = (Public, ); }; }; A8F1B4C9D1D600563C86DF374BB1FF59 /* VIMVideoPlayFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 68D1AD311A8197BF776022C79C5F1ACE /* VIMVideoPlayFile.m */; }; A90F6D31147BD8FCEC444B7D99EB4798 /* AccountStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1251E50741E644D6312C93A72D228CC2 /* AccountStore.swift */; }; @@ -145,22 +149,19 @@ B1A9884315D8230C190E19E5B8E87C5A /* VimeoNetworking-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 7F86DFC5D05E754156CA58540DAA1BAC /* VimeoNetworking-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; B259265059C9F541C99A43E37B2CEFA6 /* Request+Picture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A1207562C5BD2A71A7DC1A59A824D64 /* Request+Picture.swift */; }; B3389B8752DF8E9154754220D09D26C9 /* Dictionary+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B88A43F94D3F984AA9F607E6D336933C /* Dictionary+Extension.swift */; }; - B6F7E52EE2E4735C791BFC0AF6C4AA82 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 159245C1D8294EF16CB016833D763E42 /* Foundation.framework */; }; B793155915EDF853F2B515F87230AEC4 /* VIMObjectMapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 813FFFC7FD25CCBEFAADC204524CBF26 /* VIMObjectMapper.h */; settings = {ATTRIBUTES = (Public, ); }; }; B7A153052BBBE07EE5C653777F052C3F /* VIMSoundtrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 439CBA3DC46A23846FBD30F048BE086A /* VIMSoundtrack.h */; settings = {ATTRIBUTES = (Public, ); }; }; B9331886EB47FEE9CC9739C45CEE35CB /* VIMVideoPreference.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FA3810B9E6829C7403D5D0F19EDACFD /* VIMVideoPreference.m */; }; B9B6393A6D55E217BE87C42FAD925D07 /* Objc_ExceptionCatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F578FD9D3A32CB94B4560392C77383F /* Objc_ExceptionCatcher.h */; settings = {ATTRIBUTES = (Public, ); }; }; - BA2D29D9265012FAC7A88D9A8CCD9989 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65A70021CC6BB93F3180DFA142F3A96E /* CoreGraphics.framework */; }; - BC22E83FBE012D2A1B6B72B886832AF4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 159245C1D8294EF16CB016833D763E42 /* Foundation.framework */; }; BD3361E6028D2FD289D7E9BEF5392A6A /* VIMRecommendation.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E34B0E33381605BC20762BA521A846C /* VIMRecommendation.h */; settings = {ATTRIBUTES = (Public, ); }; }; BF2E64C3355CB069145EAF61D1223910 /* VIMVideoFile.m in Sources */ = {isa = PBXBuildFile; fileRef = EB013DBE7F6A441F3FC60D8F0F84FE89 /* VIMVideoFile.m */; }; C1539E868EAA683B1B80A0F530ACCDF1 /* VIMVideoDRMFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B409357FA7F1EE47504EB11F838F1FD /* VIMVideoDRMFiles.m */; }; + C50D0C30AF8712AFFA42B7F9C4AC2C7B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB7FF3305C3F3E726189CE6DC03B4A6 /* Foundation.framework */; }; C7A8FB48AC76C370F585B5E609AFC6F9 /* VIMVODConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 40FF5ABC89E5B4D81BB332308EBD6ABA /* VIMVODConnection.h */; settings = {ATTRIBUTES = (Public, ); }; }; C99047215776E7CB95C77ADC520B7001 /* Spatial.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5427FA6B4360346236E6133084DFC10E /* Spatial.swift */; }; CB84112F8B8F712719EA050973CCC8D1 /* PlayProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77C69108CD986B77A9C0122212FD6613 /* PlayProgress.swift */; }; CCFCAB315F227FF02C9DCACB24FA0AAD /* VIMPrivacy.h in Headers */ = {isa = PBXBuildFile; fileRef = B5BD0E4A9E13D4E5939E74CE749ACF61 /* VIMPrivacy.h */; settings = {ATTRIBUTES = (Public, ); }; }; CD632493290A2E4430F2F12E548B03B2 /* VIMNotificationsConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AF9D80E0A02BB32BC9B773852EB179C /* VIMNotificationsConnection.m */; }; - CE2EB8CE3176F8A1FAA78CC8786292CC /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EACFBA88A948B1EF6BFCF0A626F54EF1 /* SystemConfiguration.framework */; }; CE513A764AEF1DF8E3788D05B03CD15E /* VIMPolicyDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = A69D06730C5B3566A7B8FF5A91C529C1 /* VIMPolicyDocument.h */; settings = {ATTRIBUTES = (Public, ); }; }; CE5AC9A4F95093069A44087A1689ACCB /* VIMNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = CB8AD1BB40CAF74E14801DCD2423742E /* VIMNotification.m */; }; CEB2F0E229EF841D92C780C3FFDF1BEA /* AFSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C61AA5DF51D49E9C9ADF4B82C45FE7B /* AFSecurityPolicy.m */; }; @@ -185,7 +186,6 @@ DD887A93A200A87A51B3D00BD1B80D20 /* AFNetworkReachabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B4C942B4810471391926C69DDF06F459 /* AFNetworkReachabilityManager.m */; }; DDC2160DEE810F9EB54D5F4A4085FD06 /* Request+Cache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FECF370ACCB82ABBBADEB2C23066C4F /* Request+Cache.swift */; }; DE38B59B4D7D872FEF317D301D7D0113 /* VIMVideoPreference.h in Headers */ = {isa = PBXBuildFile; fileRef = 528FFF37101F041C21101734F752C2AE /* VIMVideoPreference.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E09C4447583F04E4B9F8572311672E97 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 159245C1D8294EF16CB016833D763E42 /* Foundation.framework */; }; E23B9A6F533461CB33C0FA6FB59E3AB2 /* UIKit+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = AF5691A664BC371E586B7A9B0EA405C8 /* UIKit+AFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; }; E9083640FA1E37FD7F1CD8C3D3113F71 /* VIMVideo.m in Sources */ = {isa = PBXBuildFile; fileRef = 70A33F9F7F54570EFF69A144E3A3F760 /* VIMVideo.m */; }; EAEBAD0876E9C66617B5366DC192ABDB /* VIMSeason.h in Headers */ = {isa = PBXBuildFile; fileRef = 14EA79709F08DA21BEFAD6B727216E8A /* VIMSeason.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -196,7 +196,6 @@ F2D899C7AA0D7FC20160091BB9D31CF3 /* UIImageView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A0EACC1726F08952CBA6D09D34A5E69 /* UIImageView+AFNetworking.m */; }; F42023CADF80388A7EE24CDC3378D896 /* VimeoNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 78E698DE1E56024C0E969710944608D8 /* VimeoNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; }; F42AFA87354F2430D2381ABF91869006 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3731BACEDB31E0440FF7D8D8C0C5E492 /* Constants.swift */; }; - F4C30FC473041AEEB83D79A3FF3B6C70 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 159245C1D8294EF16CB016833D763E42 /* Foundation.framework */; }; F51ECD19F851C26CEB4925B83D85ABDA /* VIMVODConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 6402A355C8648B1DF96ACEBE585B656F /* VIMVODConnection.m */; }; F5B609F28B2E1EBF8AA9348E28333378 /* VIMRecommendation.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A4BE21C00C1529F947AEADC6AFEC0AB /* VIMRecommendation.m */; }; F6258BE02142A4CCAEBB00A2C4CEE82B /* VIMObjectMapper.m in Sources */ = {isa = PBXBuildFile; fileRef = AE0DF6D9E98751FE374466891CF22E93 /* VIMObjectMapper.m */; }; @@ -206,6 +205,7 @@ F82C4C45E9CC756A62AA0F72D001B83D /* VIMQuantityQuota.m in Sources */ = {isa = PBXBuildFile; fileRef = 33B7F78148EB2BCFE6839B0A753DA5A7 /* VIMQuantityQuota.m */; }; F84DD74BB7F612DE372F8C051420DF72 /* UIProgressView+AFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = D65690666F392CD6883791300864C4BF /* UIProgressView+AFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; }; F92477EC3C798D43C7DA759DF0AFDE34 /* VIMNotificationsConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 500FE9C937B576F7F751188E9C8B58C2 /* VIMNotificationsConnection.h */; settings = {ATTRIBUTES = (Public, ); }; }; + F94CAA71DF535013FE840C72ED995ACA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB7FF3305C3F3E726189CE6DC03B4A6 /* Foundation.framework */; }; F9988F40EBF406C9B8DFBBED61ECFC9C /* Request+Toggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B39620FF19ACEB51C1DEA18A7A12B2D0 /* Request+Toggle.swift */; }; FEF6EACE962EAE70E2EAC5F3C83EF7C8 /* AFImageDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = A6B196AB2ADA189C96F4A92DF020A2AB /* AFImageDownloader.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ @@ -271,7 +271,6 @@ 08D1BA8A90EDC00E8EB28A886F2B4CD7 /* VIMActivity.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMActivity.m; path = VimeoNetworking/Sources/Models/VIMActivity.m; sourceTree = ""; }; 0A255F1E920EA10EF5D5D5D29ABF77DA /* UIActivityIndicatorView+AFNetworking.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIActivityIndicatorView+AFNetworking.m"; path = "UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m"; sourceTree = ""; }; 0C2608F23A5BD6202F176337A9F85D70 /* ResponseCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ResponseCache.swift; path = VimeoNetworking/Sources/ResponseCache.swift; sourceTree = ""; }; - 0D39D513DA3519FA56B3F9657B9F9990 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 0E61F34F2E6B1E414299E9F4D8B5FFF8 /* VimeoSessionManager+Constructors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "VimeoSessionManager+Constructors.swift"; path = "VimeoNetworking/Sources/VimeoSessionManager+Constructors.swift"; sourceTree = ""; }; 0F622C8797560A4BC9EDB9A36960BB2C /* Objc_ExceptionCatcher.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = Objc_ExceptionCatcher.m; path = VimeoNetworking/Sources/Objc_ExceptionCatcher.m; sourceTree = ""; }; 0F7FE012B283AB95DB394786375AF14C /* VIMVideoFile.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = VIMVideoFile.h; path = VimeoNetworking/Sources/Models/VIMVideoFile.h; sourceTree = ""; }; @@ -283,7 +282,6 @@ 149A190283760F475F91178FCB276A53 /* VIMVideo+VOD.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "VIMVideo+VOD.h"; path = "VimeoNetworking/Sources/Models/VIMVideo+VOD.h"; sourceTree = ""; }; 14EA79709F08DA21BEFAD6B727216E8A /* VIMSeason.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = VIMSeason.h; path = VimeoNetworking/Sources/Models/VIMSeason.h; sourceTree = ""; }; 1541E9FB35206F5192232467FC5B429D /* VIMUserBadge.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMUserBadge.m; path = VimeoNetworking/Sources/Models/VIMUserBadge.m; sourceTree = ""; }; - 159245C1D8294EF16CB016833D763E42 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; 1625E43ADF6E7014140E962E4D8D2E15 /* Subscription.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Subscription.swift; path = VimeoNetworking/Sources/Models/Subscription.swift; sourceTree = ""; }; 19CEB26626C9812FA30C7379ACA089D6 /* AFNetworkActivityIndicatorManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFNetworkActivityIndicatorManager.m; path = "UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m"; sourceTree = ""; }; 1C0AF9E26B1AE44BE6700D2A8CF89819 /* Pods-VimeoUpload-iOS-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-VimeoUpload-iOS-umbrella.h"; sourceTree = ""; }; @@ -359,7 +357,6 @@ 635406386C5C563BE8F30C456CF4EBDE /* VIMConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = VIMConnection.h; path = VimeoNetworking/Sources/Models/VIMConnection.h; sourceTree = ""; }; 63AC97C994F4A5DEDCFAB03FE2835587 /* VIMPreference.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMPreference.m; path = VimeoNetworking/Sources/Models/VIMPreference.m; sourceTree = ""; }; 6402A355C8648B1DF96ACEBE585B656F /* VIMVODConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMVODConnection.m; path = VimeoNetworking/Sources/Models/VIMVODConnection.m; sourceTree = ""; }; - 65A70021CC6BB93F3180DFA142F3A96E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; }; 68D1AD311A8197BF776022C79C5F1ACE /* VIMVideoPlayFile.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMVideoPlayFile.m; path = VimeoNetworking/Sources/Models/VIMVideoPlayFile.m; sourceTree = ""; }; 6A0A4AB2432D657C9297E64DCDDB03A9 /* VimeoNetworking-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "VimeoNetworking-dummy.m"; sourceTree = ""; }; 6A7DD13AE760F49BD336D2C01BAA7890 /* Pods-VimeoUpload-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-VimeoUpload-iOS.debug.xcconfig"; sourceTree = ""; }; @@ -372,6 +369,7 @@ 70A33F9F7F54570EFF69A144E3A3F760 /* VIMVideo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMVideo.m; path = VimeoNetworking/Sources/Models/VIMVideo.m; sourceTree = ""; }; 70B44A30D123EB8B4E494C3750DC262F /* VIMProgrammedContent.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VIMProgrammedContent.swift; path = VimeoNetworking/Sources/Models/VIMProgrammedContent.swift; sourceTree = ""; }; 712E55059FAF64DCE6FDA02F37A5AA2E /* Pods-VimeoUpload-iOS-OldUploadTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-VimeoUpload-iOS-OldUploadTests-dummy.m"; sourceTree = ""; }; + 72BF022BF820248A7DC00916D1CC4205 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; }; 761B02BADB3E7B60DB3FF23CD76B6AF2 /* VIMVideoHLSFile.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMVideoHLSFile.m; path = VimeoNetworking/Sources/Models/VIMVideoHLSFile.m; sourceTree = ""; }; 77C69108CD986B77A9C0122212FD6613 /* PlayProgress.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PlayProgress.swift; path = VimeoNetworking/Sources/Models/PlayProgress.swift; sourceTree = ""; }; 78D4C6E7DFAF7621B138929C43CEAD58 /* VIMUploadTicket.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMUploadTicket.m; path = VimeoNetworking/Sources/Models/VIMUploadTicket.m; sourceTree = ""; }; @@ -409,7 +407,6 @@ 994751133E5FF4982C5BCE1CAAB6A78B /* UIImageView+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImageView+AFNetworking.h"; path = "UIKit+AFNetworking/UIImageView+AFNetworking.h"; sourceTree = ""; }; 9A4BE21C00C1529F947AEADC6AFEC0AB /* VIMRecommendation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMRecommendation.m; path = VimeoNetworking/Sources/Models/VIMRecommendation.m; sourceTree = ""; }; 9ACF5761B029845B3F2897FDE0D45BB0 /* Pods-VimeoUpload-iOS-OldUploadTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-VimeoUpload-iOS-OldUploadTests-acknowledgements.plist"; sourceTree = ""; }; - 9ADAF03A765A3FCAC6E0673E44664E07 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; }; 9AF9D80E0A02BB32BC9B773852EB179C /* VIMNotificationsConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMNotificationsConnection.m; path = VimeoNetworking/Sources/Models/VIMNotificationsConnection.m; sourceTree = ""; }; 9BB0F28B65CFA82A1097FD4C71DA0487 /* Pods-VimeoUpload-iOS-OldUpload-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-VimeoUpload-iOS-OldUpload-acknowledgements.plist"; sourceTree = ""; }; 9CB779FF1FA13F0CA99A13B6A0857464 /* Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Response.swift; path = VimeoNetworking/Sources/Response.swift; sourceTree = ""; }; @@ -429,6 +426,7 @@ A81FB057C4219FBF8BD3D002E9E7272B /* VimeoNetworking.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = VimeoNetworking.modulemap; sourceTree = ""; }; A8B0BB58820A0B1DA182E061E886411B /* Pods-VimeoUpload-iOSTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-VimeoUpload-iOSTests-dummy.m"; sourceTree = ""; }; A95F8642BCADE8FFFF3519DABF17AB95 /* VIMPrivacy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMPrivacy.m; path = VimeoNetworking/Sources/Models/VIMPrivacy.m; sourceTree = ""; }; + AAB7FF3305C3F3E726189CE6DC03B4A6 /* 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; }; AE0DF6D9E98751FE374466891CF22E93 /* VIMObjectMapper.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMObjectMapper.m; path = VimeoNetworking/Sources/Models/VIMObjectMapper.m; sourceTree = ""; }; AF5691A664BC371E586B7A9B0EA405C8 /* UIKit+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIKit+AFNetworking.h"; path = "UIKit+AFNetworking/UIKit+AFNetworking.h"; sourceTree = ""; }; B39620FF19ACEB51C1DEA18A7A12B2D0 /* Request+Toggle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Request+Toggle.swift"; path = "VimeoNetworking/Sources/Request+Toggle.swift"; sourceTree = ""; }; @@ -436,6 +434,7 @@ B4580F679371388C6FC87FF024534456 /* Pods-VimeoUpload-iOSTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-VimeoUpload-iOSTests-acknowledgements.plist"; sourceTree = ""; }; B4C942B4810471391926C69DDF06F459 /* AFNetworkReachabilityManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFNetworkReachabilityManager.m; path = AFNetworking/AFNetworkReachabilityManager.m; sourceTree = ""; }; B5BD0E4A9E13D4E5939E74CE749ACF61 /* VIMPrivacy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = VIMPrivacy.h; path = VimeoNetworking/Sources/Models/VIMPrivacy.h; sourceTree = ""; }; + B665811DA7B0645668081A93D378BB87 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; B6671E602410D6092439152EADE23607 /* Request+Authentication.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Request+Authentication.swift"; path = "VimeoNetworking/Sources/Request+Authentication.swift"; sourceTree = ""; }; B784B3FDEB773915E04502100EB6F701 /* VIMUploadQuota.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = VIMUploadQuota.h; path = VimeoNetworking/Sources/Models/VIMUploadQuota.h; sourceTree = ""; }; B7F8E371904C34C30A4498FCCBE5F2AB /* VIMChannel.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = VIMChannel.h; path = VimeoNetworking/Sources/Models/VIMChannel.h; sourceTree = ""; }; @@ -443,7 +442,9 @@ BBC4BAA3C77B593AEF959B3D4C03A3EE /* Pods-VimeoUpload-iOSTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-VimeoUpload-iOSTests-umbrella.h"; sourceTree = ""; }; BC9E61ED1EDFE2CD20FA90CF00D4608B /* UIButton+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIButton+AFNetworking.h"; path = "UIKit+AFNetworking/UIButton+AFNetworking.h"; sourceTree = ""; }; BDEBFF33778D5264ED6AEA58E613AE82 /* Pods-VimeoUpload-iOS-OldUpload-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-VimeoUpload-iOS-OldUpload-acknowledgements.markdown"; sourceTree = ""; }; + BEAA2896C0F3DE743E13BA30642E91F1 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; }; BFECB493111928B6FBC7E30A53CD6C0C /* UIImage+AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+AFNetworking.h"; path = "UIKit+AFNetworking/UIImage+AFNetworking.h"; sourceTree = ""; }; + C29192B1F683D403AFFD632D65221D49 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; C4CF223F05BF42A197EEB5B5F427FB15 /* Pods-VimeoUpload.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-VimeoUpload.debug.xcconfig"; sourceTree = ""; }; C550175B7EC7075E2835E8C7DCC2723F /* VIMBadge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VIMBadge.swift; path = VimeoNetworking/Sources/Models/VIMBadge.swift; sourceTree = ""; }; C5624A087C10DE994D4F380D76D11CD8 /* AFAutoPurgingImageCache.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFAutoPurgingImageCache.h; path = "UIKit+AFNetworking/AFAutoPurgingImageCache.h"; sourceTree = ""; }; @@ -489,7 +490,6 @@ E7907829F15403992DC9A4B548CD41E1 /* NSError+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSError+Extensions.swift"; path = "VimeoNetworking/Sources/NSError+Extensions.swift"; sourceTree = ""; }; E79ADD6A0AFBC97CBC10D3AC1EA024DC /* Request.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Request.swift; path = VimeoNetworking/Sources/Request.swift; sourceTree = ""; }; E7FF72F2B598E25BCF0422AC7894A20D /* VIMVODItem.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMVODItem.m; path = VimeoNetworking/Sources/Models/VIMVODItem.m; sourceTree = ""; }; - EACFBA88A948B1EF6BFCF0A626F54EF1 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; EB013DBE7F6A441F3FC60D8F0F84FE89 /* VIMVideoFile.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = VIMVideoFile.m; path = VimeoNetworking/Sources/Models/VIMVideoFile.m; sourceTree = ""; }; ECF46B5E5956D18C9AAD34EE80C8F77E /* VIMModelObject.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = VIMModelObject.h; path = VimeoNetworking/Sources/Models/VIMModelObject.h; sourceTree = ""; }; EDF2918E5CB02CFC1ADE04F783E882E5 /* AFNetworking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = AFNetworking.framework; path = AFNetworking.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -520,7 +520,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5EA767C86F29A119AC69EC5AE832A73B /* Foundation.framework in Frameworks */, + 7715E1A66A2F21A0C5F8B913E79FC9F8 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -528,7 +528,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A38929893CE0A6F5A077ECF7D20BC10F /* Foundation.framework in Frameworks */, + F94CAA71DF535013FE840C72ED995ACA /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -536,11 +536,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BA2D29D9265012FAC7A88D9A8CCD9989 /* CoreGraphics.framework in Frameworks */, - BC22E83FBE012D2A1B6B72B886832AF4 /* Foundation.framework in Frameworks */, - 72BE65E696A388D4CC0D75BE461FEF1B /* MobileCoreServices.framework in Frameworks */, - 23EFB184AD12FB1014FFC765CE0D710A /* Security.framework in Frameworks */, - CE2EB8CE3176F8A1FAA78CC8786292CC /* SystemConfiguration.framework in Frameworks */, + 789D749690B308852115FF20CD982A69 /* CoreGraphics.framework in Frameworks */, + A8C297643282E0CF5E7DF9CB6E23A0D4 /* Foundation.framework in Frameworks */, + 30F0BAE1DBB79BBB6CBD957EA8B89E4B /* MobileCoreServices.framework in Frameworks */, + 82D554EC9FB9A62D935B6555325F5898 /* Security.framework in Frameworks */, + 42AF1BB1ED090CC9E588A463441D09E3 /* SystemConfiguration.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -548,7 +548,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B6F7E52EE2E4735C791BFC0AF6C4AA82 /* Foundation.framework in Frameworks */, + 9336820057A592619B89406F1DF4AEC9 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -556,7 +556,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F4C30FC473041AEEB83D79A3FF3B6C70 /* Foundation.framework in Frameworks */, + 3E5288CBF6B2BE080B33EB12E809F2B4 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -565,7 +565,7 @@ buildActionMask = 2147483647; files = ( 2945C5B22511F26C276B9C23F35A10DC /* AFNetworking.framework in Frameworks */, - E09C4447583F04E4B9F8572311672E97 /* Foundation.framework in Frameworks */, + C50D0C30AF8712AFFA42B7F9C4AC2C7B /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -573,7 +573,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8538C8D5BBE70CFF543EBE6C911B43EF /* Foundation.framework in Frameworks */, + 6CB3E0E344A7E19BA2ADE572A9E91C7F /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -654,18 +654,6 @@ path = "Target Support Files/Pods-VimeoUpload"; sourceTree = ""; }; - 27E5264A7FD3E33CB2074B0154C56FC6 /* iOS */ = { - isa = PBXGroup; - children = ( - 65A70021CC6BB93F3180DFA142F3A96E /* CoreGraphics.framework */, - 159245C1D8294EF16CB016833D763E42 /* Foundation.framework */, - 9ADAF03A765A3FCAC6E0673E44664E07 /* MobileCoreServices.framework */, - 0D39D513DA3519FA56B3F9657B9F9990 /* Security.framework */, - EACFBA88A948B1EF6BFCF0A626F54EF1 /* SystemConfiguration.framework */, - ); - name = iOS; - sourceTree = ""; - }; 35816D781B3D996C536649783ADD5C40 /* Pods */ = { isa = PBXGroup; children = ( @@ -693,6 +681,18 @@ path = "Target Support Files/Pods-VimeoUpload-iOSTests"; sourceTree = ""; }; + 58ADEC1A744624280C424466F85276D6 /* iOS */ = { + isa = PBXGroup; + children = ( + BEAA2896C0F3DE743E13BA30642E91F1 /* CoreGraphics.framework */, + AAB7FF3305C3F3E726189CE6DC03B4A6 /* Foundation.framework */, + 72BF022BF820248A7DC00916D1CC4205 /* MobileCoreServices.framework */, + C29192B1F683D403AFFD632D65221D49 /* Security.framework */, + B665811DA7B0645668081A93D378BB87 /* SystemConfiguration.framework */, + ); + name = iOS; + sourceTree = ""; + }; 601565E25F27ABFAD5D460A428D41214 /* Support Files */ = { isa = PBXGroup; children = ( @@ -1000,7 +1000,7 @@ isa = PBXGroup; children = ( 5461D992F0D803F0F05DF72B2849301D /* AFNetworking.framework */, - 27E5264A7FD3E33CB2074B0154C56FC6 /* iOS */, + 58ADEC1A744624280C424466F85276D6 /* iOS */, ); name = Frameworks; sourceTree = ""; @@ -1266,7 +1266,7 @@ D41D8CD98F00B204E9800998ECF8427E /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0730; + LastSwiftUpdateCheck = 0830; LastUpgradeCheck = 0700; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; @@ -1516,54 +1516,11 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 015A368F878AC3E2CEAE21DDE8026304 /* Debug */ = { + 00F87340FE541E1103068D879CA2CF38 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = E66FD2DF824A81DF2975B49945EAEA30 /* VimeoNetworking.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_REQUIRED = NO; - COPY_PHASE_STRIP = NO; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_DEBUG=1", - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - ONLY_ACTIVE_ARCH = YES; - PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "${SRCROOT}/../build"; - }; - name = Debug; - }; - 05E04CFBA4D993878803362CB34062EC /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 89AB0F31192190BE89B818137CC8A970 /* AFNetworking.xcconfig */; - buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; @@ -1575,16 +1532,17 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/AFNetworking/AFNetworking-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/AFNetworking/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/VimeoNetworking/VimeoNetworking-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/VimeoNetworking/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/AFNetworking/AFNetworking.modulemap"; + MODULEMAP_FILE = "Target Support Files/VimeoNetworking/VimeoNetworking.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = AFNetworking; + PRODUCT_NAME = VimeoNetworking; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -1592,45 +1550,50 @@ }; name = Release; }; - 09CED0DE5F6D136B641370342195F994 /* Release */ = { + 0353BEE271297126048240FF40109383 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CBED8FAC62EC97352938CA51099A55E9 /* Pods-VimeoUpload-iOS.release.xcconfig */; + baseConfigurationReference = C4CF223F05BF42A197EEB5B5F427FB15 /* Pods-VimeoUpload.debug.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOS/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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-VimeoUpload-iOS/Pods-VimeoUpload-iOS.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; + MODULEMAP_FILE = "Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload.modulemap"; + MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_VimeoUpload_iOS; + PRODUCT_NAME = Pods_VimeoUpload; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - 21DE4DB4B03B6D369EC7B2F450246E07 /* Debug */ = { + 20D32A089D17DDAD18CBFD6FBF2E9615 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6A7DD13AE760F49BD336D2C01BAA7890 /* Pods-VimeoUpload-iOS.debug.xcconfig */; + baseConfigurationReference = 2A556F76898649B5A28BDB5446ED8308 /* Pods-VimeoUpload-iOS-OldUploadTests.debug.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; @@ -1642,67 +1605,67 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOS/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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-VimeoUpload-iOS/Pods-VimeoUpload-iOS.modulemap"; + MODULEMAP_FILE = "Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_VimeoUpload_iOS; + PRODUCT_NAME = Pods_VimeoUpload_iOS_OldUploadTests; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 2BEFBA56DFC63E19F53D6517F6B114F4 /* Debug */ = { + 2175E73CD648994904DA0EE62BAFD809 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C4CF223F05BF42A197EEB5B5F427FB15 /* Pods-VimeoUpload.debug.xcconfig */; + baseConfigurationReference = F4ED96BBE5EA3EC1EC3534905722909E /* Pods-VimeoUpload-iOSTests.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; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOSTests/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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-VimeoUpload/Pods-VimeoUpload.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; + MODULEMAP_FILE = "Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests.modulemap"; + MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_VimeoUpload; + PRODUCT_NAME = Pods_VimeoUpload_iOSTests; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - 2CC61F18232D594B61522258F561D49F /* Release */ = { + 2B510856FA4E9572B537CBE0802D1591 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 533C56098EE9CDC9C94F3635F25A9F98 /* Pods-VimeoUpload-iOS-OldUpload.release.xcconfig */; + baseConfigurationReference = CBED8FAC62EC97352938CA51099A55E9 /* Pods-VimeoUpload-iOS.release.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; @@ -1714,66 +1677,67 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.modulemap"; + MODULEMAP_FILE = "Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_VimeoUpload_iOS_OldUpload; + PRODUCT_NAME = Pods_VimeoUpload_iOS; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - 400F4D9DB2B064C71374DA8C7BB28F6A /* Debug */ = { + 2DD310F88AC219696E5427287889ABE7 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 80E26D00B3A1139F9D88C0E57B6F0DA3 /* Pods-VimeoUpload-iOSTests.debug.xcconfig */; + baseConfigurationReference = 89AB0F31192190BE89B818137CC8A970 /* AFNetworking.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOSTests/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/AFNetworking/AFNetworking-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/AFNetworking/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_VimeoUpload_iOSTests; + MODULEMAP_FILE = "Target Support Files/AFNetworking/AFNetworking.modulemap"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = AFNetworking; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - 44CDBB6D11DE06DB64D6268622BDC47E /* Release */ = { + 34FE9531DA9AF2820790339988D5FF41 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -1781,10 +1745,13 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; @@ -1809,42 +1776,50 @@ }; name = Release; }; - 461BE0B262A7DAC68824403CF9C7D438 /* Release */ = { + 505D755E61F57BAAE9431B5466556E3B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E66FD2DF824A81DF2975B49945EAEA30 /* VimeoNetworking.xcconfig */; + baseConfigurationReference = 2EC7C61DABF8951A8EA0284CE90D8C35 /* Pods-VimeoUpload-iOS-OldUpload.debug.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/VimeoNetworking/VimeoNetworking-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/VimeoNetworking/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOS-OldUpload/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/VimeoNetworking/VimeoNetworking.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = VimeoNetworking; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.modulemap"; + MTL_ENABLE_DEBUG_INFO = YES; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = Pods_VimeoUpload_iOS_OldUpload; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - 4CB19CF2A32CED39756121A23446E10B /* Release */ = { + 8B3142E38294C0E28FF0047FA73C2EE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 590A00F4B0511AE74E5A1DE651C5634A /* Pods-VimeoUpload.release.xcconfig */; + baseConfigurationReference = 533C56098EE9CDC9C94F3635F25A9F98 /* Pods-VimeoUpload-iOS-OldUpload.release.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; @@ -1856,30 +1831,33 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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-VimeoUpload/Pods-VimeoUpload.modulemap"; + MODULEMAP_FILE = "Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_VimeoUpload; + PRODUCT_NAME = Pods_VimeoUpload_iOS_OldUpload; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - 546BA6753B42634CCA5EC42A53678F00 /* Debug */ = { + 9E3B0F5EFF14D554D71BB8100B4A6C5C /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2EC7C61DABF8951A8EA0284CE90D8C35 /* Pods-VimeoUpload-iOS-OldUpload.debug.xcconfig */; + baseConfigurationReference = 89AB0F31192190BE89B818137CC8A970 /* AFNetworking.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; @@ -1891,31 +1869,28 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/AFNetworking/AFNetworking-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/AFNetworking/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.modulemap"; + MODULEMAP_FILE = "Target Support Files/AFNetworking/AFNetworking.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_VimeoUpload_iOS_OldUpload; + PRODUCT_NAME = AFNetworking; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 72FE0C63990BB2DA77F39AEC544B3D1E /* Release */ = { + A752ACEB3813BB9BE2907109FC21334C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F4ED96BBE5EA3EC1EC3534905722909E /* Pods-VimeoUpload-iOSTests.release.xcconfig */; + baseConfigurationReference = 590A00F4B0511AE74E5A1DE651C5634A /* Pods-VimeoUpload.release.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; @@ -1927,30 +1902,33 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOSTests/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests.modulemap"; + MODULEMAP_FILE = "Target Support Files/Pods-VimeoUpload/Pods-VimeoUpload.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_VimeoUpload_iOSTests; + PRODUCT_NAME = Pods_VimeoUpload; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - 8074D018308BF2F8A35AB9F7D67F114C /* Debug */ = { + B017DF19B619918B580DB5352814A431 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = E66FD2DF824A81DF2975B49945EAEA30 /* VimeoNetworking.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; @@ -1972,6 +1950,7 @@ PRODUCT_NAME = VimeoNetworking; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1980,10 +1959,11 @@ }; name = Debug; }; - BA7FE6CC462575D0629E0259A92FC3E9 /* Debug */ = { + B2255DAE8F42483DEA722A3035D3E833 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2A556F76898649B5A28BDB5446ED8308 /* Pods-VimeoUpload-iOS-OldUploadTests.debug.xcconfig */; + baseConfigurationReference = 6A7DD13AE760F49BD336D2C01BAA7890 /* Pods-VimeoUpload-iOS.debug.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; @@ -1995,91 +1975,147 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests.modulemap"; + MODULEMAP_FILE = "Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_VimeoUpload_iOS_OldUploadTests; + PRODUCT_NAME = Pods_VimeoUpload_iOS; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - CFE28F79827C40AF73CECA8933D61358 /* Release */ = { + B5B05939143791DFBEA62213256EB290 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EF2AA60D6B2F3B5482588A54A11AEE2C /* Pods-VimeoUpload-iOS-OldUploadTests.release.xcconfig */; + baseConfigurationReference = 80E26D00B3A1139F9D88C0E57B6F0DA3 /* Pods-VimeoUpload-iOSTests.debug.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOSTests/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 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-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; + MODULEMAP_FILE = "Target Support Files/Pods-VimeoUpload-iOSTests/Pods-VimeoUpload-iOSTests.modulemap"; + MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_VimeoUpload_iOS_OldUploadTests; + PRODUCT_NAME = Pods_VimeoUpload_iOSTests; SDKROOT = iphoneos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - E0695E55897F09C6C94B443561B22DA9 /* Debug */ = { + B7BD003B8DAA163290363B593AB8A4B9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 89AB0F31192190BE89B818137CC8A970 /* AFNetworking.xcconfig */; + baseConfigurationReference = EF2AA60D6B2F3B5482588A54A11AEE2C /* Pods-VimeoUpload-iOS-OldUploadTests.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; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/AFNetworking/AFNetworking-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/AFNetworking/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/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/AFNetworking/AFNetworking.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = AFNetworking; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-VimeoUpload-iOS-OldUploadTests/Pods-VimeoUpload-iOS-OldUploadTests.modulemap"; + MTL_ENABLE_DEBUG_INFO = NO; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = Pods_VimeoUpload_iOS_OldUploadTests; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; + name = Release; + }; + C104F7F091290C3D1E248192F07FE689 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGNING_REQUIRED = NO; + COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_DEBUG=1", + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + ONLY_ACTIVE_ARCH = YES; + PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; + STRIP_INSTALLED_PRODUCT = NO; + SYMROOT = "${SRCROOT}/../build"; + }; name = Debug; }; /* End XCBuildConfiguration section */ @@ -2088,8 +2124,8 @@ 0D4109D91B43D42CD4DEC15877BB90A8 /* Build configuration list for PBXNativeTarget "Pods-VimeoUpload-iOSTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 400F4D9DB2B064C71374DA8C7BB28F6A /* Debug */, - 72FE0C63990BB2DA77F39AEC544B3D1E /* Release */, + B5B05939143791DFBEA62213256EB290 /* Debug */, + 2175E73CD648994904DA0EE62BAFD809 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2097,8 +2133,8 @@ 2545BFAECF1D540C5259B454339817B4 /* Build configuration list for PBXNativeTarget "Pods-VimeoUpload-iOS-OldUploadTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - BA7FE6CC462575D0629E0259A92FC3E9 /* Debug */, - CFE28F79827C40AF73CECA8933D61358 /* Release */, + 20D32A089D17DDAD18CBFD6FBF2E9615 /* Debug */, + B7BD003B8DAA163290363B593AB8A4B9 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2106,8 +2142,8 @@ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 015A368F878AC3E2CEAE21DDE8026304 /* Debug */, - 44CDBB6D11DE06DB64D6268622BDC47E /* Release */, + C104F7F091290C3D1E248192F07FE689 /* Debug */, + 34FE9531DA9AF2820790339988D5FF41 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2115,8 +2151,8 @@ 31E01BC98C827BD8A78F94173CDCC418 /* Build configuration list for PBXNativeTarget "AFNetworking" */ = { isa = XCConfigurationList; buildConfigurations = ( - E0695E55897F09C6C94B443561B22DA9 /* Debug */, - 05E04CFBA4D993878803362CB34062EC /* Release */, + 9E3B0F5EFF14D554D71BB8100B4A6C5C /* Debug */, + 2DD310F88AC219696E5427287889ABE7 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2124,8 +2160,8 @@ 353A98449FF9A34A53AEF70073FE6EBE /* Build configuration list for PBXNativeTarget "Pods-VimeoUpload-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( - 21DE4DB4B03B6D369EC7B2F450246E07 /* Debug */, - 09CED0DE5F6D136B641370342195F994 /* Release */, + B2255DAE8F42483DEA722A3035D3E833 /* Debug */, + 2B510856FA4E9572B537CBE0802D1591 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2133,8 +2169,8 @@ 505A71250E38937722DF0019156081B4 /* Build configuration list for PBXNativeTarget "Pods-VimeoUpload" */ = { isa = XCConfigurationList; buildConfigurations = ( - 2BEFBA56DFC63E19F53D6517F6B114F4 /* Debug */, - 4CB19CF2A32CED39756121A23446E10B /* Release */, + 0353BEE271297126048240FF40109383 /* Debug */, + A752ACEB3813BB9BE2907109FC21334C /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2142,8 +2178,8 @@ AD05C11A3D8E19B37EB76DD0591807ED /* Build configuration list for PBXNativeTarget "Pods-VimeoUpload-iOS-OldUpload" */ = { isa = XCConfigurationList; buildConfigurations = ( - 546BA6753B42634CCA5EC42A53678F00 /* Debug */, - 2CC61F18232D594B61522258F561D49F /* Release */, + 505D755E61F57BAAE9431B5466556E3B /* Debug */, + 8B3142E38294C0E28FF0047FA73C2EE5 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2151,8 +2187,8 @@ BE2F436AE57C8FBA5EE060E460C52145 /* Build configuration list for PBXNativeTarget "VimeoNetworking" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8074D018308BF2F8A35AB9F7D67F114C /* Debug */, - 461BE0B262A7DAC68824403CF9C7D438 /* Release */, + B017DF19B619918B580DB5352814A431 /* Debug */, + 00F87340FE541E1103068D879CA2CF38 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.debug.xcconfig b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.debug.xcconfig index 45471b98..011252ee 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.debug.xcconfig +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.debug.xcconfig @@ -1,5 +1,4 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -EMBEDDED_CONTENT_CONTAINS_SWIFT = YES FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/VimeoNetworking" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.release.xcconfig b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.release.xcconfig index 45471b98..011252ee 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.release.xcconfig +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS-OldUpload/Pods-VimeoUpload-iOS-OldUpload.release.xcconfig @@ -1,5 +1,4 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -EMBEDDED_CONTENT_CONTAINS_SWIFT = YES FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/VimeoNetworking" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS.debug.xcconfig b/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS.debug.xcconfig index 45471b98..011252ee 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS.debug.xcconfig +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS.debug.xcconfig @@ -1,5 +1,4 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -EMBEDDED_CONTENT_CONTAINS_SWIFT = YES FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/VimeoNetworking" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' diff --git a/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS.release.xcconfig b/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS.release.xcconfig index 45471b98..011252ee 100644 --- a/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS.release.xcconfig +++ b/Pods/Target Support Files/Pods-VimeoUpload-iOS/Pods-VimeoUpload-iOS.release.xcconfig @@ -1,5 +1,4 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -EMBEDDED_CONTENT_CONTAINS_SWIFT = YES FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/VimeoNetworking" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/AppConfiguration.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/AppConfiguration.swift index 1f254c76..71296bc8 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/AppConfiguration.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/AppConfiguration.swift @@ -39,6 +39,7 @@ public struct AppConfiguration let keychainAccessGroup: String? public let apiVersion: String + public let baseUrl: URL /** Create a new `AppConfiguration` @@ -49,6 +50,7 @@ public struct AppConfiguration - parameter keychainService: Identifes your application to the system keychain, defaults to `KeychainServiceVimeo` - parameter keychainAccessGroup: Access group your application should use for the system keychain, defaults to nil - parameter apiVersion: API version your requests should use, defaults to `VimeoDefaultAPIVersionString` + - parameter baseUrl: The baseUrl for HTTP requests made using this configuration, defaults to `VimeoBaseURL` - returns: an initialized AppConfiguration */ @@ -57,7 +59,8 @@ public struct AppConfiguration scopes: [Scope], keychainService: String, keychainAccessGroup: String? = nil, - apiVersion: String = VimeoDefaultAPIVersionString) + apiVersion: String = VimeoDefaultAPIVersionString, + baseUrl: URL = VimeoBaseURL) { self.clientIdentifier = clientIdentifier self.clientSecret = clientSecret @@ -65,5 +68,6 @@ public struct AppConfiguration self.keychainService = keychainService self.keychainAccessGroup = keychainAccessGroup self.apiVersion = apiVersion + self.baseUrl = baseUrl } } diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/AuthenticationController.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/AuthenticationController.swift index aed98ed4..f171085c 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/AuthenticationController.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/AuthenticationController.swift @@ -82,13 +82,13 @@ final public class AuthenticationController - returns: a new `AuthenticationController` */ - public init(client: VimeoClient) + public init(client: VimeoClient, appConfiguration: AppConfiguration) { - self.configuration = client.configuration + self.configuration = appConfiguration self.client = client - self.accountStore = AccountStore(configuration: client.configuration) + self.accountStore = AccountStore(configuration: configuration) - self.authenticatorClient = VimeoClient(appConfiguration: client.configuration) + self.authenticatorClient = VimeoClient(appConfiguration: configuration) } // MARK: - Public Saved Accounts @@ -194,11 +194,7 @@ final public class AuthenticationController Constants.ScopeKey: Scope.combine(self.configuration.scopes), Constants.StateKey: type(of: self).state] - guard let urlString = VimeoBaseURLString?.appendingPathComponent(Constants.CodeGrantAuthorizationPath).absoluteString - else - { - fatalError("Could not make code grant auth URL") - } + let urlString = self.configuration.baseUrl.appendingPathComponent(Constants.CodeGrantAuthorizationPath).absoluteString var error: NSError? let urlRequest = VimeoRequestSerializer(appConfiguration: self.configuration).request(withMethod: VimeoClient.Method.GET.rawValue, urlString: urlString, parameters: parameters, error: &error) @@ -263,7 +259,7 @@ final public class AuthenticationController */ public func accessToken(token: String, completion: @escaping AuthenticationCompletion) { - let customSessionManager = VimeoSessionManager.defaultSessionManager(accessTokenProvider: {token}) + let customSessionManager = VimeoSessionManager.defaultSessionManager(baseUrl: self.configuration.baseUrl, accessTokenProvider: {token}) let adhocClient = VimeoClient(appConfiguration: self.configuration, sessionManager: customSessionManager) let request = AuthenticationRequest.verifyAccessTokenRequest() diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Constants.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/Constants.swift index fb68ff5e..e4bb86c9 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Constants.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Constants.swift @@ -27,7 +27,7 @@ import Foundation /// Base URL for the Vimeo API -public let VimeoBaseURLString = URL(string: "https://api.vimeo.com") +public let VimeoBaseURL = URL(string: "https://api.vimeo.com")! /// Default API version to use for requests internal let VimeoDefaultAPIVersionString = "3.2" diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/SubscriptionCollection.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/SubscriptionCollection.swift index 70e70cb5..eea4d188 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/SubscriptionCollection.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/SubscriptionCollection.swift @@ -14,18 +14,17 @@ public class SubscriptionCollection: VIMModelObject /// Represents the uri public var uri: String? - /// Represents the modified time - public var modifiedTime: Date? - /// Represents the subscription public var subscription: Subscription? + /// Represents the migration that indicates whether the user has migrated from the old system `VIMTrigger` to new new system `Localytics`. + public var migrated: NSNumber? + // MARK: - VIMMappable public override func getObjectMapping() -> Any { - return ["modified_time": "modifiedTime", - "subscriptions": "subscription"] + return ["subscriptions": "subscription"] } public override func getClassForObjectKey(_ key: String!) -> AnyClass! diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMModelObject.m b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMModelObject.m index 4e7b73b2..cb79f5e8 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMModelObject.m +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMModelObject.m @@ -44,9 +44,14 @@ + (NSUInteger)modelVersion + (NSDateFormatter *)dateFormatter { - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - dateFormatter.locale = [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]; - dateFormatter.dateFormat = @"yyyy-MM-dd'T'HH:mm:ssZZZZZ"; + static NSDateFormatter *dateFormatter; + static dispatch_once_t onceToken; + + dispatch_once(&onceToken, ^{ + dateFormatter = [[NSDateFormatter alloc] init]; + dateFormatter.locale = [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]; + dateFormatter.dateFormat = @"yyyy-MM-dd'T'HH:mm:ssZZZZZ"; + }); return dateFormatter; } diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.h b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.h index 1af49907..2b2b1b54 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.h +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.h @@ -66,8 +66,8 @@ typedef NS_ENUM(NSInteger, VIMUserAccountType) - (nullable VIMNotificationsConnection *)notificationsConnection; - (nullable VIMInteraction *)interactionWithName:(nonnull NSString *)name; -- (BOOL)hasCopyrightMatch; - (BOOL)isFollowing; +- (BOOL)hasModeratedChannels; - (nullable NSString *)accountTypeAnalyticsIdentifier; - (BOOL)hasSameBadgeCount:(nullable VIMUser *)newUser; diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.m b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.m index df36483f..35483c4c 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.m +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.m @@ -252,18 +252,18 @@ - (void)formatModifiedTime #pragma mark - Helpers -- (BOOL)hasCopyrightMatch -{ - VIMConnection *connection = [self connectionWithName:VIMConnectionNameViolations]; - return (connection && connection.total.intValue > 0); -} - - (BOOL)isFollowing { VIMInteraction *interaction = [self interactionWithName:VIMInteractionNameFollow]; return (interaction && interaction.added.boolValue); } +- (BOOL)hasModeratedChannels +{ + VIMConnection *connection = [self connectionWithName:VIMConnectionNameModeratedChannels]; + return (connection && connection.total.intValue > 0); +} + - (NSString *)accountTypeAnalyticsIdentifier { switch (self.accountType) diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.m b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.m index f8ad0499..a77b0f3e 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.m +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.m @@ -126,12 +126,10 @@ - (Class)getClassForObjectKey:(NSString *)key return [VIMVideoPlayRepresentation class]; } - #if TARGET_OS_TV if ([key isEqualToString:@"badge"]) { return [VIMBadge class]; } - #endif if ([key isEqualToString:@"spatial"]) { diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Objc_ExceptionCatcher.m b/Pods/VimeoNetworking/VimeoNetworking/Sources/Objc_ExceptionCatcher.m index c4ee9f61..96789504 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Objc_ExceptionCatcher.m +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Objc_ExceptionCatcher.m @@ -24,7 +24,7 @@ // THE SOFTWARE. // -#import "ObjC_ExceptionCatcher.h" +#import "Objc_ExceptionCatcher.h" @implementation ObjC_ExceptionCatcher diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Cache.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Cache.swift index 15a8de2a..68469636 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Cache.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/Request+Cache.swift @@ -32,13 +32,10 @@ public extension Request /// Generates a unique cache key for a request, taking into account endpoint and parameters var cacheKey: String { - var cacheKey = "cached" + self.path - - if let description = (self.parameters as? CustomStringConvertible)?.description - { - cacheKey = cacheKey + "." + String(description.hashValue) - } + let url = NSURL(string: self.path) + let urlPath = url?.path ?? "" + var cacheKey = "cached" + urlPath + "." + String(self.path.hashValue) cacheKey = cacheKey.replacingOccurrences(of: "/", with: ".") return cacheKey diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/ResponseCache.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/ResponseCache.swift index d19b9b37..d0350a51 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/ResponseCache.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/ResponseCache.swift @@ -42,11 +42,22 @@ private protocol Cache /// Response cache handles the storage of JSON response dictionaries indexed by their associated `Request`. It contains both memory and disk caching functionality final internal class ResponseCache { - struct Constant + private struct Constant { static let CacheDirectory = "com.vimeo.Caches" } + /** + Initializer + + - parameter cacheDirectory: the directory name where the cache files will be stored. Defaults to com.vimeo.Caches. + */ + init(cacheDirectory: String = Constant.CacheDirectory) + { + self.memoryCache = ResponseMemoryCache() + self.diskCache = ResponseDiskCache(cacheDirectory: cacheDirectory) + } + /** Stores a response dictionary for a request. @@ -109,7 +120,7 @@ final internal class ResponseCache // MARK: - Memory Cache - private let memoryCache = ResponseMemoryCache() + private let memoryCache: ResponseMemoryCache private class ResponseMemoryCache: Cache { @@ -140,11 +151,17 @@ final internal class ResponseCache // MARK: - Disk Cache - private let diskCache = ResponseDiskCache() + private let diskCache: ResponseDiskCache private class ResponseDiskCache: Cache { private let queue = DispatchQueue(label: "com.vimeo.VIMCache.diskQueue", attributes: DispatchQueue.Attributes.concurrent) + private let cacheDirectory: String + + init(cacheDirectory: String) + { + self.cacheDirectory = cacheDirectory + } func setResponseDictionary(_ responseDictionary: VimeoClient.ResponseDictionary, forKey key: String) { @@ -291,7 +308,7 @@ final internal class ResponseCache } // We need to create a directory in `../Library/Caches folder`. Otherwise, trying to remove the Apple /Caches folder will always fail. Note that it's noticeable while testing on a device. - return URL(fileURLWithPath: directory).appendingPathComponent(Constant.CacheDirectory, isDirectory: true) + return URL(fileURLWithPath: directory).appendingPathComponent(self.cacheDirectory, isDirectory: true) } private func fileURL(forKey key: String) -> URL? diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoClient.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoClient.swift index 0bcaae35..028c32fc 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoClient.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoClient.swift @@ -87,7 +87,7 @@ final public class VimeoClient // MARK: - /// Session manager handles the http session data tasks and request/response serialization - private let sessionManager: VimeoSessionManager + fileprivate var sessionManager: VimeoSessionManager? = nil /// response cache handles all memory and disk caching of response dictionaries private let responseCache = ResponseCache() @@ -119,18 +119,22 @@ final public class VimeoClient self.init(appConfiguration: appConfiguration, sessionManager: VimeoSessionManager.defaultSessionManager(appConfiguration: appConfiguration)) } - public init(appConfiguration: AppConfiguration, sessionManager: VimeoSessionManager) + public init(appConfiguration: AppConfiguration?, sessionManager: VimeoSessionManager?) { - self.configuration = appConfiguration - self.sessionManager = sessionManager - - VimeoReachability.beginPostingReachabilityChangeNotifications() + if let appConfiguration = appConfiguration, + let sessionManager = sessionManager + { + self.configuration = appConfiguration + self.sessionManager = sessionManager + + VimeoReachability.beginPostingReachabilityChangeNotifications() + } } // MARK: - Configuration - /// The client's configuration, as set on initialization - public let configuration: AppConfiguration + /// The client's configuration + public fileprivate(set) var configuration: AppConfiguration? = nil // MARK: - Authentication @@ -141,11 +145,11 @@ final public class VimeoClient { if let authenticatedAccount = self.currentAccount { - self.sessionManager.clientDidAuthenticate(with: authenticatedAccount) + self.sessionManager?.clientDidAuthenticate(with: authenticatedAccount) } else { - self.sessionManager.clientDidClearAccount() + self.sessionManager?.clientDidClearAccount() } self.notifyObserversAccountChanged(forAccount: self.currentAccount, previousAccount: oldValue) @@ -263,15 +267,15 @@ final public class VimeoClient switch request.method { case .GET: - task = self.sessionManager.get(path, parameters: parameters, progress: nil, success: success, failure: failure) + task = self.sessionManager?.get(path, parameters: parameters, progress: nil, success: success, failure: failure) case .POST: - task = self.sessionManager.post(path, parameters: parameters, progress: nil, success: success, failure: failure) + task = self.sessionManager?.post(path, parameters: parameters, progress: nil, success: success, failure: failure) case .PUT: - task = self.sessionManager.put(path, parameters: parameters, success: success, failure: failure) + task = self.sessionManager?.put(path, parameters: parameters, success: success, failure: failure) case .PATCH: - task = self.sessionManager.patch(path, parameters: parameters, success: success, failure: failure) + task = self.sessionManager?.patch(path, parameters: parameters, success: success, failure: failure) case .DELETE: - task = self.sessionManager.delete(path, parameters: parameters, success: success, failure: failure) + task = self.sessionManager?.delete(path, parameters: parameters, success: success, failure: failure) } guard let requestTask = task else @@ -482,3 +486,34 @@ final public class VimeoClient } } + +extension VimeoClient +{ + /// Singleton instance for VimeoClient. Applications must call configureSharedClient(withAppConfiguration appConfiguration:) + /// before it can be accessed. + public static var sharedClient: VimeoClient + { + guard let _ = self._sharedClient.configuration, + let _ = self._sharedClient.sessionManager else + { + assertionFailure("VimeoClient.sharedClient must be configured before accessing") + return self._sharedClient + } + + return self._sharedClient + } + private static let _sharedClient = VimeoClient(appConfiguration: nil, sessionManager: nil) + + /// Configures the singleton sharedClient instance. This function allows applications to provide + /// client specific app configurations at start time. + /// + /// - Parameters: + /// - appConfiguration: An AppConfiguration instance + public static func configureSharedClient(withAppConfiguration appConfiguration: AppConfiguration) + { + self._sharedClient.configuration = appConfiguration + self._sharedClient.sessionManager = VimeoSessionManager.defaultSessionManager(appConfiguration: appConfiguration) + + VimeoReachability.beginPostingReachabilityChangeNotifications() + } +} diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoSessionManager+Constructors.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoSessionManager+Constructors.swift index fb2a5d9c..7ba09c23 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoSessionManager+Constructors.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoSessionManager+Constructors.swift @@ -33,31 +33,33 @@ public extension VimeoSessionManager /** Creates an authenticated session manager with a static access token + - parameter baseUrl: the base URL for the HTTP client. This value should usually be set to `VimeoBaseURL`. - parameter accessToken: the static access token to use for request serialization - returns: an initialized `VimeoSessionManager` */ - static func defaultSessionManager(accessToken: String) -> VimeoSessionManager + static func defaultSessionManager(baseUrl: URL, accessToken: String) -> VimeoSessionManager { let sessionConfiguration = URLSessionConfiguration.defaultSessionConfigurationNoCache() let requestSerializer = VimeoRequestSerializer(accessTokenProvider: { accessToken }) - return VimeoSessionManager(sessionConfiguration: sessionConfiguration, requestSerializer: requestSerializer) + return VimeoSessionManager(baseUrl: baseUrl, sessionConfiguration: sessionConfiguration, requestSerializer: requestSerializer) } /** Creates a session manager with a block that provides an access token. Note that if no access token is returned by the provider block, no Authorization header will be serialized with new requests, whereas a Basic Authorization header is required at minimum for all api endpoints. For unauthenticated requests, use a constructor that accepts an `AppConfiguration`. + - parameter baseUrl: the base URL for the HTTP client. This value should usually be set to `VimeoBaseURL`. - parameter accessTokenProvider: a block that provides an access token dynamically, called on each request serialization - returns: an initialized `VimeoSessionManager` */ - static func defaultSessionManager(accessTokenProvider: @escaping VimeoRequestSerializer.AccessTokenProvider) -> VimeoSessionManager + static func defaultSessionManager(baseUrl: URL, accessTokenProvider: @escaping VimeoRequestSerializer.AccessTokenProvider) -> VimeoSessionManager { let sessionConfiguration = URLSessionConfiguration.defaultSessionConfigurationNoCache() let requestSerializer = VimeoRequestSerializer(accessTokenProvider: accessTokenProvider) - return VimeoSessionManager(sessionConfiguration: sessionConfiguration, requestSerializer: requestSerializer) + return VimeoSessionManager(baseUrl: baseUrl, sessionConfiguration: sessionConfiguration, requestSerializer: requestSerializer) } /** @@ -72,7 +74,7 @@ public extension VimeoSessionManager let sessionConfiguration = URLSessionConfiguration.defaultSessionConfigurationNoCache() let requestSerializer = VimeoRequestSerializer(appConfiguration: appConfiguration) - return VimeoSessionManager(sessionConfiguration: sessionConfiguration, requestSerializer: requestSerializer) + return VimeoSessionManager(baseUrl: appConfiguration.baseUrl, sessionConfiguration: sessionConfiguration, requestSerializer: requestSerializer) } // MARK: - Background Session Initialization @@ -81,33 +83,34 @@ public extension VimeoSessionManager Creates an authenticated background session manager with a static access token - parameter identifier: the background session identifier + - parameter baseUrl: the base URL for the HTTP client. This value should usually be set to `VimeoBaseURL`. - parameter accessToken: the static access token to use for request serialization - returns: an initialized `VimeoSessionManager` */ - static func backgroundSessionManager(identifier: String, accessToken: String) -> VimeoSessionManager + static func backgroundSessionManager(identifier: String, baseUrl: URL, accessToken: String) -> VimeoSessionManager { let sessionConfiguration = self.backgroundSessionConfiguration(identifier: identifier) let requestSerializer = VimeoRequestSerializer(accessTokenProvider: { accessToken }) - return VimeoSessionManager(sessionConfiguration: sessionConfiguration, requestSerializer: requestSerializer) + return VimeoSessionManager(baseUrl: baseUrl, sessionConfiguration: sessionConfiguration, requestSerializer: requestSerializer) } - /** Creates a background session manager with a block that provides an access token. Note that if no access token is returned by the provider block, no Authorization header will be serialized with new requests, whereas a Basic Authorization header is required at minimum for all api endpoints. For unauthenticated requests, use a constructor that accepts an `AppConfiguration`. - parameter identifier: the background session identifier + - parameter baseUrl: the base URL for the HTTP client. This value should usually be set to `VimeoBaseURL`. - parameter accessTokenProvider: a block that provides an access token dynamically, called on each request serialization - returns: an initialized `VimeoSessionManager` */ - static func backgroundSessionManager(identifier: String, accessTokenProvider: @escaping VimeoRequestSerializer.AccessTokenProvider) -> VimeoSessionManager + static func backgroundSessionManager(identifier: String, baseUrl: URL, accessTokenProvider: @escaping VimeoRequestSerializer.AccessTokenProvider) -> VimeoSessionManager { let sessionConfiguration = self.backgroundSessionConfiguration(identifier: identifier) let requestSerializer = VimeoRequestSerializer(accessTokenProvider: accessTokenProvider) - return VimeoSessionManager(sessionConfiguration: sessionConfiguration, requestSerializer: requestSerializer) + return VimeoSessionManager(baseUrl: baseUrl, sessionConfiguration: sessionConfiguration, requestSerializer: requestSerializer) } /** @@ -123,7 +126,7 @@ public extension VimeoSessionManager let sessionConfiguration = self.backgroundSessionConfiguration(identifier: identifier) let requestSerializer = VimeoRequestSerializer(appConfiguration: appConfiguration) - return VimeoSessionManager(sessionConfiguration: sessionConfiguration, requestSerializer: requestSerializer) + return VimeoSessionManager(baseUrl: appConfiguration.baseUrl, sessionConfiguration: sessionConfiguration, requestSerializer: requestSerializer) } // MARK: Private API diff --git a/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoSessionManager.swift b/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoSessionManager.swift index 882df36d..4abb51bb 100644 --- a/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoSessionManager.swift +++ b/Pods/VimeoNetworking/VimeoNetworking/Sources/VimeoSessionManager.swift @@ -37,14 +37,15 @@ final public class VimeoSessionManager: AFHTTPSessionManager /** Creates a new session manager + - parameter baseUrl: The base URL for the HTTP client - parameter sessionConfiguration: Object describing the URL session policies for this session manager - parameter requestSerializer: Serializer to use for all requests handled by this session manager - returns: an initialized `VimeoSessionManager` */ - required public init(sessionConfiguration: URLSessionConfiguration, requestSerializer: VimeoRequestSerializer) + required public init(baseUrl: URL, sessionConfiguration: URLSessionConfiguration, requestSerializer: VimeoRequestSerializer) { - super.init(baseURL: VimeoBaseURLString, sessionConfiguration: sessionConfiguration) + super.init(baseURL: baseUrl, sessionConfiguration: sessionConfiguration) self.requestSerializer = requestSerializer self.responseSerializer = VimeoResponseSerializer() diff --git a/VimeoUpload/Descriptor System/ReachableDescriptorManager.swift b/VimeoUpload/Descriptor System/ReachableDescriptorManager.swift index 307de89c..14c37481 100644 --- a/VimeoUpload/Descriptor System/ReachableDescriptorManager.swift +++ b/VimeoUpload/Descriptor System/ReachableDescriptorManager.swift @@ -49,7 +49,7 @@ import VimeoNetworking public init(name: String, backgroundSessionIdentifier: String, descriptorManagerDelegate: DescriptorManagerDelegate? = nil, accessTokenProvider: @escaping VimeoRequestSerializer.AccessTokenProvider) { - let backgroundSessionManager = VimeoSessionManager.backgroundSessionManager(identifier: backgroundSessionIdentifier, accessTokenProvider: accessTokenProvider) + let backgroundSessionManager = VimeoSessionManager.backgroundSessionManager(identifier: backgroundSessionIdentifier, baseUrl: VimeoBaseURL, accessTokenProvider: accessTokenProvider) super.init(sessionManager: backgroundSessionManager, name: name, delegate: descriptorManagerDelegate) diff --git a/VimeoUpload/Upload/Descriptor System/Cameo/VimeoRequestSerializer+Thumbnail.swift b/VimeoUpload/Upload/Descriptor System/Cameo/VimeoRequestSerializer+Thumbnail.swift index 1ef04074..4a2f0f5d 100644 --- a/VimeoUpload/Upload/Descriptor System/Cameo/VimeoRequestSerializer+Thumbnail.swift +++ b/VimeoUpload/Upload/Descriptor System/Cameo/VimeoRequestSerializer+Thumbnail.swift @@ -14,7 +14,7 @@ extension VimeoRequestSerializer { func createThumbnailRequest(with uri: String) throws -> NSMutableURLRequest { - let url = URL(string: "\(uri)/pictures", relativeTo: VimeoBaseURLString)! + let url = URL(string: "\(uri)/pictures", relativeTo: VimeoBaseURL)! var error: NSError? let request = self.request(withMethod: "POST", urlString: url.absoluteString, parameters: nil, error: &error) @@ -29,7 +29,7 @@ extension VimeoRequestSerializer func activateThumbnailRequest(with uri: String) throws -> NSMutableURLRequest { - let url = URL(string: "\(uri)", relativeTo: VimeoBaseURLString)! + let url = URL(string: "\(uri)", relativeTo: VimeoBaseURL)! var error: NSError? let activationParams = ["active" : "true"] diff --git a/VimeoUpload/Upload/Networking/New Upload (Private)/VimeoRequestSerializer+Upload.swift b/VimeoUpload/Upload/Networking/New Upload (Private)/VimeoRequestSerializer+Upload.swift index 49cd6acb..0f331148 100644 --- a/VimeoUpload/Upload/Networking/New Upload (Private)/VimeoRequestSerializer+Upload.swift +++ b/VimeoUpload/Upload/Networking/New Upload (Private)/VimeoRequestSerializer+Upload.swift @@ -42,7 +42,7 @@ extension VimeoRequestSerializer } } - let url = URL(string: "/me/videos", relativeTo: VimeoBaseURLString)! + let url = URL(string: "/me/videos", relativeTo: VimeoBaseURL)! return try self.createVideoRequest(with: url, parameters: parameters) } diff --git a/VimeoUpload/Upload/Networking/Old Upload/VimeoRequestSerializer+OldUpload.swift b/VimeoUpload/Upload/Networking/Old Upload/VimeoRequestSerializer+OldUpload.swift index 5f9e7c9b..6d4b8112 100644 --- a/VimeoUpload/Upload/Networking/Old Upload/VimeoRequestSerializer+OldUpload.swift +++ b/VimeoUpload/Upload/Networking/Old Upload/VimeoRequestSerializer+OldUpload.swift @@ -32,7 +32,7 @@ extension VimeoRequestSerializer { func meRequest() throws -> NSMutableURLRequest { - let url = URL(string: "/me", relativeTo: VimeoBaseURLString)! + let url = URL(string: "/me", relativeTo: VimeoBaseURL)! var error: NSError? let request = self.request(withMethod: "GET", urlString: url.absoluteString, parameters: nil, error: &error) @@ -46,7 +46,7 @@ extension VimeoRequestSerializer func myVideosRequest() throws -> NSMutableURLRequest { - let url = URL(string: "/me/videos", relativeTo: VimeoBaseURLString)! + let url = URL(string: "/me/videos", relativeTo: VimeoBaseURL)! var error: NSError? let request = self.request(withMethod: "GET", urlString: url.absoluteString, parameters: nil, error: &error) @@ -62,7 +62,7 @@ extension VimeoRequestSerializer { let parameters = try self.createVideoRequestBaseParameters(url: url) - let url = URL(string: "/me/videos", relativeTo: VimeoBaseURLString)! + let url = URL(string: "/me/videos", relativeTo: VimeoBaseURL)! return try self.createVideoRequest(with: url, parameters: parameters) } @@ -134,7 +134,7 @@ extension VimeoRequestSerializer func activateVideoRequest(withURI uri: String) throws -> NSMutableURLRequest { - let url = URL(string: uri, relativeTo: VimeoBaseURLString)! + let url = URL(string: uri, relativeTo: VimeoBaseURL)! var error: NSError? let request = self.request(withMethod: "DELETE", urlString: url.absoluteString, parameters: nil, error: &error) @@ -153,7 +153,7 @@ extension VimeoRequestSerializer throw NSError(domain: UploadErrorDomain.VideoSettings.rawValue, code: 0, userInfo: [NSLocalizedDescriptionKey: "videoUri has length of 0."]) } - let url = URL(string: videoUri, relativeTo: VimeoBaseURLString)! + let url = URL(string: videoUri, relativeTo: VimeoBaseURL)! var error: NSError? let parameters = videoSettings.parameterDictionary() @@ -178,7 +178,7 @@ extension VimeoRequestSerializer throw NSError(domain: UploadErrorDomain.Delete.rawValue, code: 0, userInfo: [NSLocalizedDescriptionKey: "videoUri has length of 0."]) } - let url = URL(string: videoUri, relativeTo: VimeoBaseURLString)! + let url = URL(string: videoUri, relativeTo: VimeoBaseURL)! var error: NSError? let request = self.request(withMethod: "DELETE", urlString: url.absoluteString, parameters: nil, error: &error) @@ -197,7 +197,7 @@ extension VimeoRequestSerializer throw NSError(domain: UploadErrorDomain.Video.rawValue, code: 0, userInfo: [NSLocalizedDescriptionKey: "videoUri has length of 0."]) } - let url = URL(string: videoUri, relativeTo: VimeoBaseURLString)! + let url = URL(string: videoUri, relativeTo: VimeoBaseURL)! var error: NSError? let request = self.request(withMethod: "GET", urlString: url.absoluteString, parameters: nil, error: &error) diff --git a/VimeoUpload/VimeoUploader.swift b/VimeoUpload/VimeoUploader.swift index 7496aaba..9f0dddfa 100644 --- a/VimeoUpload/VimeoUploader.swift +++ b/VimeoUpload/VimeoUploader.swift @@ -54,7 +54,7 @@ open class VimeoUploader public init(backgroundSessionIdentifier: String, descriptorManagerDelegate: DescriptorManagerDelegate? = nil, accessTokenProvider: @escaping VimeoRequestSerializer.AccessTokenProvider) { - self.foregroundSessionManager = VimeoSessionManager.defaultSessionManager(accessTokenProvider: accessTokenProvider) + self.foregroundSessionManager = VimeoSessionManager.defaultSessionManager(baseUrl: VimeoBaseURL, accessTokenProvider: accessTokenProvider) self.deletionManager = VideoDeletionManager(sessionManager: self.foregroundSessionManager) From 01a3aae4e60480a98a60405d8693dc1b11eb44f4 Mon Sep 17 00:00:00 2001 From: "Lim, Jennifer" Date: Tue, 20 Jun 2017 13:27:21 -0400 Subject: [PATCH 2/6] Fix crash: Removed the property imageManager and directly call PHImageManager.default() when needed. --- VimeoUpload/UIKit/PHAssetHelper.swift | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/VimeoUpload/UIKit/PHAssetHelper.swift b/VimeoUpload/UIKit/PHAssetHelper.swift index 62756925..81393ec0 100644 --- a/VimeoUpload/UIKit/PHAssetHelper.swift +++ b/VimeoUpload/UIKit/PHAssetHelper.swift @@ -31,7 +31,6 @@ import Photos { static let ErrorDomain = "PHAssetHelperErrorDomain" - private let imageManager = PHImageManager.default() private var activeImageRequests: [String: PHImageRequestID] = [:] private var activeAssetRequests: [String: PHImageRequestID] = [:] @@ -41,13 +40,13 @@ import Photos for requestID in self.activeImageRequests.values { - self.imageManager.cancelImageRequest(requestID) + PHImageManager.default().cancelImageRequest(requestID) } self.activeImageRequests.removeAll() for requestID in self.activeAssetRequests.values { - self.imageManager.cancelImageRequest(requestID) + PHImageManager.default().cancelImageRequest(requestID) } self.activeAssetRequests.removeAll() } @@ -67,7 +66,7 @@ import Photos options.version = .current options.resizeMode = .fast - let requestID = self.imageManager.requestImage(for: phAsset, targetSize: scaledSize, contentMode: .aspectFill, options: options, resultHandler: { [weak self] (image, info) -> Void in + let requestID = PHImageManager.default().requestImage(for: phAsset, targetSize: scaledSize, contentMode: .aspectFill, options: options, resultHandler: { [weak self] (image, info) -> Void in guard let strongSelf = self else { @@ -116,7 +115,7 @@ import Photos options.isNetworkAccessAllowed = false options.deliveryMode = .highQualityFormat - let requestID = self.imageManager.requestAVAsset(forVideo: phAsset, options: options) { [weak self] (asset, audioMix, info) -> Void in + let requestID = PHImageManager.default().requestAVAsset(forVideo: phAsset, options: options) { [weak self] (asset, audioMix, info) -> Void in if let info = info, let cancelled = info[PHImageCancelledKey] as? Bool, cancelled == true { @@ -174,7 +173,7 @@ import Photos if let requestID = self.activeImageRequests[phAsset.localIdentifier] { - self.imageManager.cancelImageRequest(requestID) + PHImageManager.default().cancelImageRequest(requestID) self.activeImageRequests.removeValue(forKey: phAsset.localIdentifier) } } @@ -185,7 +184,7 @@ import Photos if let requestID = self.activeAssetRequests[phAsset.localIdentifier] { - self.imageManager.cancelImageRequest(requestID) + PHImageManager.default().cancelImageRequest(requestID) self.activeAssetRequests.removeValue(forKey: phAsset.localIdentifier) } } From 2a898152f594d561163225d1a1d77e674e053712 Mon Sep 17 00:00:00 2001 From: William Hutson Date: Tue, 18 Jul 2017 12:39:15 -0400 Subject: [PATCH 3/6] CI-510 Update to Xcode 8.3.2 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 9b837158..9ef2eb15 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: xcode: - version: 8.2.1 + version: 8.3.2 dependencies: override: From 6830bf450a0a1bb8d86d86a9fed93d6ad89a49ab Mon Sep 17 00:00:00 2001 From: William Hutson Date: Tue, 18 Jul 2017 12:40:38 -0400 Subject: [PATCH 4/6] CI-510 Ensure Fastlane is using Xcode 8.3.2 --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 92198c56..524944d8 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -17,7 +17,7 @@ default_platform :ios platform :ios do before_all do - ensure_xcode_version(version: "8.2.1") + ensure_xcode_version(version: "8.3.2") end desc "buid the example project" From 7da5bc2a0c44365c7536a04150932b4825bf2bcc Mon Sep 17 00:00:00 2001 From: Will Hutson Date: Tue, 18 Jul 2017 13:33:26 -0400 Subject: [PATCH 5/6] update fastlane to 2.42 --- Gemfile | 2 +- Gemfile.lock | 113 ++++++++++++++++++++++++++------------------------- 2 files changed, 58 insertions(+), 57 deletions(-) diff --git a/Gemfile b/Gemfile index 309b1cb1..c410c021 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'fastlane', '2.1.1' +gem 'fastlane', '2.42.0' gem 'cocoapods', '1.1.1' gem 'xcode-install', '2.1.0' gem 'xcpretty-json-formatter', '0.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index fb14a04c..90e21f95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,16 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.4) - activesupport (4.2.7.1) + CFPropertyList (2.3.5) + activesupport (4.2.9) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.0) + addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) babosa (1.0.2) - claide (1.0.1) + claide (1.0.2) claide-plugins (0.9.2) cork nap @@ -49,8 +48,9 @@ GEM netrc (= 0.7.8) cocoapods-try (1.1.0) colored (1.2) + colored2 (3.1.2) colorize (0.8.1) - commander (4.4.3) + commander-fastlane (4.4.5) highline (~> 1.7.2) cork (0.2.0) colored (~> 1.2) @@ -69,29 +69,30 @@ GEM danger (> 2.0) danger-xcode_summary (0.1.0) danger-plugin-api (~> 1.0) - domain_name (0.5.20161129) + declarative (0.0.9) + declarative-option (0.1.0) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - dotenv (2.1.1) + dotenv (2.2.1) escape (0.0.4) - excon (0.54.0) - faraday (0.10.1) + excon (0.57.1) + faraday (0.12.1) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) faraday-http-cache (1.3.1) faraday (~> 0.8) - faraday_middleware (0.10.1) + faraday_middleware (0.11.0.1) faraday (>= 0.7.4, < 1.0) - fastimage (2.0.1) - addressable (~> 2) - fastlane (2.1.1) - activesupport (< 5) + fastimage (2.1.0) + fastlane (2.42.0) + CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) - bundler (~> 1.12) + bundler (>= 1.12.0, < 2.0.0) colored - commander (>= 4.4.0, < 5.0.0) + commander-fastlane (>= 4.4.0, < 5.0.0) dotenv (>= 2.1.1, < 3.0.0) excon (>= 0.45.0, < 1.0.0) faraday (~> 0.9) @@ -99,7 +100,7 @@ GEM faraday_middleware (~> 0.9) fastimage (>= 1.6) gh_inspector (>= 1.0.1, < 2.0.0) - google-api-client (~> 0.9.1) + google-api-client (>= 0.12.0, < 0.13.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) mini_magick (~> 4.5.1) @@ -112,8 +113,9 @@ GEM slack-notifier (>= 1.3, < 2.0.0) terminal-notifier (>= 1.6.2, < 2.0.0) terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (~> 0.5.0) word_wrap (~> 1.0.0) - xcodeproj (>= 0.20, < 2.0.0) + xcodeproj (>= 1.4.4, < 2.0.0) xcpretty (>= 0.2.4, < 1.0.0) xcpretty-travis-formatter (>= 0.0.3) fastlane-plugin-pretty_junit (0.1.1) @@ -122,17 +124,15 @@ GEM terminal-table fourflusher (2.0.1) fuzzy_match (2.0.4) - gh_inspector (1.0.2) + gh_inspector (1.0.3) git (1.3.0) - google-api-client (0.9.20) - addressable (~> 2.3) + google-api-client (0.12.0) + addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.5) - httpclient (~> 2.7) - hurley (~> 0.1) - memoist (~> 0.11) - mime-types (>= 1.6) - representable (~> 2.3.0) - retriable (~> 2.0) + httpclient (>= 2.8.1, < 3.0) + mime-types (~> 3.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) googleauth (0.5.1) faraday (~> 0.9) jwt (~> 1.4) @@ -145,22 +145,21 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) - hurley (0.2) - i18n (0.7.0) - json (1.8.3) + i18n (0.8.6) + json (2.1.0) jwt (1.5.6) kramdown (1.13.2) little-plugger (1.1.4) - logging (2.1.0) + logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - memoist (0.15.0) + memoist (0.16.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_magick (4.5.1) mini_portile2 (2.1.0) - minitest (5.10.1) + minitest (5.10.2) molinillo (0.5.5) multi_json (1.12.1) multi_xml (0.6.0) @@ -174,13 +173,15 @@ GEM sawyer (~> 0.8.0, >= 0.5.3) open4 (1.3.4) os (0.9.6) - plist (3.2.0) + plist (3.3.0) public_suffix (2.0.5) - representable (2.3.0) - uber (~> 0.0.7) - retriable (2.1.0) - rouge (1.11.1) - rubyzip (1.2.0) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + retriable (3.0.2) + rouge (2.0.7) + rubyzip (1.2.1) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) @@ -191,29 +192,29 @@ GEM jwt (~> 1.5) multi_json (~> 1.10) slack-notifier (1.5.1) - terminal-notifier (1.7.1) - terminal-table (1.7.3) - unicode-display_width (~> 1.1.1) - thread_safe (0.3.5) - tzinfo (1.2.2) + terminal-notifier (1.8.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + thread_safe (0.3.6) + tty-screen (0.5.0) + tzinfo (1.2.3) thread_safe (~> 0.1) - uber (0.0.15) + uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.1.2) + unf_ext (0.0.7.4) + unicode-display_width (1.3.0) word_wrap (1.0.0) xcode-install (2.1.0) claide (>= 0.9.1, < 1.1.0) fastlane (>= 2.1.1, < 3.0.0) - xcodeproj (1.4.2) + xcodeproj (1.5.0) CFPropertyList (~> 2.3.3) - activesupport (>= 3) - claide (>= 1.0.1, < 2.0) - colored (~> 1.2) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) nanaimo (~> 0.2.3) - xcpretty (0.2.4) - rouge (~> 1.8) + xcpretty (0.2.8) + rouge (~> 2.0.7) xcpretty-json-formatter (0.1.0) xcpretty (~> 0.2, >= 0.0.7) xcpretty-travis-formatter (0.0.4) @@ -225,10 +226,10 @@ PLATFORMS DEPENDENCIES cocoapods (= 1.1.1) danger-xcode_summary (= 0.1.0) - fastlane (= 2.1.1) + fastlane (= 2.42.0) fastlane-plugin-pretty_junit xcode-install (= 2.1.0) xcpretty-json-formatter (= 0.1.0) BUNDLED WITH - 1.13.7 + 1.15.1 From c1dd7cbbcf71bc2be431257bc4267443c702267e Mon Sep 17 00:00:00 2001 From: Mike Westendorf Date: Mon, 24 Jul 2017 12:38:29 -0400 Subject: [PATCH 6/6] bumping up the version number to 1.0.1 to reflect the current release version plus the crash that was fixed in this release --- VimeoUpload.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VimeoUpload.podspec b/VimeoUpload.podspec index 4aa7f19b..d96b0cd1 100644 --- a/VimeoUpload.podspec +++ b/VimeoUpload.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| s.name = "VimeoUpload" - s.version = "0.9.1" + s.version = "1.0.1" s.summary = "The Vimeo iOS/OSX Upload SDK." s.description = <<-DESC An iOS/OSX library for uploading videos to Vimeo. The library supports the existing server-side upload flow. It also supports a new private server-side upload flow that will soon be made public. VimeoUpload's core can be extended to support any NSURLSession(background)Task workflow.'