From 3c95cfa621e535b6e6292505d5d34dfbacad1997 Mon Sep 17 00:00:00 2001 From: "Mark R. Masterson" Date: Thu, 3 May 2018 09:38:31 -0700 Subject: [PATCH 1/7] fix crash, new blocks cleanup --- .../AppIcon.appiconset/Contents.json | 5 ++ Example/Transloadit/Main.storyboard | 11 +-- .../Transloadit/TransloaditViewController.m | 67 +++++++++++++++---- Transloadit/Classes/Resources/API/Assembly.m | 2 + Transloadit/Classes/Transloadit.h | 10 +++ Transloadit/Classes/Transloadit.m | 48 ++++++++----- Transloadit/Classes/TransloaditRequest.m | 21 +----- 7 files changed, 112 insertions(+), 52 deletions(-) diff --git a/Example/Transloadit/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/Transloadit/Images.xcassets/AppIcon.appiconset/Contents.json index 1d060ed..d8db8d6 100644 --- a/Example/Transloadit/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Example/Transloadit/Images.xcassets/AppIcon.appiconset/Contents.json @@ -84,6 +84,11 @@ "idiom" : "ipad", "size" : "83.5x83.5", "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { diff --git a/Example/Transloadit/Main.storyboard b/Example/Transloadit/Main.storyboard index e4bd8e8..9b8d6de 100644 --- a/Example/Transloadit/Main.storyboard +++ b/Example/Transloadit/Main.storyboard @@ -1,8 +1,11 @@ - - + + + + + - + @@ -22,7 +25,7 @@ - + diff --git a/Example/Transloadit/TransloaditViewController.m b/Example/Transloadit/TransloaditViewController.m index 247872b..a6d7762 100644 --- a/Example/Transloadit/TransloaditViewController.m +++ b/Example/Transloadit/TransloaditViewController.m @@ -31,6 +31,16 @@ @interface TransloaditViewController () NSLog(@"error: %@", error); }; +//static TransloaditAssemblyStatusBlock statusBlock = ^(NSDictionary* dict){ +// // Handle the error +// NSLog(@"Dictionary: %@", [dict description]); +//}; +// +//static TransloaditAssemblyCompletionBlock completionBlock = ^(NSDictionary* dict){ +// // Handle the error +// NSLog(@"Dictionary: %@", [dict description]); +//}; + @implementation TransloaditViewController Transloadit *transloadit; @@ -39,6 +49,7 @@ @implementation TransloaditViewController - (void)viewDidLoad { [super viewDidLoad]; transloadit = [[Transloadit alloc] init]; + transloadit.failureBlock = failureBlock; } -(void)viewDidAppear:(BOOL)animated { @@ -94,6 +105,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking NSLog(@"%li", (long)error.code); } + NSLog([fileUrl description]); //MARK: Transloadit Kit Implementation @@ -102,36 +114,65 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking NSMutableArray *steps = [[NSMutableArray alloc] init]; Step *step1 = [[Step alloc] initWithKey:@"encode"]; + [step1 setValue:@"75" forOption:@"width"]; + [step1 setValue:@"75" forOption:@"height"]; [step1 setValue:@"/image/resize" forOption:@"robot"]; - - // Add the step to the array + +// +// // Add the step to the array [steps addObject:step1]; //MARK: We then create an Assembly Object with the steps and files - Assembly *TestAssemblyWithSteps = [[Assembly alloc] initWithSteps:steps andNumberOfFiles:1]; - [TestAssemblyWithSteps addFile:fileUrl]; - [TestAssemblyWithSteps setNotify_url:@""]; + //Assembly *TestAssemblyWithSteps = [[Assembly alloc] initWithSteps:steps andNumberOfFiles:3]; +// [TestAssemblyWithSteps addFile:fileUrl]; +// [TestAssemblyWithSteps setNotify_url:@""]; - Template *testTemplate = [[Template alloc] initWithTemplateId:@"ddd833b0974911e7a7efd9ad4c81e3a0"]; - Template *testTemplateWithSteps = [[Template alloc] initWithSteps:steps andName:@"TestName4"]; + Template *testTemplate = [[Template alloc] initWithTemplateId:@"854f71504eea11e8b947315f16ae1faa"]; +// Template *testTemplateWithSteps = [[Template alloc] initWithSteps:steps andName:@"TestName4"]; Assembly *testAssemblyWithTemplate = [[Assembly alloc] initWithTemplate:testTemplate andNumberOfFiles:1]; +// [testAssemblyWithTemplate addFile:fileUrl]; +// + //[transloadit createTemplate:testTemplateWithSteps]; + //[transloadit invokeAssembly:testAssemblyWithTemplate]; + //MARK: Create the assembly on Transloadit [testAssemblyWithTemplate addFile:fileUrl]; + [transloadit createAssembly:testAssemblyWithTemplate]; - //[transloadit createTemplate:testTemplateWithSteps]; - //MARK: Create the assembly on Transloadit - [transloadit createAssembly:TestAssemblyWithSteps]; +// transloadit.assemblyStatusBlock = ^(NSDictionary* completionDictionary){ +// NSLog(@"%@", [completionDictionary description]); +// +// }; + + transloadit.assemblyCreationFailureBlock = ^(NSDictionary* failureDictionary) { + NSLog(@"%@", [failureDictionary description]); + }; + + + transloadit.assemblyCreationCompletionBlock = ^(Assembly* assembly) { + /*Invoking The Assebmly does NOT need to happen inside the completion block. However for sake of the example it is. + We do however need to use the assebmly that is returned for future functions + */ + NSLog(@"%@", [assembly urlString]); + [transloadit invokeAssembly:assembly]; + //[transloadit checkAssembly:assembly]; + NSLog(@"%@", @"Finished!"); + + }; //MARK: Invoke the assebmly transloadit.assemblyCompletionBlock = ^(NSDictionary* completionDictionary){ /*Invoking The Assebmly does NOT need to happen inside the completion block. However for sake of a small UI it is. We do however need to add the URL to the Assembly object so that we do invoke it, it knows where to go. */ - [TestAssemblyWithSteps setUrlString:[completionDictionary valueForKey:@"assembly_ssl_url"]]; - [transloadit invokeAssembly:TestAssemblyWithSteps]; + ///[TestAssemblyWithSteps setUrlString:[completionDictionary valueForKey:@"assembly_ssl_url"]]; + // [transloadit invokeAssembly:TestAssemblyWithSteps]; - [transloadit checkAssembly:TestAssemblyWithSteps]; + //[transloadit checkAssembly:TestAssemblyWithSteps]; + NSLog(@"%@", [completionDictionary description]); + NSLog(@"%@", @"Finished!"); + }; transloadit.assemblyStatusBlock = ^(NSDictionary* completionDictionary){ diff --git a/Transloadit/Classes/Resources/API/Assembly.m b/Transloadit/Classes/Resources/API/Assembly.m index 31eb704..fa5942a 100644 --- a/Transloadit/Classes/Resources/API/Assembly.m +++ b/Transloadit/Classes/Resources/API/Assembly.m @@ -77,4 +77,6 @@ -(int) fileCount{ } +@synthesize data; + @end diff --git a/Transloadit/Classes/Transloadit.h b/Transloadit/Classes/Transloadit.h index f957670..d59ae52 100644 --- a/Transloadit/Classes/Transloadit.h +++ b/Transloadit/Classes/Transloadit.h @@ -22,6 +22,11 @@ typedef void (^TransloaditUploadResultBlock)(NSURL* _Nonnull fileURL); typedef void (^TransloaditUploadFailureBlock)(NSError* _Nonnull error); typedef void (^TransloaditUploadProgressBlock)(int64_t bytesWritten, int64_t bytesTotal); + +typedef void (^TransloaditAssemblyCreationCompletionBlock)(Assembly* _Nonnull assembly); +typedef void (^TransloaditAssemblyCreationFailureBlock)(NSDictionary* _Nonnull completionDictionary); + + typedef void (^TransloaditAssemblyCompletionBlock)(NSDictionary* _Nonnull completionDictionary); typedef void (^TransloaditAssemblyStatusBlock)(NSDictionary* _Nonnull completionDictionary); @@ -32,6 +37,11 @@ typedef void (^TransloaditAssemblyStatusBlock)(NSDictionary* _Nonnull completion @property (readwrite, copy) _Nullable TransloaditUploadFailureBlock failureBlock; @property (readwrite, copy) _Nullable TransloaditUploadProgressBlock progressBlock; +@property (readwrite, copy) _Nullable TransloaditAssemblyCreationCompletionBlock assemblyCreationCompletionBlock; +@property (readwrite, copy) _Nullable TransloaditAssemblyCreationFailureBlock assemblyCreationFailureBlock; + + + @property (readwrite, copy) _Nullable TransloaditAssemblyCompletionBlock assemblyCompletionBlock; @property (readwrite, copy) _Nullable TransloaditAssemblyStatusBlock assemblyStatusBlock; diff --git a/Transloadit/Classes/Transloadit.m b/Transloadit/Classes/Transloadit.m index 1333c4d..4e5345a 100644 --- a/Transloadit/Classes/Transloadit.m +++ b/Transloadit/Classes/Transloadit.m @@ -14,13 +14,20 @@ @implementation Transloadit - (id)init { self = [super init]; if(self) { - if ([[[NSBundle mainBundle] objectForInfoDictionaryKey:@"TRANSLOADIT_SECRET"] isEqualToString: @""] && [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"TRANSLOADIT_SECRET"] isEqualToString:@""]) { - _secret = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"TRANSLOADIT_SECRET"]; - _key = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"TRANSLOADIT_KEY"]; - } else { - _secret = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"TRANSLOADIT_SECRET"]; - _key = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"TRANSLOADIT_KEY"]; + NSString* PLIST_KEY = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"TRANSLOADIT_KEY"]; + NSString* PLIST_SECRET = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"TRANSLOADIT_SECRET"]; + + if (![PLIST_KEY isEqualToString: @""] && ![PLIST_SECRET isEqualToString:@""]) { + _secret = PLIST_SECRET; + _key = PLIST_KEY; } + + NSLog(PLIST_KEY); + NSLog(PLIST_SECRET); + + + + NSLog(@"_init: %@", self); NSURL * applicationSupportURL = [[[NSFileManager defaultManager] URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask] firstObject]; _tusStore = [[TUSFileUploadStore alloc] initWithURL:[applicationSupportURL URLByAppendingPathComponent:@"Example"]]; @@ -70,7 +77,9 @@ - (void) invokeAssembly: (Assembly *)assembly{ NSArray *files = [assembly files]; for (int x = 0; x < [files count]; x++) { - TUSResumableUpload *upload = [self.tusSession createUploadFromFile:[files objectAtIndex:x] headers:@{} metadata:@{@"filename":@"test.jpg", @"fieldname":@"file-input", @"assembly_url": [assembly urlString]}]; + NSLog(@"File!!"); + NSLog([[files objectAtIndex:x] debugDescription]); + TUSResumableUpload *upload = [_tusSession createUploadFromFile:[files objectAtIndex:x] headers:@{} metadata:@{@"filename":@"tes2t.jpg", @"fieldname":@"file-input", @"assembly_url": [assembly urlString]}]; upload.progressBlock = _progressBlock; upload.resultBlock = _resultBlock; upload.failureBlock = _failureBlock; @@ -88,10 +97,10 @@ - (void) createAssembly: (Assembly *)assembly{ } NSMutableURLRequest *request = [[[TransloaditRequest alloc] initWithKey:_key andSecret:_secret] createRequestWithParams:params andEndpoint:TRANSLOADIT_API_ASSEMBLIES]; NSURLSessionDataTask *assemblyTask = [[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) { - if (error) { - NSLog(@"%@", [error debugDescription]); - return; - } +// if (error) { +// NSLog(@"%@", [error debugDescription]); +// return; +// } NSString* body = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; NSDictionary *json = [NSJSONSerialization JSONObjectWithData:[body dataUsingEncoding:NSUTF8StringEncoding] @@ -99,10 +108,17 @@ - (void) createAssembly: (Assembly *)assembly{ error:nil]; if([json valueForKey:@"error"]){ - NSLog(@"%@", [json valueForKey:@"error"]); + self.assemblyCreationFailureBlock(json); return; } else { - self.assemblyCompletionBlock(json); + NSLog(@"%@", [json valueForKey:@"assembly_id"]); + NSLog(@"%@", [json valueForKey:@"assembly_ssl_url"]); + NSLog(@"%@", [json valueForKey:@"tus_url"]); + + [assembly setUrlString: [json valueForKey:@"assembly_ssl_url"]]; + _tusSession = [[TUSSession alloc] initWithEndpoint:[[NSURL alloc] initWithString:[NSString stringWithFormat:@"%@", [json valueForKey:@"tus_url"]]] dataStore:_tusStore allowsCellularAccess:YES]; + self.assemblyCreationCompletionBlock(assembly); + //return; } }]; [assemblyTask resume]; @@ -128,7 +144,7 @@ - (void) checkAssembly: (Assembly *)assembly { case 2: //completed [timer invalidate]; - self.assemblyStatusBlock(response); + self.assemblyCompletionBlock(response); default: break; } @@ -145,8 +161,6 @@ - (void) assemblyStatus: (Assembly *)assembly completion:(void (^)(NSDictionary NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; NSMutableURLRequest *request = [[[TransloaditRequest alloc] initWithKey:_key andSecret:_secret] createGetRequestWithURL:[assembly urlString]]; - NSLog(@"Here"); - NSLog([assembly urlString]); NSURLSessionDataTask *assemblyTask = [[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) { if (error) { NSLog(@"%@", [error debugDescription]); @@ -162,7 +176,7 @@ - (void) assemblyStatus: (Assembly *)assembly completion:(void (^)(NSDictionary NSLog(@"%@", [json valueForKey:@"error"]); return; } else { - //self.assemblyStatusBlock(json); + self.assemblyStatusBlock(json); } completion(json); diff --git a/Transloadit/Classes/TransloaditRequest.m b/Transloadit/Classes/TransloaditRequest.m index 7a843e2..092c22f 100644 --- a/Transloadit/Classes/TransloaditRequest.m +++ b/Transloadit/Classes/TransloaditRequest.m @@ -62,26 +62,12 @@ -(NSMutableURLRequest *) createRequestWithParams:(NSMutableDictionary *)params a } - (NSMutableURLRequest *) createRequestWithParams:(NSMutableDictionary *) params andFinalURL:(NSString *)url { + NSLog(url); + NSLog([params debugDescription]); NSMutableDictionary *auth = [self createAuth]; [params setObject:auth forKey:@"auth"]; NSString *signature = [self generateSignatureWithParams: params]; - NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[[NSURL alloc] initWithString:[NSString stringWithFormat:@"%@", url]] cachePolicy: NSURLRequestReturnCacheDataElseLoad timeoutInterval:120.0]; - TUSUploadStore *store = [[TUSUploadStore alloc] init]; - NSURLSession *session = [[TUSSession alloc] initWithEndpoint:[NSURL URLWithString:url] dataStore:store allowsCellularAccess:YES]; - - NSURLSessionTask *task = [[NSURLSessionTask alloc] init]; - - - - NSURLSessionDataTask *postDataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { - - }]; - - [postDataTask resume]; - - - - NSLog(@"%@", signature); + NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[[NSURL alloc] initWithString:[NSString stringWithFormat:@"%@", url]] cachePolicy: NSURLRequestReturnCacheDataElseLoad timeoutInterval:120.0]; [request addValue:@"application/json" forHTTPHeaderField:@"Accept"]; [request setHTTPMethod:@"POST"]; NSString *boundary = [self generateBoundary]; @@ -99,7 +85,6 @@ - (NSMutableURLRequest *) createRequestWithParams:(NSMutableDictionary *) params [body appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]]; NSString *responseData = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; responseData = [responseData stringByReplacingOccurrencesOfString:@"\\" withString:@""]; - NSLog(@"%@", responseData); [request setHTTPBody:body]; return request; } From 50a3f67e241023fa40f18f3b9799a478c895e266 Mon Sep 17 00:00:00 2001 From: "Mark R. Masterson" Date: Sat, 5 May 2018 22:09:54 -0700 Subject: [PATCH 2/7] 1.0.4 Pre examples Crash fix reworked blocks Added filenames Removed image picker as example Added num of expected files --- Example/Podfile.lock | 4 +- .../Local Podspecs/Transloadit.podspec.json | 4 +- Example/Pods/Manifest.lock | 4 +- Example/Pods/Pods.xcodeproj/project.pbxproj | 322 +++++++++--------- .../Transloadit-OSX/Info.plist | 2 +- .../Transloadit-iOS/Info.plist | 2 +- .../Transloadit/Images.xcassets/Contents.json | 6 + .../transloadit.imageset/Contents.json | 21 ++ .../transloadit.imageset/transloadit.png | Bin 0 -> 10134 bytes Example/Transloadit/Main.storyboard | 12 +- .../Transloadit/TransloaditViewController.m | 184 +++------- .../TransloaditViewController.swift | 42 +-- Example/Transloadit_Example/test.jpg | Bin 0 -> 4767 bytes Transloadit/Classes/Resources/API/Assembly.h | 4 +- Transloadit/Classes/Resources/API/Assembly.m | 9 +- Transloadit/Classes/Transloadit.h | 14 +- Transloadit/Classes/Transloadit.m | 37 +- Transloadit/Classes/TransloaditRequest.m | 5 + 18 files changed, 290 insertions(+), 382 deletions(-) create mode 100644 Example/Transloadit/Images.xcassets/Contents.json create mode 100644 Example/Transloadit/Images.xcassets/transloadit.imageset/Contents.json create mode 100644 Example/Transloadit/Images.xcassets/transloadit.imageset/transloadit.png create mode 100644 Example/Transloadit_Example/test.jpg diff --git a/Example/Podfile.lock b/Example/Podfile.lock index ded9a02..476e038 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -4,7 +4,7 @@ PODS: - FBSnapshotTestCase/Core (2.1.4) - FBSnapshotTestCase/SwiftSupport (2.1.4): - FBSnapshotTestCase/Core - - Transloadit (1.0.1): + - Transloadit (1.0.3): - TUSKit - TUSKit (1.3.10) @@ -18,7 +18,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a - Transloadit: 8aaca46072fe2a4ae387c348b0343172417bd62c + Transloadit: 37dbabad37d654b623ea2733d6c2b45d604bc214 TUSKit: 20493740fd099eccc529014ae0a32230b4b9a7a0 PODFILE CHECKSUM: 1a3d11a4b32f23ad1fa04200c3d1b012c1b2fce7 diff --git a/Example/Pods/Local Podspecs/Transloadit.podspec.json b/Example/Pods/Local Podspecs/Transloadit.podspec.json index d41b1a7..efd2080 100644 --- a/Example/Pods/Local Podspecs/Transloadit.podspec.json +++ b/Example/Pods/Local Podspecs/Transloadit.podspec.json @@ -1,6 +1,6 @@ { "name": "Transloadit", - "version": "1.0.1", + "version": "1.0.3", "summary": "An iOS and MacOS SDK for Transloadit.", "description": "TODO: Add long description of the pod here.", "homepage": "https://github.com/Transloadit/TransloaditKit", @@ -13,7 +13,7 @@ }, "source": { "git": "https://github.com/Transloadit/TransloaditKit.git", - "tag": "1.0.1" + "tag": "1.0.3" }, "platforms": { "ios": "8.0", diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index ded9a02..476e038 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -4,7 +4,7 @@ PODS: - FBSnapshotTestCase/Core (2.1.4) - FBSnapshotTestCase/SwiftSupport (2.1.4): - FBSnapshotTestCase/Core - - Transloadit (1.0.1): + - Transloadit (1.0.3): - TUSKit - TUSKit (1.3.10) @@ -18,7 +18,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a - Transloadit: 8aaca46072fe2a4ae387c348b0343172417bd62c + Transloadit: 37dbabad37d654b623ea2733d6c2b45d604bc214 TUSKit: 20493740fd099eccc529014ae0a32230b4b9a7a0 PODFILE CHECKSUM: 1a3d11a4b32f23ad1fa04200c3d1b012c1b2fce7 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index b232bdb..f0bf70d 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 008FA2FEC8070F9246CE310D287267C8 /* Resources.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C3EB913F127F9CE797E8E30AAA42454 /* Resources.h */; settings = {ATTRIBUTES = (Public, ); }; }; 00CBB95AE11350276039373DB1F08D44 /* TUSData.m in Sources */ = {isa = PBXBuildFile; fileRef = F5F43A0014E8927902B5563312E4E731 /* TUSData.m */; }; 012209A46E1E6EFE2F76BDEAC0938793 /* TUSSession.h in Headers */ = {isa = PBXBuildFile; fileRef = E11E4615570BB2FA8858F56DB8CE68A7 /* TUSSession.h */; settings = {ATTRIBUTES = (Public, ); }; }; 0215C094047054656E3DADE5BF5DCFB5 /* TUSKit-OSX-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 9392AA76C69D0771F24169E8FCCC8BA0 /* TUSKit-OSX-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -19,114 +18,115 @@ 0770E432AAEF1E1ABC923C3A4E05D429 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 404EC8483288FE3615CC43833EEEA20A /* Foundation.framework */; }; 094973D2D2F1E3B2E772F93C8147C6B9 /* UIApplication+StrictKeyWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 625BEF60BCA4C0D0C90830CDC3F7A404 /* UIApplication+StrictKeyWindow.m */; }; 0A494F7D16DD14A034C03A384C777985 /* TUSFileData.h in Headers */ = {isa = PBXBuildFile; fileRef = A58307CDAA9BA7EB2AB1596013BFDF1D /* TUSFileData.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0B42057E416459710E83F058C0A361ED /* APIObjectType.h in Headers */ = {isa = PBXBuildFile; fileRef = 324B60D023946493AC940B1964953B58 /* APIObjectType.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0D7C7DC2D18ADEA311A281D2CDD8A237 /* Template.h in Headers */ = {isa = PBXBuildFile; fileRef = 43EE70B1F11C23A58993CD38528869F2 /* Template.h */; settings = {ATTRIBUTES = (Public, ); }; }; 0EBD09DB81FDF4430A732476BE9B68AA /* TUSFileUploadStore.m in Sources */ = {isa = PBXBuildFile; fileRef = DD7BDBAF17974C8C33E6ED4662D1375E /* TUSFileUploadStore.m */; }; - 1A86C89F46942EDD9602FB3F9AAB9F4C /* APIObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F0740B11609689BCBB783A0DBE1663E /* APIObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0ED7F69A2963ACB97735B483BAED732D /* APIState.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD2D0A469A28C735F01A06659FE558B /* APIState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 13D274611148703CA03309BAA267470C /* Transloadit-OSX-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = DA57027E6446B593C1943DDC3DB85E0E /* Transloadit-OSX-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 142BBEF784D9C7E1075B3EB6E0EB020F /* Template.h in Headers */ = {isa = PBXBuildFile; fileRef = 43EE70B1F11C23A58993CD38528869F2 /* Template.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 165A467C8EBC202C55A0268658EF673D /* Transloadit-iOS-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = BEBFB7A31BEFD072C255D9A766A6C47A /* Transloadit-iOS-dummy.m */; }; + 16E8B89FC3B24D09A96CE89DA2678199 /* NSString+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 641103A6694F2C748BD4628C4C9E55CC /* NSString+Utils.m */; }; + 19336EB89757D576F40875442CD5333B /* Transloadit.h in Headers */ = {isa = PBXBuildFile; fileRef = C893844BEAB562428E4BCA5C99DDB656 /* Transloadit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1AAE76041D96EF646A2CB01A18A078AB /* Template.m in Sources */ = {isa = PBXBuildFile; fileRef = D9DD1543360674E64B74078F7247E072 /* Template.m */; }; 1AB7934C16CE49DE196FFC7BE7278287 /* SwiftSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2F4F42C86C33493E5D90481953E5A22 /* SwiftSupport.swift */; }; + 1CB38131C4C706031EF496F86E76719D /* TransloaditProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 78E6F0311FD58CD1D0C5776216E648A2 /* TransloaditProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1FC295A3290CCA6D0A2E85B7A307CBF4 /* Pods-Transloadit_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = E0DE4024EFF56A49F68F92EDBC12F190 /* Pods-Transloadit_Example-dummy.m */; }; - 20D164B5A3D0B1D5D34A8BD2195CA036 /* NSString+Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D27375BD6AAF985F744E10F6131FB95 /* NSString+Utils.h */; settings = {ATTRIBUTES = (Public, ); }; }; 22311A5CCDB32E1A0E827AB3F5B45677 /* TUSAssetData.h in Headers */ = {isa = PBXBuildFile; fileRef = DBBA4DD962450B719481CAD3D3D6D365 /* TUSAssetData.h */; settings = {ATTRIBUTES = (Public, ); }; }; 25A4F1A97128E455522B2DB33B17641A /* TUSData.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D74FE8101BA300D2810DAF7A5151578 /* TUSData.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 25D1A9B87F1A3FB421AEEA62CA2345DF /* Transloadit.m in Sources */ = {isa = PBXBuildFile; fileRef = B9FDC927649996750C136F78762C0977 /* Transloadit.m */; }; + 262FF24949B232085F8B4193FD6322DB /* Transloadit.m in Sources */ = {isa = PBXBuildFile; fileRef = B9FDC927649996750C136F78762C0977 /* Transloadit.m */; }; 2A54CB1DB494A77042B6E9AF17DBC637 /* TUSSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 315E608A1FED2DEC457E3A3D8075A54B /* TUSSession.m */; }; 2B2B51F28B753D06653CEA6566ECFD05 /* TUSResumableUpload+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D0DDA992FD3B619824A44E6353D3C8 /* TUSResumableUpload+Private.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 2DA48DF74AE478740757EA7F4689260E /* Template.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AA32FD0ADEA7B205B1CABD883F0709F /* Template.m */; }; 2F485B69F51E4F723A38410F31F08550 /* FBSnapshotTestController.h in Headers */ = {isa = PBXBuildFile; fileRef = F94190AFDFCA59CBBC8C5FC3ED8FDBA0 /* FBSnapshotTestController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 2F7660FE5F63B764E9D21B43437B0903 /* Step.m in Sources */ = {isa = PBXBuildFile; fileRef = A3E46F7F711002B0C6E172E2CE899A53 /* Step.m */; }; 335B4BF5C5EA8B9C1D927101EE29D0A9 /* TUSResumableUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D8B13A803D995B9A5F28C41B71BFFF1 /* TUSResumableUpload.m */; }; 35DD05FD595A6FE7F5A0692D12E319DC /* UIImage+Diff.m in Sources */ = {isa = PBXBuildFile; fileRef = A139E45C6E9304C85ED2BF527121B7B3 /* UIImage+Diff.m */; }; - 3A5B82824D552A48219E910930F6D422 /* TransloaditRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 10328483641E558DD80D1364A020119A /* TransloaditRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 36B50893B34B041B07807CCD3C5F9556 /* TransloaditRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 10328483641E558DD80D1364A020119A /* TransloaditRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 36CF74310404BFC918C9545F27CFBED2 /* Assembly.m in Sources */ = {isa = PBXBuildFile; fileRef = 65357793EA1CA2DF90FF060BE8AEEB80 /* Assembly.m */; }; + 38A17501809F2A63075AAC4D569C507D /* Assembly.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A7C0A0313AC65253E88F032137DEDF8 /* Assembly.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D50184F35819DF129E70E38398AC252 /* TransloaditProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 78E6F0311FD58CD1D0C5776216E648A2 /* TransloaditProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3DD2F0590D22CCDEEBB7D05F247525A2 /* TUSErrors.m in Sources */ = {isa = PBXBuildFile; fileRef = B12225C4FC028CC53D321CC9CCD71B9F /* TUSErrors.m */; }; 3F1B0595BD3DDDBA4D57C85FCCB19CB2 /* TUSResumableUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D8B13A803D995B9A5F28C41B71BFFF1 /* TUSResumableUpload.m */; }; + 3FC98DEF3A0F16D8BC264A8FB6FD4B0F /* module.modulemap in Sources */ = {isa = PBXBuildFile; fileRef = 94111EC7E7911D4C69BF676E996DCA9D /* module.modulemap */; }; 421CDD701AEE0F2458A84200366CDD0F /* UIImage+Snapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = 785963EC959968B9A7FDB1598E23A24B /* UIImage+Snapshot.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 4630E13130ADF426EAB1B2FE051B84F2 /* Transloadit.h in Headers */ = {isa = PBXBuildFile; fileRef = C893844BEAB562428E4BCA5C99DDB656 /* Transloadit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 42E9B97439DAE29AF7C57C4CBE1FFA95 /* URLConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ED7369C1943E3386F9BEA3056AD8425 /* URLConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 438BBAF59B6EE87FAF07947679882C3A /* Resources.h in Headers */ = {isa = PBXBuildFile; fileRef = 107906BF7E62142DBDD9BCBD4F0A56E1 /* Resources.h */; settings = {ATTRIBUTES = (Public, ); }; }; 469DB77D37B54B9756C2DBCA5EE93ADB /* TUSFileData.h in Headers */ = {isa = PBXBuildFile; fileRef = A58307CDAA9BA7EB2AB1596013BFDF1D /* TUSFileData.h */; settings = {ATTRIBUTES = (Public, ); }; }; 46F3C81C1B6F9496AF5C3785452E928B /* TUSErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 396F7E3A9427713B423B56F5558E5B42 /* TUSErrors.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4FD8441DA9FBFDD8BA50D33447FF0992 /* Step.h in Headers */ = {isa = PBXBuildFile; fileRef = 3126501412E1B42BE7A09A0DA363A1CB /* Step.h */; settings = {ATTRIBUTES = (Public, ); }; }; 506D761F91EC3583789A837C559972FE /* FBSnapshotTestCase-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B12319E96A75A526A1076DA55C6181B /* FBSnapshotTestCase-dummy.m */; }; - 565251123345FF4CDC20FE80432F6E66 /* APIState.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E6E83E2C5E8F9355605FACF37D4E871 /* APIState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 525DE33AAEDD2681F03A576B48F47A54 /* Step.m in Sources */ = {isa = PBXBuildFile; fileRef = A3E46F7F711002B0C6E172E2CE899A53 /* Step.m */; }; + 52CAE0AE3C20F53840119186A3D3185E /* APIObject.h in Headers */ = {isa = PBXBuildFile; fileRef = CA2A0ACAB62E6B60C471FBA47827334B /* APIObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 5873367B662BF5038224D773A8C8ACC6 /* Transloadit.h in Headers */ = {isa = PBXBuildFile; fileRef = C893844BEAB562428E4BCA5C99DDB656 /* Transloadit.h */; settings = {ATTRIBUTES = (Public, ); }; }; 58FF04E0F1A90D26DE53845EE4968D53 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54F26D5C90D4B9FBC3E0C5C7181CC48B /* Cocoa.framework */; }; 5A0FA0A128C98E347D00D96DCA7C1E55 /* TUSErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 396F7E3A9427713B423B56F5558E5B42 /* TUSErrors.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5B6BBFACDE79978DE4184F1E41F4CD4F /* TUSSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 315E608A1FED2DEC457E3A3D8075A54B /* TUSSession.m */; }; - 5BC7CF6B9F3CE57357849A5A05789F00 /* TransloaditRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 01C7DD164A8495EF521801F3F383357E /* TransloaditRequest.m */; }; - 600D3BBCC12833ED249337D3FF0FD980 /* Assembly.m in Sources */ = {isa = PBXBuildFile; fileRef = 6385B255CF89AC8F0F330360A65F3D82 /* Assembly.m */; }; - 602200BD32D58DE738780C14CE3CDF18 /* APIObjectType.h in Headers */ = {isa = PBXBuildFile; fileRef = 324B60D023946493AC940B1964953B58 /* APIObjectType.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 649DC1D217E3D50AECA21473D1084601 /* Resources.h in Headers */ = {isa = PBXBuildFile; fileRef = 107906BF7E62142DBDD9BCBD4F0A56E1 /* Resources.h */; settings = {ATTRIBUTES = (Public, ); }; }; 64CA2BEA5EF723A6944CF14159EB58E2 /* TUSData.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D74FE8101BA300D2810DAF7A5151578 /* TUSData.h */; settings = {ATTRIBUTES = (Public, ); }; }; 65DEB62B56DE479E49A1ACF738F738FB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54F26D5C90D4B9FBC3E0C5C7181CC48B /* Cocoa.framework */; }; - 65E0B4E3F83705BD3B0F856092E0869A /* Step.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B38BB5AC90E1AD918D7D962C391C769 /* Step.m */; }; 67BD34E026A2C6AC3755319A86B72688 /* TUSAssetData.m in Sources */ = {isa = PBXBuildFile; fileRef = 2283180F1A23D7C6DBC2DD556F4C2EDD /* TUSAssetData.m */; }; 69DA8B003216466C60F029CBD79897F1 /* UIImage+Compare.m in Sources */ = {isa = PBXBuildFile; fileRef = 04B3D6B6D871AA10749B44C5E224FA61 /* UIImage+Compare.m */; }; - 6B639D051D45152354118D0151B7806C /* NSString+Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D27375BD6AAF985F744E10F6131FB95 /* NSString+Utils.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6FFB4B7F48653E52D1329579AFFBA379 /* TUSKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F943C83E973B5872AF960FB19323FBE /* TUSKit.framework */; }; - 72C98093D27517803BCBFBB366B838E2 /* Assembly.h in Headers */ = {isa = PBXBuildFile; fileRef = 809B0393A35825AED1F983499EB30D45 /* Assembly.h */; settings = {ATTRIBUTES = (Public, ); }; }; 755DCA502E4E5DC3C055A9554F7778A1 /* TUSFileUploadStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F12056A314049F6E5BED270DC78F7D6 /* TUSFileUploadStore.h */; settings = {ATTRIBUTES = (Public, ); }; }; 756564ABAF2892FE7140C92A1CDDCF65 /* UIImage+Snapshot.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C1FE0C78C46434795DC3BD3A021F18A /* UIImage+Snapshot.m */; }; - 75CC7A1DD3B7B9E7851AD36EFCDCBA74 /* TransloaditRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 01C7DD164A8495EF521801F3F383357E /* TransloaditRequest.m */; }; + 7665B826B9612A6E722EAF3863800CC4 /* NSString+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 641103A6694F2C748BD4628C4C9E55CC /* NSString+Utils.m */; }; + 7AAFFD05ADFD296EB7290AF8A2D2787C /* Template.m in Sources */ = {isa = PBXBuildFile; fileRef = D9DD1543360674E64B74078F7247E072 /* Template.m */; }; 7BAE52AAA2DC088ED4B4AEE68CCB19E0 /* TUSResumableUpload.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B8CE62194C0F9BB1E9AD666EEA874F0 /* TUSResumableUpload.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7BC653BF5D039EF1432A95CD9BE5DBC1 /* TUSKit.xcconfig in Sources */ = {isa = PBXBuildFile; fileRef = DCD2DBD4EEFAA1D6704D7247AE894092 /* TUSKit.xcconfig */; }; + 7C062552FCAE3F8781FF51784990294B /* APIObjectType.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE5225462175C8E5B94FD38A7D8B0CF /* APIObjectType.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7E9B14D5F8842A86CA86F2AF45230725 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B63B7B1B243D038665BFB1C81A974F58 /* XCTest.framework */; }; + 7E9DB2281C880334F9DCA89C8AC5FBC1 /* APIState.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD2D0A469A28C735F01A06659FE558B /* APIState.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8186DC70D02B8A87762C1A74B0AA6C1D /* TUSFileUploadStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F12056A314049F6E5BED270DC78F7D6 /* TUSFileUploadStore.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 826221BED2D5310627DAFEFB993E3E79 /* TransloaditProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 78E6F0311FD58CD1D0C5776216E648A2 /* TransloaditProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; 841FF232C33C7D49C58CEFDBE7EEB92B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 639F8B1096A2D129845C89411E2CE63B /* UIKit.framework */; }; - 848F8A77EABDAFA9523502B86295D3C4 /* Step.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B38BB5AC90E1AD918D7D962C391C769 /* Step.m */; }; - 86BD36E031389C18EE30D7167A51BA33 /* URLConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 75AAFDFF8B38324254B56DB07A7BD080 /* URLConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8A3623B6DD6DA805A06F9CBE8B3DEC3E /* TransloaditProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 78E6F0311FD58CD1D0C5776216E648A2 /* TransloaditProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 866D9E867DEFC09120EC3D4DB1A6974E /* NSString+Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D27375BD6AAF985F744E10F6131FB95 /* NSString+Utils.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 885524AB5E195C4B54395FC81842A17C /* APIObjectType.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE5225462175C8E5B94FD38A7D8B0CF /* APIObjectType.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8947B3C4256FDD21173A9A79334AEFFC /* module.modulemap in Sources */ = {isa = PBXBuildFile; fileRef = 94111EC7E7911D4C69BF676E996DCA9D /* module.modulemap */; }; 8BB76B9D721C06176BE40D4F9DCD2B04 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 404EC8483288FE3615CC43833EEEA20A /* Foundation.framework */; }; 8DF9C1EFB545F4E3EB20B32A747D7B32 /* TUSUploadStore.h in Headers */ = {isa = PBXBuildFile; fileRef = DB74D73FB1341B3F6A18A890FD7149E7 /* TUSUploadStore.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8DFC34A468CFEA2AD67B946CA13C16A8 /* Assembly.m in Sources */ = {isa = PBXBuildFile; fileRef = 6385B255CF89AC8F0F330360A65F3D82 /* Assembly.m */; }; - 8E6D1D1F4AB7268F11246FE1973C4529 /* Step.h in Headers */ = {isa = PBXBuildFile; fileRef = 67160313DC3C2733A8A87C55F75DF582 /* Step.h */; settings = {ATTRIBUTES = (Public, ); }; }; 91D0138ACFAD733E4061F12E450C336C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 404EC8483288FE3615CC43833EEEA20A /* Foundation.framework */; }; 91F7A92BC6DF63346C786C422ACAD925 /* TUSUploadStore.h in Headers */ = {isa = PBXBuildFile; fileRef = DB74D73FB1341B3F6A18A890FD7149E7 /* TUSUploadStore.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 934C9E6DA8796051A0A970A53780381E /* Assembly.h in Headers */ = {isa = PBXBuildFile; fileRef = 809B0393A35825AED1F983499EB30D45 /* Assembly.h */; settings = {ATTRIBUTES = (Public, ); }; }; 93B7E9FA92E7AD185489CFB2550D741B /* TUSUploadStore.m in Sources */ = {isa = PBXBuildFile; fileRef = BCFEA4608FCC647BE2BF201BF5F3CBDA /* TUSUploadStore.m */; }; 9673CF780F48C8E4EC2A331717B1F67C /* FBSnapshotTestCase.h in Headers */ = {isa = PBXBuildFile; fileRef = EF2DCE54DF34D8D28AB6AFE56C2A4DA7 /* FBSnapshotTestCase.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 997484B729063CC57D38CE36DFF9CEEA /* Resources.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C3EB913F127F9CE797E8E30AAA42454 /* Resources.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 975EC2738CA7A00C5599DD7FC7B3D209 /* Step.h in Headers */ = {isa = PBXBuildFile; fileRef = 3126501412E1B42BE7A09A0DA363A1CB /* Step.h */; settings = {ATTRIBUTES = (Public, ); }; }; 999211A5C4905CF17E0784588822DCF2 /* TUSKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F943C83E973B5872AF960FB19323FBE /* TUSKit.framework */; }; - 99B697C97733566D5987B3817A58BA27 /* module.modulemap in Sources */ = {isa = PBXBuildFile; fileRef = 94111EC7E7911D4C69BF676E996DCA9D /* module.modulemap */; }; - 9C20C39297D56B0FD4BDF7EF710FA10C /* Transloadit-iOS-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 15224486F933755DF3E0D0442B1ED8F3 /* Transloadit-iOS-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; A01695B913FB86BEF734ECCA9DB2D9BF /* Pods-Transloadit_MacOS_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A0730B15B972DF84424D4C20C309E47 /* Pods-Transloadit_MacOS_Example-dummy.m */; }; A098A66D2FBE682EDE5E3264224101C8 /* TUSAssetData.h in Headers */ = {isa = PBXBuildFile; fileRef = DBBA4DD962450B719481CAD3D3D6D365 /* TUSAssetData.h */; settings = {ATTRIBUTES = (Public, ); }; }; A2DBA8B2A8FB218480922E158CDC7C76 /* TUSKit-OSX-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 05E0D119AF737816EA99709197DDAE8E /* TUSKit-OSX-dummy.m */; }; A4F69F3477A935285620AC3031C5C848 /* FBSnapshotTestController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C1E0A65F10AB4C81479E747C50025B /* FBSnapshotTestController.m */; }; A93493F4A1FEC03B1B1F9990A0497935 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54F26D5C90D4B9FBC3E0C5C7181CC48B /* Cocoa.framework */; }; - AC214690043C348E6E9F827D44B8480B /* APIState.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E6E83E2C5E8F9355605FACF37D4E871 /* APIState.h */; settings = {ATTRIBUTES = (Public, ); }; }; AC5E7150BEE3BFC13B8CF5F5A0DE7A50 /* TUSKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 64C61EB5208C7A048730B4D6807BA6E3 /* TUSKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; - ACF3165B21CA5B630304B2E209E3F830 /* APIObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F0740B11609689BCBB783A0DBE1663E /* APIObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; AEF3F343D6A790B6CCA871780CBAA876 /* TUSKit-iOS-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8D9BE3699E833EF4F52B1DA719A5E6 /* TUSKit-iOS-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B26DDD3B504605C09D2A17D9A49D3702 /* URLConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 75AAFDFF8B38324254B56DB07A7BD080 /* URLConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; B27DFD6025D94758785918F1D6F6C060 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29ABE98ECE07CEFB58DBFCC702663580 /* QuartzCore.framework */; }; - B2E0953DE9DE5DF6BC92494283AC281B /* TransloaditRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 10328483641E558DD80D1364A020119A /* TransloaditRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; B4FE013FF349B1C2FBE939BDC9F4B214 /* TUSKit-iOS-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 53F9FC626A9FDC68E860AC31E130BB3F /* TUSKit-iOS-dummy.m */; }; B758FB09FE2C06C1B8E36A71A9D76D41 /* FBSnapshotTestCase-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F06D9A601599782F749BC62F449D063F /* FBSnapshotTestCase-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; BA3BE080D873D3AC0F528D17681FA513 /* TUSAssetData.m in Sources */ = {isa = PBXBuildFile; fileRef = 2283180F1A23D7C6DBC2DD556F4C2EDD /* TUSAssetData.m */; }; - BC241BCD36F3F080B0AFEC5221E1BA18 /* Template.h in Headers */ = {isa = PBXBuildFile; fileRef = F70F87EB77A96596759C2FE63B005D46 /* Template.h */; settings = {ATTRIBUTES = (Public, ); }; }; BC952FC04FC963C1294DCD619C9B6B3B /* UIApplication+StrictKeyWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 2595BB609C53FE468A8DD9798F97A767 /* UIApplication+StrictKeyWindow.h */; settings = {ATTRIBUTES = (Project, ); }; }; BE14F2198CDB0DAD98A567981D21C7A1 /* FBSnapshotTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CEC51BC397C9046E61903DC4E0E3FF /* FBSnapshotTestCase.m */; }; BEEB42701CCAAD2047878B082947E720 /* Pods-Transloadit_Tests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B4C6CDFD54DD9064A9BDF54800FBA31 /* Pods-Transloadit_Tests-dummy.m */; }; BFCE460CC33E8872B7156D4166340178 /* FBSnapshotTestCasePlatform.h in Headers */ = {isa = PBXBuildFile; fileRef = 7F0E5FDD9C38D931D5EE75FB49B13856 /* FBSnapshotTestCasePlatform.h */; settings = {ATTRIBUTES = (Public, ); }; }; - BFFA1A538875E2E2056698F79E635D9C /* Transloadit-iOS-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = BEBFB7A31BEFD072C255D9A766A6C47A /* Transloadit-iOS-dummy.m */; }; + C026E99383AB30655CE3A6834F79F0FE /* TransloaditRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 10328483641E558DD80D1364A020119A /* TransloaditRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; C05471EC7D0CFEDCE9B8FD0254C78FA8 /* TUSFileData.m in Sources */ = {isa = PBXBuildFile; fileRef = E853726DB07D122F794CF73A78E5C240 /* TUSFileData.m */; }; + C444725CB6ACD76A37EA7B7BF58FE617 /* Transloadit-OSX-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 334ADE67273A072766C2E194466E3A34 /* Transloadit-OSX-dummy.m */; }; C4AA2E43605F8D0904309009DEBC3503 /* TUSResumableUpload+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D0DDA992FD3B619824A44E6353D3C8 /* TUSResumableUpload+Private.h */; settings = {ATTRIBUTES = (Public, ); }; }; C5FD40E7096BA9475C5A69E73FC1BF05 /* TUSUploadStore.m in Sources */ = {isa = PBXBuildFile; fileRef = BCFEA4608FCC647BE2BF201BF5F3CBDA /* TUSUploadStore.m */; }; - C89D25CEC21D8D48AAD1C9FDC2AA22BC /* module.modulemap in Sources */ = {isa = PBXBuildFile; fileRef = 94111EC7E7911D4C69BF676E996DCA9D /* module.modulemap */; }; CAFA5E486BCE117A7D8C0FBF9DA6666B /* UIImage+Compare.h in Headers */ = {isa = PBXBuildFile; fileRef = DA3E19A63D24B1B29ACEF61FF3C260FC /* UIImage+Compare.h */; settings = {ATTRIBUTES = (Private, ); }; }; - D04EBD4871E3E2BDB0EFBBEB31AAE6F7 /* Transloadit-OSX-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = DA57027E6446B593C1943DDC3DB85E0E /* Transloadit-OSX-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; D525902B0BDD269834DD11707E5F3F73 /* TUSKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 64C61EB5208C7A048730B4D6807BA6E3 /* TUSKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; D6B7E2F7D4AEEFE3E2C32B6EF701129C /* TUSSession.h in Headers */ = {isa = PBXBuildFile; fileRef = E11E4615570BB2FA8858F56DB8CE68A7 /* TUSSession.h */; settings = {ATTRIBUTES = (Public, ); }; }; - D9F3B800AE9F0585A7242E34141C52F6 /* NSString+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 641103A6694F2C748BD4628C4C9E55CC /* NSString+Utils.m */; }; + DA1ADBCC9EACFED739C2D204FF8887E8 /* NSString+Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D27375BD6AAF985F744E10F6131FB95 /* NSString+Utils.h */; settings = {ATTRIBUTES = (Public, ); }; }; DB7A106243AC974FC7EBEB00B506C786 /* FBSnapshotTestCasePlatform.m in Sources */ = {isa = PBXBuildFile; fileRef = DEC30A35F10CA0874D55E916CCA78716 /* FBSnapshotTestCasePlatform.m */; }; - E153F888C16A7E677B05BCB1E5BD935D /* Transloadit-OSX-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 334ADE67273A072766C2E194466E3A34 /* Transloadit-OSX-dummy.m */; }; + DC4DDD67871F499BC101C24EDACF44D8 /* TransloaditRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 01C7DD164A8495EF521801F3F383357E /* TransloaditRequest.m */; }; + E3C2FCAB324CAFCC96AF74F4D2030A75 /* Assembly.m in Sources */ = {isa = PBXBuildFile; fileRef = 65357793EA1CA2DF90FF060BE8AEEB80 /* Assembly.m */; }; + E3FAA1C311438B5F42CF6A28E227E122 /* APIObject.h in Headers */ = {isa = PBXBuildFile; fileRef = CA2A0ACAB62E6B60C471FBA47827334B /* APIObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; E5C61810C1F23CFD7D74BE1191D0AFB5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 404EC8483288FE3615CC43833EEEA20A /* Foundation.framework */; }; - E7EC93CB406C8B47EED0A0B6CF3871F7 /* Template.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AA32FD0ADEA7B205B1CABD883F0709F /* Template.m */; }; - EB7C5C5C001F1157E1FFDD93DEFAD9CD /* NSString+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 641103A6694F2C748BD4628C4C9E55CC /* NSString+Utils.m */; }; + E700C189A8A5F1A84A6FE91EBB0E242B /* Assembly.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A7C0A0313AC65253E88F032137DEDF8 /* Assembly.h */; settings = {ATTRIBUTES = (Public, ); }; }; + EB686AC6DEBE791512390A653AAFEC77 /* TransloaditRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 01C7DD164A8495EF521801F3F383357E /* TransloaditRequest.m */; }; EC679380459A9D59A542DE3E5B2A67C4 /* TUSKit.xcconfig in Sources */ = {isa = PBXBuildFile; fileRef = DCD2DBD4EEFAA1D6704D7247AE894092 /* TUSKit.xcconfig */; }; - EE6EE82484308B7C7806774D20A8C382 /* Transloadit.m in Sources */ = {isa = PBXBuildFile; fileRef = B9FDC927649996750C136F78762C0977 /* Transloadit.m */; }; - EF009B15AFA9D80C583FE2A5354F0044 /* Transloadit.m in Sources */ = {isa = PBXBuildFile; fileRef = B9FDC927649996750C136F78762C0977 /* Transloadit.m */; }; EFBCBF0E4595A17D36C84F47CD5F4FF5 /* Pods-Transloadit_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F9A965022EE9BFDD4BD0C8AD7284F658 /* Pods-Transloadit_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; F6DBD43D913C59B5504A2DF160E81B6B /* TUSFileData.m in Sources */ = {isa = PBXBuildFile; fileRef = E853726DB07D122F794CF73A78E5C240 /* TUSFileData.m */; }; - F7235BBD0593F62883DBC7862AC924A1 /* Step.h in Headers */ = {isa = PBXBuildFile; fileRef = 67160313DC3C2733A8A87C55F75DF582 /* Step.h */; settings = {ATTRIBUTES = (Public, ); }; }; F764081D1C1ACD8E263C03C076568EEC /* Pods-Transloadit_Tests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C29101BC282ADF2BDA2386FCDF59063 /* Pods-Transloadit_Tests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + F7C186618B5E6411400B23E1BECA3AC1 /* Transloadit-iOS-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 15224486F933755DF3E0D0442B1ED8F3 /* Transloadit-iOS-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; F904AE831CBA5FA94298091AB48540CF /* TUSErrors.m in Sources */ = {isa = PBXBuildFile; fileRef = B12225C4FC028CC53D321CC9CCD71B9F /* TUSErrors.m */; }; FD7EE0B4A72568B3E176AEC72869F23E /* TUSData.m in Sources */ = {isa = PBXBuildFile; fileRef = F5F43A0014E8927902B5563312E4E731 /* TUSData.m */; }; - FF0A6C1D7EB68A2518704FC2EACFC30A /* Transloadit.h in Headers */ = {isa = PBXBuildFile; fileRef = C893844BEAB562428E4BCA5C99DDB656 /* Transloadit.h */; settings = {ATTRIBUTES = (Public, ); }; }; - FF87EBE530B93CCA81DC16612EF9431B /* Template.h in Headers */ = {isa = PBXBuildFile; fileRef = F70F87EB77A96596759C2FE63B005D46 /* Template.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FEE7FCAE2EDA22E37E6A94735F0F98CA /* URLConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ED7369C1943E3386F9BEA3056AD8425 /* URLConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -182,13 +182,14 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 0013FAE3A85FD3DAAD077AE66D0CD734 /* FBSnapshotTestCase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FBSnapshotTestCase.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0013FAE3A85FD3DAAD077AE66D0CD734 /* FBSnapshotTestCase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = FBSnapshotTestCase.framework; path = FBSnapshotTestCase.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 01C7DD164A8495EF521801F3F383357E /* TransloaditRequest.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TransloaditRequest.m; sourceTree = ""; }; 04B3D6B6D871AA10749B44C5E224FA61 /* UIImage+Compare.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIImage+Compare.m"; path = "FBSnapshotTestCase/Categories/UIImage+Compare.m"; sourceTree = ""; }; 05E0D119AF737816EA99709197DDAE8E /* TUSKit-OSX-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "TUSKit-OSX-dummy.m"; sourceTree = ""; }; 0A0730B15B972DF84424D4C20C309E47 /* Pods-Transloadit_MacOS_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Transloadit_MacOS_Example-dummy.m"; sourceTree = ""; }; 0C8D9BE3699E833EF4F52B1DA719A5E6 /* TUSKit-iOS-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "TUSKit-iOS-umbrella.h"; path = "../TUSKit-iOS/TUSKit-iOS-umbrella.h"; sourceTree = ""; }; 10328483641E558DD80D1364A020119A /* TransloaditRequest.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TransloaditRequest.h; sourceTree = ""; }; + 107906BF7E62142DBDD9BCBD4F0A56E1 /* Resources.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Resources.h; sourceTree = ""; }; 15224486F933755DF3E0D0442B1ED8F3 /* Transloadit-iOS-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "Transloadit-iOS-umbrella.h"; path = "../Transloadit-iOS/Transloadit-iOS-umbrella.h"; sourceTree = ""; }; 1531CD9BDA97F204B7E35D041EA36699 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 1F943C83E973B5872AF960FB19323FBE /* TUSKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TUSKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -196,29 +197,29 @@ 2595BB609C53FE468A8DD9798F97A767 /* UIApplication+StrictKeyWindow.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIApplication+StrictKeyWindow.h"; path = "FBSnapshotTestCase/Categories/UIApplication+StrictKeyWindow.h"; sourceTree = ""; }; 272F41FF46DB7860C715BE4418025407 /* Transloadit-iOS-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "Transloadit-iOS-prefix.pch"; path = "../Transloadit-iOS/Transloadit-iOS-prefix.pch"; sourceTree = ""; }; 28DECC1DCB90B17ABAE050E841DD54A9 /* Pods-Transloadit_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Transloadit_Example.debug.xcconfig"; sourceTree = ""; }; - 2926FFE37F3DAFDC8DFC2B277908EA4A /* Transloadit-OSX.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Transloadit-OSX.modulemap"; sourceTree = ""; }; + 2926FFE37F3DAFDC8DFC2B277908EA4A /* Transloadit-OSX.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Transloadit-OSX.modulemap"; sourceTree = ""; }; 29ABE98ECE07CEFB58DBFCC702663580 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; }; 2ABE248ADE49D64C2926EB8D9760A43D /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = Info.plist; path = "../Transloadit-iOS/Info.plist"; sourceTree = ""; }; 2C1FE0C78C46434795DC3BD3A021F18A /* UIImage+Snapshot.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIImage+Snapshot.m"; path = "FBSnapshotTestCase/Categories/UIImage+Snapshot.m"; sourceTree = ""; }; + 3126501412E1B42BE7A09A0DA363A1CB /* Step.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Step.h; sourceTree = ""; }; 315E608A1FED2DEC457E3A3D8075A54B /* TUSSession.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TUSSession.m; path = Pod/Classes/TUSSession.m; sourceTree = ""; }; - 324B60D023946493AC940B1964953B58 /* APIObjectType.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = APIObjectType.h; sourceTree = ""; }; 334ADE67273A072766C2E194466E3A34 /* Transloadit-OSX-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Transloadit-OSX-dummy.m"; sourceTree = ""; }; - 35AEF995D9C72FD9536D69D3199EC3CA /* Transloadit-iOS.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; name = "Transloadit-iOS.modulemap"; path = "../Transloadit-iOS/Transloadit-iOS.modulemap"; sourceTree = ""; }; + 35AEF995D9C72FD9536D69D3199EC3CA /* Transloadit-iOS.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; name = "Transloadit-iOS.modulemap"; path = "../Transloadit-iOS/Transloadit-iOS.modulemap"; sourceTree = ""; }; 396F7E3A9427713B423B56F5558E5B42 /* TUSErrors.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSErrors.h; path = Pod/Classes/TUSErrors.h; sourceTree = ""; }; - 3AA32FD0ADEA7B205B1CABD883F0709F /* Template.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Template.m; sourceTree = ""; }; - 3B38BB5AC90E1AD918D7D962C391C769 /* Step.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Step.m; sourceTree = ""; }; - 3C3EB913F127F9CE797E8E30AAA42454 /* Resources.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Resources.h; sourceTree = ""; }; 3D74FE8101BA300D2810DAF7A5151578 /* TUSData.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSData.h; path = Pod/Classes/TUSData.h; sourceTree = ""; }; 404EC8483288FE3615CC43833EEEA20A /* 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; }; + 43EE70B1F11C23A58993CD38528869F2 /* Template.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Template.h; sourceTree = ""; }; 4C32B816BB1BF8C1F60E53D32E008496 /* FBSnapshotTestCase-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "FBSnapshotTestCase-prefix.pch"; sourceTree = ""; }; 4CA617A00AA0A1ABC5A103F3E3D30635 /* Transloadit-OSX-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Transloadit-OSX-prefix.pch"; sourceTree = ""; }; 4D00C2C07F272E6A3765C6E2FDDC9ACC /* Pods-Transloadit_MacOS_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Transloadit_MacOS_Example-resources.sh"; sourceTree = ""; }; 4D27375BD6AAF985F744E10F6131FB95 /* NSString+Utils.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSString+Utils.h"; sourceTree = ""; }; + 4DD2D0A469A28C735F01A06659FE558B /* APIState.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = APIState.h; sourceTree = ""; }; 4EA9E240F7067EEAF9C0ACAB26606B4F /* Pods-Transloadit_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Transloadit_Tests.release.xcconfig"; sourceTree = ""; }; + 4ED7369C1943E3386F9BEA3056AD8425 /* URLConstants.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = URLConstants.h; sourceTree = ""; }; 4F12056A314049F6E5BED270DC78F7D6 /* TUSFileUploadStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSFileUploadStore.h; path = Pod/Classes/TUSFileUploadStore.h; sourceTree = ""; }; 501EFCDB9CB1D337F1A1677393752E0A /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = Info.plist; path = "../TUSKit-iOS/Info.plist"; sourceTree = ""; }; - 50E4474B25615AE19AC36744F907102E /* Transloadit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Transloadit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 5269CFEEA4DF80A54EF9DCDB5900F9DA /* FBSnapshotTestCase.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = FBSnapshotTestCase.modulemap; sourceTree = ""; }; + 50E4474B25615AE19AC36744F907102E /* Transloadit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Transloadit.framework; path = "Transloadit-OSX.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5269CFEEA4DF80A54EF9DCDB5900F9DA /* FBSnapshotTestCase.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = FBSnapshotTestCase.modulemap; sourceTree = ""; }; 53F9FC626A9FDC68E860AC31E130BB3F /* TUSKit-iOS-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "TUSKit-iOS-dummy.m"; path = "../TUSKit-iOS/TUSKit-iOS-dummy.m"; sourceTree = ""; }; 548AFC10E2E235CC63739E65DE4BC742 /* Pods-Transloadit_Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Transloadit_Tests-resources.sh"; sourceTree = ""; }; 54C1E0A65F10AB4C81479E747C50025B /* FBSnapshotTestController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSnapshotTestController.m; path = FBSnapshotTestCase/FBSnapshotTestController.m; sourceTree = ""; }; @@ -228,45 +229,42 @@ 58778CED3A2DD70E7FD035AD0691CACB /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 625BEF60BCA4C0D0C90830CDC3F7A404 /* UIApplication+StrictKeyWindow.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIApplication+StrictKeyWindow.m"; path = "FBSnapshotTestCase/Categories/UIApplication+StrictKeyWindow.m"; sourceTree = ""; }; 62950C78DE9129C3A9B84D9C96DA9183 /* TUSKit-iOS.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "TUSKit-iOS.xcconfig"; path = "../TUSKit-iOS/TUSKit-iOS.xcconfig"; sourceTree = ""; }; - 6385B255CF89AC8F0F330360A65F3D82 /* Assembly.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Assembly.m; sourceTree = ""; }; 639F8B1096A2D129845C89411E2CE63B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; 641103A6694F2C748BD4628C4C9E55CC /* NSString+Utils.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSString+Utils.m"; sourceTree = ""; }; 64C61EB5208C7A048730B4D6807BA6E3 /* TUSKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSKit.h; path = Pod/Classes/TUSKit.h; sourceTree = ""; }; - 67160313DC3C2733A8A87C55F75DF582 /* Step.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Step.h; sourceTree = ""; }; - 6A5E4C44F8AD10F3476C25B0EE6A3460 /* TUSKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TUSKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 6E6E83E2C5E8F9355605FACF37D4E871 /* APIState.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = APIState.h; sourceTree = ""; }; - 70D29EAC87B1EDF7B08EB34462D3C229 /* TUSKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TUSKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 65357793EA1CA2DF90FF060BE8AEEB80 /* Assembly.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Assembly.m; sourceTree = ""; }; + 6A5E4C44F8AD10F3476C25B0EE6A3460 /* TUSKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = TUSKit.framework; path = "TUSKit-OSX.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 70D29EAC87B1EDF7B08EB34462D3C229 /* TUSKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = TUSKit.framework; path = "TUSKit-iOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 73C08737FB64F40E7F1F5C1EA3CF8B55 /* Pods-Transloadit_Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Transloadit_Tests-acknowledgements.plist"; sourceTree = ""; }; - 75AAFDFF8B38324254B56DB07A7BD080 /* URLConstants.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = URLConstants.h; sourceTree = ""; }; - 7659300E2CF8BFFF50FD93B953D50A49 /* TUSKit-iOS.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; name = "TUSKit-iOS.modulemap"; path = "../TUSKit-iOS/TUSKit-iOS.modulemap"; sourceTree = ""; }; + 7659300E2CF8BFFF50FD93B953D50A49 /* TUSKit-iOS.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; name = "TUSKit-iOS.modulemap"; path = "../TUSKit-iOS/TUSKit-iOS.modulemap"; sourceTree = ""; }; 785963EC959968B9A7FDB1598E23A24B /* UIImage+Snapshot.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+Snapshot.h"; path = "FBSnapshotTestCase/Categories/UIImage+Snapshot.h"; sourceTree = ""; }; 7888087589FF08134B36FE52AEF3DABA /* TUSKit-iOS-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "TUSKit-iOS-prefix.pch"; path = "../TUSKit-iOS/TUSKit-iOS-prefix.pch"; sourceTree = ""; }; 78E6F0311FD58CD1D0C5776216E648A2 /* TransloaditProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TransloaditProtocol.h; sourceTree = ""; }; 7CE4324720FD25325F8EF1E9D449483C /* Pods-Transloadit_MacOS_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Transloadit_MacOS_Example-acknowledgements.markdown"; sourceTree = ""; }; 7E13CD9614F418F137D7AC527E5EB3CF /* Pods-Transloadit_MacOS_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Transloadit_MacOS_Example-umbrella.h"; sourceTree = ""; }; 7F0E5FDD9C38D931D5EE75FB49B13856 /* FBSnapshotTestCasePlatform.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSnapshotTestCasePlatform.h; path = FBSnapshotTestCase/FBSnapshotTestCasePlatform.h; sourceTree = ""; }; - 809B0393A35825AED1F983499EB30D45 /* Assembly.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Assembly.h; sourceTree = ""; }; - 845CA98F5A1DFE6CEB82B3F3956E6F7D /* Pods_Transloadit_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Transloadit_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 845CA98F5A1DFE6CEB82B3F3956E6F7D /* Pods_Transloadit_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Transloadit_Example.framework; path = "Pods-Transloadit_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 8B12319E96A75A526A1076DA55C6181B /* FBSnapshotTestCase-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "FBSnapshotTestCase-dummy.m"; sourceTree = ""; }; 8C29101BC282ADF2BDA2386FCDF59063 /* Pods-Transloadit_Tests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Transloadit_Tests-umbrella.h"; sourceTree = ""; }; 8E89959A9DA8F12FB6F875D4CD45F218 /* Pods-Transloadit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Transloadit_Tests.debug.xcconfig"; sourceTree = ""; }; - 8F0740B11609689BCBB783A0DBE1663E /* APIObject.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = APIObject.h; sourceTree = ""; }; 8F39BBEF992C9295368A99B1048AD1E9 /* FBSnapshotTestCase.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = FBSnapshotTestCase.xcconfig; sourceTree = ""; }; 91B5F7C68E33409F6869BB1A6FDA8544 /* TUSKit-OSX-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "TUSKit-OSX-prefix.pch"; sourceTree = ""; }; 9392AA76C69D0771F24169E8FCCC8BA0 /* TUSKit-OSX-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "TUSKit-OSX-umbrella.h"; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 94111EC7E7911D4C69BF676E996DCA9D /* module.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 94111EC7E7911D4C69BF676E996DCA9D /* module.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = module.modulemap; sourceTree = ""; }; 96ADAF4A2E4CDCE608D44E3FBDCA79B5 /* Pods-Transloadit_Tests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Transloadit_Tests-frameworks.sh"; sourceTree = ""; }; + 9A7C0A0313AC65253E88F032137DEDF8 /* Assembly.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Assembly.h; sourceTree = ""; }; 9B4C6CDFD54DD9064A9BDF54800FBA31 /* Pods-Transloadit_Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Transloadit_Tests-dummy.m"; sourceTree = ""; }; 9B8BAF8B28A600CE093D3268501D55EC /* Pods-Transloadit_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Transloadit_Example-resources.sh"; sourceTree = ""; }; 9B8CE62194C0F9BB1E9AD666EEA874F0 /* TUSResumableUpload.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSResumableUpload.h; path = Pod/Classes/TUSResumableUpload.h; sourceTree = ""; }; 9D8B13A803D995B9A5F28C41B71BFFF1 /* TUSResumableUpload.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TUSResumableUpload.m; path = Pod/Classes/TUSResumableUpload.m; sourceTree = ""; }; 9F7A4791EB5029AD52BC6CC82E18F08F /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A139E45C6E9304C85ED2BF527121B7B3 /* UIImage+Diff.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIImage+Diff.m"; path = "FBSnapshotTestCase/Categories/UIImage+Diff.m"; sourceTree = ""; }; + A3E46F7F711002B0C6E172E2CE899A53 /* Step.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Step.m; sourceTree = ""; }; A5296FF46D2DE2866EDC4E2EC9D40685 /* TUSKit-OSX.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "TUSKit-OSX.xcconfig"; sourceTree = ""; }; A57A6EA4EE27722711E2F16F6F950C4A /* Transloadit-iOS.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Transloadit-iOS.xcconfig"; path = "../Transloadit-iOS/Transloadit-iOS.xcconfig"; sourceTree = ""; }; A58307CDAA9BA7EB2AB1596013BFDF1D /* TUSFileData.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSFileData.h; path = Pod/Classes/TUSFileData.h; sourceTree = ""; }; - A8EA65B0EA3C80BABBC677584861D2C3 /* Pods_Transloadit_MacOS_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Transloadit_MacOS_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + A8EA65B0EA3C80BABBC677584861D2C3 /* Pods_Transloadit_MacOS_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Transloadit_MacOS_Example.framework; path = "Pods-Transloadit_MacOS_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; B12225C4FC028CC53D321CC9CCD71B9F /* TUSErrors.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TUSErrors.m; path = Pod/Classes/TUSErrors.m; sourceTree = ""; }; B2F4F42C86C33493E5D90481953E5A22 /* SwiftSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SwiftSupport.swift; path = FBSnapshotTestCase/SwiftSupport.swift; sourceTree = ""; }; B63B7B1B243D038665BFB1C81A974F58 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; @@ -276,10 +274,13 @@ BCFEA4608FCC647BE2BF201BF5F3CBDA /* TUSUploadStore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TUSUploadStore.m; path = Pod/Classes/TUSUploadStore.m; sourceTree = ""; }; BEBFB7A31BEFD072C255D9A766A6C47A /* Transloadit-iOS-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "Transloadit-iOS-dummy.m"; path = "../Transloadit-iOS/Transloadit-iOS-dummy.m"; sourceTree = ""; }; BF4D3177289CA81B3DB14566315F8404 /* Pods-Transloadit_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Transloadit_Example-acknowledgements.markdown"; sourceTree = ""; }; - C392860B6310A54619B46B9CA7E13275 /* Pods-Transloadit_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-Transloadit_Tests.modulemap"; sourceTree = ""; }; + C392860B6310A54619B46B9CA7E13275 /* Pods-Transloadit_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-Transloadit_Tests.modulemap"; sourceTree = ""; }; C893844BEAB562428E4BCA5C99DDB656 /* Transloadit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Transloadit.h; sourceTree = ""; }; - CF1DB861A04DB903C0995D009059A5A7 /* Transloadit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Transloadit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D2DEB7500AAA0629620F0875171FDB7C /* Pods_Transloadit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Transloadit_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CA2A0ACAB62E6B60C471FBA47827334B /* APIObject.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = APIObject.h; sourceTree = ""; }; + CDE5225462175C8E5B94FD38A7D8B0CF /* APIObjectType.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = APIObjectType.h; sourceTree = ""; }; + CF1DB861A04DB903C0995D009059A5A7 /* Transloadit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Transloadit.framework; path = "Transloadit-iOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + D2DEB7500AAA0629620F0875171FDB7C /* Pods_Transloadit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Transloadit_Tests.framework; path = "Pods-Transloadit_Tests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + D9DD1543360674E64B74078F7247E072 /* Template.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Template.m; sourceTree = ""; }; DA3E19A63D24B1B29ACEF61FF3C260FC /* UIImage+Compare.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+Compare.h"; path = "FBSnapshotTestCase/Categories/UIImage+Compare.h"; sourceTree = ""; }; DA57027E6446B593C1943DDC3DB85E0E /* Transloadit-OSX-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Transloadit-OSX-umbrella.h"; sourceTree = ""; }; DB74D73FB1341B3F6A18A890FD7149E7 /* TUSUploadStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSUploadStore.h; path = Pod/Classes/TUSUploadStore.h; sourceTree = ""; }; @@ -291,19 +292,18 @@ E11E4615570BB2FA8858F56DB8CE68A7 /* TUSSession.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSSession.h; path = Pod/Classes/TUSSession.h; sourceTree = ""; }; E3191106A4E2D73BA76EAA7D01FAA9C2 /* Pods-Transloadit_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Transloadit_Tests-acknowledgements.markdown"; sourceTree = ""; }; E328DE88BB4B2E54F86EBF9B320CBE72 /* Pods-Transloadit_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Transloadit_Example-frameworks.sh"; sourceTree = ""; }; - E5639F44E6D6379F0264D84E7D74E050 /* Pods-Transloadit_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-Transloadit_Example.modulemap"; sourceTree = ""; }; - E5FB2B4B64F89194F5F24358378AD6BA /* TUSKit-OSX.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "TUSKit-OSX.modulemap"; sourceTree = ""; }; + E5639F44E6D6379F0264D84E7D74E050 /* Pods-Transloadit_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-Transloadit_Example.modulemap"; sourceTree = ""; }; + E5FB2B4B64F89194F5F24358378AD6BA /* TUSKit-OSX.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "TUSKit-OSX.modulemap"; sourceTree = ""; }; E629EE8851C8F2CFC8635BB66CCAF853 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E819785D9D0E697EE348D14569AE8A41 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E853726DB07D122F794CF73A78E5C240 /* TUSFileData.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TUSFileData.m; path = Pod/Classes/TUSFileData.m; sourceTree = ""; }; - E8FDA705B40DF3AFD725610956295599 /* Pods-Transloadit_MacOS_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-Transloadit_MacOS_Example.modulemap"; sourceTree = ""; }; + E8FDA705B40DF3AFD725610956295599 /* Pods-Transloadit_MacOS_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-Transloadit_MacOS_Example.modulemap"; sourceTree = ""; }; EC211E0DC71A6918B24EA8ABF33B19A0 /* UIImage+Diff.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+Diff.h"; path = "FBSnapshotTestCase/Categories/UIImage+Diff.h"; sourceTree = ""; }; EC5C4AF4DDE967BBDC702260186424C8 /* Pods-Transloadit_MacOS_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Transloadit_MacOS_Example-frameworks.sh"; sourceTree = ""; }; EF2DCE54DF34D8D28AB6AFE56C2A4DA7 /* FBSnapshotTestCase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSnapshotTestCase.h; path = FBSnapshotTestCase/FBSnapshotTestCase.h; sourceTree = ""; }; F06D9A601599782F749BC62F449D063F /* FBSnapshotTestCase-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "FBSnapshotTestCase-umbrella.h"; sourceTree = ""; }; F139C2D1A7EFAFAAE4240328734770E0 /* Pods-Transloadit_MacOS_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Transloadit_MacOS_Example-acknowledgements.plist"; sourceTree = ""; }; F5F43A0014E8927902B5563312E4E731 /* TUSData.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TUSData.m; path = Pod/Classes/TUSData.m; sourceTree = ""; }; - F70F87EB77A96596759C2FE63B005D46 /* Template.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Template.h; sourceTree = ""; }; F94190AFDFCA59CBBC8C5FC3ED8FDBA0 /* FBSnapshotTestController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSnapshotTestController.h; path = FBSnapshotTestCase/FBSnapshotTestController.h; sourceTree = ""; }; F9A965022EE9BFDD4BD0C8AD7284F658 /* Pods-Transloadit_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Transloadit_Example-umbrella.h"; sourceTree = ""; }; FA1DC713D76FC685FC495869891E3B5A /* Pods-Transloadit_MacOS_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Transloadit_MacOS_Example.release.xcconfig"; sourceTree = ""; }; @@ -417,6 +417,7 @@ BCFEA4608FCC647BE2BF201BF5F3CBDA /* TUSUploadStore.m */, A7AC4AED161B16C3C78100E3CAD8E186 /* Support Files */, ); + name = TUSKit; path = TUSKit; sourceTree = ""; }; @@ -441,28 +442,15 @@ name = iOS; sourceTree = ""; }; - 1D92DAF6A53627E6210B79E15FADF9AB /* API */ = { + 3341A277D031BF434510C06BCC3C0060 /* Resources */ = { isa = PBXGroup; children = ( - 8F0740B11609689BCBB783A0DBE1663E /* APIObject.h */, - 324B60D023946493AC940B1964953B58 /* APIObjectType.h */, - 6E6E83E2C5E8F9355605FACF37D4E871 /* APIState.h */, - 809B0393A35825AED1F983499EB30D45 /* Assembly.h */, - 6385B255CF89AC8F0F330360A65F3D82 /* Assembly.m */, - 67160313DC3C2733A8A87C55F75DF582 /* Step.h */, - 3B38BB5AC90E1AD918D7D962C391C769 /* Step.m */, - 75AAFDFF8B38324254B56DB07A7BD080 /* URLConstants.h */, + 107906BF7E62142DBDD9BCBD4F0A56E1 /* Resources.h */, + B99E6614413B06EBA407D28EB80EC1A2 /* API */, + 7D25BD62B9333CCBC6BFD22145B9065C /* Template */, ); - path = API; - sourceTree = ""; - }; - 3CBBE149745AD335D3D965BB814168CB /* Template */ = { - isa = PBXGroup; - children = ( - F70F87EB77A96596759C2FE63B005D46 /* Template.h */, - 3AA32FD0ADEA7B205B1CABD883F0709F /* Template.m */, - ); - path = Template; + name = Resources; + path = Resources; sourceTree = ""; }; 62B7A89A5A40095FCEF3D643A2489893 /* Pods-Transloadit_Tests */ = { @@ -497,6 +485,16 @@ path = "../Target Support Files/FBSnapshotTestCase"; sourceTree = ""; }; + 7D25BD62B9333CCBC6BFD22145B9065C /* Template */ = { + isa = PBXGroup; + children = ( + 43EE70B1F11C23A58993CD38528869F2 /* Template.h */, + D9DD1543360674E64B74078F7247E072 /* Template.m */, + ); + name = Template; + path = Template; + sourceTree = ""; + }; 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( @@ -509,16 +507,6 @@ ); sourceTree = ""; }; - 8A2131330031A745820248246622851B /* Resources */ = { - isa = PBXGroup; - children = ( - 3C3EB913F127F9CE797E8E30AAA42454 /* Resources.h */, - 1D92DAF6A53627E6210B79E15FADF9AB /* API */, - 3CBBE149745AD335D3D965BB814168CB /* Template */, - ); - path = Resources; - sourceTree = ""; - }; 8D7379DF33B351B9997481906FDAC08F /* SwiftSupport */ = { isa = PBXGroup; children = ( @@ -570,6 +558,22 @@ name = Products; sourceTree = ""; }; + B99E6614413B06EBA407D28EB80EC1A2 /* API */ = { + isa = PBXGroup; + children = ( + CA2A0ACAB62E6B60C471FBA47827334B /* APIObject.h */, + CDE5225462175C8E5B94FD38A7D8B0CF /* APIObjectType.h */, + 4DD2D0A469A28C735F01A06659FE558B /* APIState.h */, + 9A7C0A0313AC65253E88F032137DEDF8 /* Assembly.h */, + 65357793EA1CA2DF90FF060BE8AEEB80 /* Assembly.m */, + 3126501412E1B42BE7A09A0DA363A1CB /* Step.h */, + A3E46F7F711002B0C6E172E2CE899A53 /* Step.m */, + 4ED7369C1943E3386F9BEA3056AD8425 /* URLConstants.h */, + ); + name = API; + path = API; + sourceTree = ""; + }; BCB610AA01415619E8302411DC8C99A9 /* Pods-Transloadit_MacOS_Example */ = { isa = PBXGroup; children = ( @@ -593,6 +597,7 @@ children = ( F1B083AC8762BC0B0B6811E475C4FE02 /* Classes */, ); + name = Transloadit; path = Transloadit; sourceTree = ""; }; @@ -677,8 +682,9 @@ 10328483641E558DD80D1364A020119A /* TransloaditRequest.h */, 01C7DD164A8495EF521801F3F383357E /* TransloaditRequest.m */, F56C686170B211B3C92140F1EC09D4C3 /* CCommonCrypto */, - 8A2131330031A745820248246622851B /* Resources */, + 3341A277D031BF434510C06BCC3C0060 /* Resources */, ); + name = Classes; path = Classes; sourceTree = ""; }; @@ -687,6 +693,7 @@ children = ( 94111EC7E7911D4C69BF676E996DCA9D /* module.modulemap */, ); + name = CCommonCrypto; path = CCommonCrypto; sourceTree = ""; }; @@ -697,6 +704,7 @@ 7BAE57334870A1002AC1A4A2AACC3AE6 /* Support Files */, 8D7379DF33B351B9997481906FDAC08F /* SwiftSupport */, ); + name = FBSnapshotTestCase; path = FBSnapshotTestCase; sourceTree = ""; }; @@ -721,23 +729,23 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 368646C082CF3CFEFFF285FA2391B3F6 /* Headers */ = { + 366702817A8BFDE85099D3024F9DF047 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 1A86C89F46942EDD9602FB3F9AAB9F4C /* APIObject.h in Headers */, - 0B42057E416459710E83F058C0A361ED /* APIObjectType.h in Headers */, - 565251123345FF4CDC20FE80432F6E66 /* APIState.h in Headers */, - 72C98093D27517803BCBFBB366B838E2 /* Assembly.h in Headers */, - 6B639D051D45152354118D0151B7806C /* NSString+Utils.h in Headers */, - 008FA2FEC8070F9246CE310D287267C8 /* Resources.h in Headers */, - 8E6D1D1F4AB7268F11246FE1973C4529 /* Step.h in Headers */, - FF87EBE530B93CCA81DC16612EF9431B /* Template.h in Headers */, - 9C20C39297D56B0FD4BDF7EF710FA10C /* Transloadit-iOS-umbrella.h in Headers */, - 4630E13130ADF426EAB1B2FE051B84F2 /* Transloadit.h in Headers */, - 826221BED2D5310627DAFEFB993E3E79 /* TransloaditProtocol.h in Headers */, - B2E0953DE9DE5DF6BC92494283AC281B /* TransloaditRequest.h in Headers */, - 86BD36E031389C18EE30D7167A51BA33 /* URLConstants.h in Headers */, + 52CAE0AE3C20F53840119186A3D3185E /* APIObject.h in Headers */, + 7C062552FCAE3F8781FF51784990294B /* APIObjectType.h in Headers */, + 0ED7F69A2963ACB97735B483BAED732D /* APIState.h in Headers */, + 38A17501809F2A63075AAC4D569C507D /* Assembly.h in Headers */, + DA1ADBCC9EACFED739C2D204FF8887E8 /* NSString+Utils.h in Headers */, + 438BBAF59B6EE87FAF07947679882C3A /* Resources.h in Headers */, + 975EC2738CA7A00C5599DD7FC7B3D209 /* Step.h in Headers */, + 142BBEF784D9C7E1075B3EB6E0EB020F /* Template.h in Headers */, + 13D274611148703CA03309BAA267470C /* Transloadit-OSX-umbrella.h in Headers */, + 19336EB89757D576F40875442CD5333B /* Transloadit.h in Headers */, + 3D50184F35819DF129E70E38398AC252 /* TransloaditProtocol.h in Headers */, + C026E99383AB30655CE3A6834F79F0FE /* TransloaditRequest.h in Headers */, + FEE7FCAE2EDA22E37E6A94735F0F98CA /* URLConstants.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -782,23 +790,23 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - A0366498266EA7F8B23D0332C0DD1FB4 /* Headers */ = { + B2EEBD10B13C3143576E94E8AAA58AF6 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - ACF3165B21CA5B630304B2E209E3F830 /* APIObject.h in Headers */, - 602200BD32D58DE738780C14CE3CDF18 /* APIObjectType.h in Headers */, - AC214690043C348E6E9F827D44B8480B /* APIState.h in Headers */, - 934C9E6DA8796051A0A970A53780381E /* Assembly.h in Headers */, - 20D164B5A3D0B1D5D34A8BD2195CA036 /* NSString+Utils.h in Headers */, - 997484B729063CC57D38CE36DFF9CEEA /* Resources.h in Headers */, - F7235BBD0593F62883DBC7862AC924A1 /* Step.h in Headers */, - BC241BCD36F3F080B0AFEC5221E1BA18 /* Template.h in Headers */, - D04EBD4871E3E2BDB0EFBBEB31AAE6F7 /* Transloadit-OSX-umbrella.h in Headers */, - FF0A6C1D7EB68A2518704FC2EACFC30A /* Transloadit.h in Headers */, - 8A3623B6DD6DA805A06F9CBE8B3DEC3E /* TransloaditProtocol.h in Headers */, - 3A5B82824D552A48219E910930F6D422 /* TransloaditRequest.h in Headers */, - B26DDD3B504605C09D2A17D9A49D3702 /* URLConstants.h in Headers */, + E3FAA1C311438B5F42CF6A28E227E122 /* APIObject.h in Headers */, + 885524AB5E195C4B54395FC81842A17C /* APIObjectType.h in Headers */, + 7E9DB2281C880334F9DCA89C8AC5FBC1 /* APIState.h in Headers */, + E700C189A8A5F1A84A6FE91EBB0E242B /* Assembly.h in Headers */, + 866D9E867DEFC09120EC3D4DB1A6974E /* NSString+Utils.h in Headers */, + 649DC1D217E3D50AECA21473D1084601 /* Resources.h in Headers */, + 4FD8441DA9FBFDD8BA50D33447FF0992 /* Step.h in Headers */, + 0D7C7DC2D18ADEA311A281D2CDD8A237 /* Template.h in Headers */, + F7C186618B5E6411400B23E1BECA3AC1 /* Transloadit-iOS-umbrella.h in Headers */, + 5873367B662BF5038224D773A8C8ACC6 /* Transloadit.h in Headers */, + 1CB38131C4C706031EF496F86E76719D /* TransloaditProtocol.h in Headers */, + 36B50893B34B041B07807CCD3C5F9556 /* TransloaditRequest.h in Headers */, + 42E9B97439DAE29AF7C57C4CBE1FFA95 /* URLConstants.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -913,9 +921,9 @@ isa = PBXNativeTarget; buildConfigurationList = 13F310D06AFCA03A2088E9E2C278B747 /* Build configuration list for PBXNativeTarget "Transloadit-iOS" */; buildPhases = ( - 2939A0E5C033E5598766066F3EA61EE2 /* Sources */, + A13F6A528A3A39A9033DA63CBDDFCCF7 /* Sources */, 020BE7F6D1C7B970E2FB77277DF67BD5 /* Frameworks */, - 368646C082CF3CFEFFF285FA2391B3F6 /* Headers */, + B2EEBD10B13C3143576E94E8AAA58AF6 /* Headers */, ); buildRules = ( ); @@ -950,9 +958,9 @@ isa = PBXNativeTarget; buildConfigurationList = 45DD468468E4914C01BB47D0357910B1 /* Build configuration list for PBXNativeTarget "Transloadit-OSX" */; buildPhases = ( - 0F5791B4D3ED195C74F05BB1D06ED4B3 /* Sources */, + 27D2B19C3AD41BCBFC5AD02A0A468910 /* Sources */, CD5D47CCAEDB505F1E3151AB9C8F9FAE /* Frameworks */, - A0366498266EA7F8B23D0332C0DD1FB4 /* Headers */, + 366702817A8BFDE85099D3024F9DF047 /* Headers */, ); buildRules = ( ); @@ -1016,21 +1024,6 @@ /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ - 0F5791B4D3ED195C74F05BB1D06ED4B3 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 600D3BBCC12833ED249337D3FF0FD980 /* Assembly.m in Sources */, - C89D25CEC21D8D48AAD1C9FDC2AA22BC /* module.modulemap in Sources */, - D9F3B800AE9F0585A7242E34141C52F6 /* NSString+Utils.m in Sources */, - 848F8A77EABDAFA9523502B86295D3C4 /* Step.m in Sources */, - 2DA48DF74AE478740757EA7F4689260E /* Template.m in Sources */, - E153F888C16A7E677B05BCB1E5BD935D /* Transloadit-OSX-dummy.m in Sources */, - EF009B15AFA9D80C583FE2A5354F0044 /* Transloadit.m in Sources */, - 5BC7CF6B9F3CE57357849A5A05789F00 /* TransloaditRequest.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 17412D7B42AC3AE41C6F3B0BCF78B2EB /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1039,18 +1032,18 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 2939A0E5C033E5598766066F3EA61EE2 /* Sources */ = { + 27D2B19C3AD41BCBFC5AD02A0A468910 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8DFC34A468CFEA2AD67B946CA13C16A8 /* Assembly.m in Sources */, - 99B697C97733566D5987B3817A58BA27 /* module.modulemap in Sources */, - EB7C5C5C001F1157E1FFDD93DEFAD9CD /* NSString+Utils.m in Sources */, - 65E0B4E3F83705BD3B0F856092E0869A /* Step.m in Sources */, - E7EC93CB406C8B47EED0A0B6CF3871F7 /* Template.m in Sources */, - BFFA1A538875E2E2056698F79E635D9C /* Transloadit-iOS-dummy.m in Sources */, - EE6EE82484308B7C7806774D20A8C382 /* Transloadit.m in Sources */, - 75CC7A1DD3B7B9E7851AD36EFCDCBA74 /* TransloaditRequest.m in Sources */, + E3C2FCAB324CAFCC96AF74F4D2030A75 /* Assembly.m in Sources */, + 3FC98DEF3A0F16D8BC264A8FB6FD4B0F /* module.modulemap in Sources */, + 16E8B89FC3B24D09A96CE89DA2678199 /* NSString+Utils.m in Sources */, + 2F7660FE5F63B764E9D21B43437B0903 /* Step.m in Sources */, + 7AAFFD05ADFD296EB7290AF8A2D2787C /* Template.m in Sources */, + C444725CB6ACD76A37EA7B7BF58FE617 /* Transloadit-OSX-dummy.m in Sources */, + 262FF24949B232085F8B4193FD6322DB /* Transloadit.m in Sources */, + DC4DDD67871F499BC101C24EDACF44D8 /* TransloaditRequest.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1070,6 +1063,21 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + A13F6A528A3A39A9033DA63CBDDFCCF7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 36CF74310404BFC918C9545F27CFBED2 /* Assembly.m in Sources */, + 8947B3C4256FDD21173A9A79334AEFFC /* module.modulemap in Sources */, + 7665B826B9612A6E722EAF3863800CC4 /* NSString+Utils.m in Sources */, + 525DE33AAEDD2681F03A576B48F47A54 /* Step.m in Sources */, + 1AAE76041D96EF646A2CB01A18A078AB /* Template.m in Sources */, + 165A467C8EBC202C55A0268658EF673D /* Transloadit-iOS-dummy.m in Sources */, + 25D1A9B87F1A3FB421AEEA62CA2345DF /* Transloadit.m in Sources */, + EB686AC6DEBE791512390A653AAFEC77 /* TransloaditRequest.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; AB945A8183B65DB3F4A374991F77DF2E /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; diff --git a/Example/Pods/Target Support Files/Transloadit-OSX/Info.plist b/Example/Pods/Target Support Files/Transloadit-OSX/Info.plist index 3c175b6..10ad18b 100644 --- a/Example/Pods/Target Support Files/Transloadit-OSX/Info.plist +++ b/Example/Pods/Target Support Files/Transloadit-OSX/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.1 + 1.0.3 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/Transloadit-iOS/Info.plist b/Example/Pods/Target Support Files/Transloadit-iOS/Info.plist index 3c175b6..10ad18b 100644 --- a/Example/Pods/Target Support Files/Transloadit-iOS/Info.plist +++ b/Example/Pods/Target Support Files/Transloadit-iOS/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.1 + 1.0.3 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Transloadit/Images.xcassets/Contents.json b/Example/Transloadit/Images.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/Example/Transloadit/Images.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Example/Transloadit/Images.xcassets/transloadit.imageset/Contents.json b/Example/Transloadit/Images.xcassets/transloadit.imageset/Contents.json new file mode 100644 index 0000000..54a20ed --- /dev/null +++ b/Example/Transloadit/Images.xcassets/transloadit.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "transloadit.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Example/Transloadit/Images.xcassets/transloadit.imageset/transloadit.png b/Example/Transloadit/Images.xcassets/transloadit.imageset/transloadit.png new file mode 100644 index 0000000000000000000000000000000000000000..dca2d2158a3568ac5bfef681a966045e6ae95e3a GIT binary patch literal 10134 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 literal 0 HcmV?d00001 diff --git a/Example/Transloadit/Main.storyboard b/Example/Transloadit/Main.storyboard index 9b8d6de..92ccbab 100644 --- a/Example/Transloadit/Main.storyboard +++ b/Example/Transloadit/Main.storyboard @@ -20,12 +20,22 @@ + + + - + diff --git a/Example/Transloadit/TransloaditViewController.m b/Example/Transloadit/TransloaditViewController.m index a6d7762..e9b5ad9 100644 --- a/Example/Transloadit/TransloaditViewController.m +++ b/Example/Transloadit/TransloaditViewController.m @@ -31,158 +31,70 @@ @interface TransloaditViewController () NSLog(@"error: %@", error); }; -//static TransloaditAssemblyStatusBlock statusBlock = ^(NSDictionary* dict){ -// // Handle the error -// NSLog(@"Dictionary: %@", [dict description]); -//}; -// -//static TransloaditAssemblyCompletionBlock completionBlock = ^(NSDictionary* dict){ -// // Handle the error -// NSLog(@"Dictionary: %@", [dict description]); -//}; @implementation TransloaditViewController Transloadit *transloadit; - +Assembly *testAssembly; - (void)viewDidLoad { [super viewDidLoad]; transloadit = [[Transloadit alloc] init]; transloadit.failureBlock = failureBlock; -} - --(void)viewDidAppear:(BOOL)animated { - [self selectFile:nil]; + transloadit.progressBlock = progressBlock; + transloadit.resultBlock = resultBlock; -} - -- (IBAction)selectFile:(id)sender { - //MARK: Image Picker - //Basic UIImagePicker Controller Setup - UIImagePickerController *imagePicker = [UIImagePickerController new]; - imagePicker.mediaTypes = [UIImagePickerController availableMediaTypesForSourceType:imagePicker.sourceType]; - imagePicker.delegate = self; + NSString *path = [[NSBundle mainBundle] pathForResource:@"test" ofType:@"jpg"]; + + + NSData *img = [NSData dataWithContentsOfFile:path]; + + NSMutableArray *steps = [[NSMutableArray alloc] init]; + + Step *step1 = [[Step alloc] initWithKey:@"encode"]; + [step1 setValue:@"75" forOption:@"width"]; + [step1 setValue:@"75" forOption:@"height"]; + [step1 setValue:@"/image/resize" forOption:@"robot"]; + + // + // // Add the step to the array + [steps addObject:step1]; + + testAssembly = [[Assembly alloc] initWithSteps:steps andNumberOfFiles:1]; + + + //MARK: We then create an Assembly Object with the steps and files + [testAssembly addFile:[NSURL fileURLWithPath:path] andFileName:@"file.jpg"]; - PHAuthorizationStatus status = [PHPhotoLibrary authorizationStatus]; - if(status == PHAuthorizationStatusNotDetermined) { - [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) { - [self presentViewController:imagePicker animated:YES completion:nil]; - }]; - } else if (status == PHAuthorizationStatusAuthorized) { - [self presentViewController:imagePicker animated:YES completion:nil]; - } else if (status == PHAuthorizationStatusRestricted) { - //Permisions Needed - } else if (status == PHAuthorizationStatusDenied) { - // Permisions Needed - } -} -- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { - //----------------------------------------------------- - // MARK: Picker - //----------------------------------------------------- - // !! NOTE !! - // This is boilerplate imagepicker code. You do NOT need this for Transloadit. - // This is strictly for the Example, and grabbing an image. - [self dismissViewControllerAnimated:YES completion:nil]; - NSURL *assetUrl = [info valueForKey:UIImagePickerControllerReferenceURL]; - PHFetchResult *result = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeSmartAlbum - subtype:PHAssetCollectionSubtypeSmartAlbumUserLibrary - options:nil]; - PHAssetCollection *assetCollection = result.firstObject; - NSLog(@"%@", assetCollection.localizedTitle); - NSArray *array = [[NSArray alloc] initWithObjects:assetUrl, nil]; - PHFetchResult *fetchResult = [PHAsset fetchAssetsWithALAssetURLs:array options:nil]; - PHAsset *asset = [fetchResult firstObject]; - [[[PHImageManager alloc] init] requestImageDataForAsset:asset options:nil resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, UIImageOrientation orientation, NSDictionary * _Nullable info) { - - NSURL *documentDirectory = [[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSAllDomainsMask][0]; - NSURL *fileUrl = [documentDirectory URLByAppendingPathComponent:[[NSUUID alloc] init].UUIDString]; - NSError *error; - if (![imageData writeToURL:fileUrl options:NSDataWritingAtomic error:&error]) { - NSLog(@"%li", (long)error.code); - } - - NSLog([fileUrl description]); - - //MARK: Transloadit Kit Implementation - - //MARK: Assembly Steps - //Here we create an array to hold each Step that we our files to process through on Transloadit - NSMutableArray *steps = [[NSMutableArray alloc] init]; - - Step *step1 = [[Step alloc] initWithKey:@"encode"]; - [step1 setValue:@"75" forOption:@"width"]; - [step1 setValue:@"75" forOption:@"height"]; - [step1 setValue:@"/image/resize" forOption:@"robot"]; + transloadit.assemblyCreationResultBlock = ^(Assembly* assembly, NSDictionary* completionDictionary){ + NSLog(@"Assembly creation success"); + NSLog(@"%@", @"Invoking assembly."); + [transloadit invokeAssembly:assembly]; + }; + + transloadit.assemblyCreationFailureBlock = ^(NSDictionary* completionDictionary){ + NSLog(@"Assembly creation failed: %@", [completionDictionary debugDescription]); + }; -// -// // Add the step to the array - [steps addObject:step1]; - - //MARK: We then create an Assembly Object with the steps and files - //Assembly *TestAssemblyWithSteps = [[Assembly alloc] initWithSteps:steps andNumberOfFiles:3]; -// [TestAssemblyWithSteps addFile:fileUrl]; -// [TestAssemblyWithSteps setNotify_url:@""]; - - Template *testTemplate = [[Template alloc] initWithTemplateId:@"854f71504eea11e8b947315f16ae1faa"]; -// Template *testTemplateWithSteps = [[Template alloc] initWithSteps:steps andName:@"TestName4"]; - - Assembly *testAssemblyWithTemplate = [[Assembly alloc] initWithTemplate:testTemplate andNumberOfFiles:1]; -// [testAssemblyWithTemplate addFile:fileUrl]; -// - //[transloadit createTemplate:testTemplateWithSteps]; - //[transloadit invokeAssembly:testAssemblyWithTemplate]; - //MARK: Create the assembly on Transloadit - [testAssemblyWithTemplate addFile:fileUrl]; - [transloadit createAssembly:testAssemblyWithTemplate]; - - -// transloadit.assemblyStatusBlock = ^(NSDictionary* completionDictionary){ -// NSLog(@"%@", [completionDictionary description]); -// -// }; - - transloadit.assemblyCreationFailureBlock = ^(NSDictionary* failureDictionary) { - NSLog(@"%@", [failureDictionary description]); - }; - - - transloadit.assemblyCreationCompletionBlock = ^(Assembly* assembly) { - /*Invoking The Assebmly does NOT need to happen inside the completion block. However for sake of the example it is. - We do however need to use the assebmly that is returned for future functions - */ - NSLog(@"%@", [assembly urlString]); - [transloadit invokeAssembly:assembly]; - //[transloadit checkAssembly:assembly]; - NSLog(@"%@", @"Finished!"); - - }; - - //MARK: Invoke the assebmly - transloadit.assemblyCompletionBlock = ^(NSDictionary* completionDictionary){ - /*Invoking The Assebmly does NOT need to happen inside the completion block. However for sake of a small UI it is. - We do however need to add the URL to the Assembly object so that we do invoke it, it knows where to go. - */ - ///[TestAssemblyWithSteps setUrlString:[completionDictionary valueForKey:@"assembly_ssl_url"]]; - // [transloadit invokeAssembly:TestAssemblyWithSteps]; - - //[transloadit checkAssembly:TestAssemblyWithSteps]; - NSLog(@"%@", [completionDictionary description]); - NSLog(@"%@", @"Finished!"); - - }; - - transloadit.assemblyStatusBlock = ^(NSDictionary* completionDictionary){ - NSLog(@"%@", [completionDictionary description]); - }; - - }]; -} + transloadit.assemblyStatusBlock = ^(NSDictionary* completionDictionary){ + NSLog(@"Assembly status: %@", [completionDictionary debugDescription]); + }; + + transloadit.assemblyResultBlock = ^(NSDictionary* completionDictionary){ + NSLog(@"Assembly finished : %@", [completionDictionary debugDescription]); + }; + + transloadit.assemblyFailureBlock = ^(NSDictionary* completionDictionary){ + NSLog(@"Assembly failed: %@", [completionDictionary debugDescription]); + }; +} +- (IBAction)upload:(id)sender { + [transloadit createAssembly:testAssembly]; +} - (void)didReceiveMemoryWarning { diff --git a/Example/Transloadit/TransloaditViewController.swift b/Example/Transloadit/TransloaditViewController.swift index 35d55f4..ba52808 100644 --- a/Example/Transloadit/TransloaditViewController.swift +++ b/Example/Transloadit/TransloaditViewController.swift @@ -58,47 +58,7 @@ class TransloaditViewController: UIViewController, UIPickerViewDelegate, UINavig break } } - - @objc func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) { - //----------------------------------------------------- - // MARK: Picker - //----------------------------------------------------- - // !! NOTE !! - // This is boilerplate imagepicker code. You do NOT need this for Transloadit. - // This is strictly for the Example, and grabbing an image. - - self.dismiss(animated: true, completion: nil); - let assetURL: URL = info[UIImagePickerControllerReferenceURL] as! URL - let result: PHFetchResult = PHAssetCollection.fetchAssetCollections(with: .smartAlbum, subtype: .smartAlbumUserLibrary, options: nil) - var assetCollection: PHAssetCollection = result.firstObject! - let fetchResult: PHFetchResult = PHAsset.fetchAssets(withALAssetURLs: [assetURL], options: nil) - let asset: PHAsset = fetchResult.firstObject! - let photoManager: PHImageManager = PHImageManager() - photoManager.requestImageData(for: asset, options: nil) { (imageData, dataUTI, orientation, info) in - let documentDir: URL = FileManager.default.urls(for: FileManager.SearchPathDirectory.documentDirectory, in: FileManager.SearchPathDomainMask.allDomainsMask)[0] - let fileURL: URL = documentDir.appendingPathComponent(UUID.init().uuidString) - - if ((try! imageData?.write(to: fileURL)) != nil) { - //----------------------------------------------------- - // MARK: Creating an Assembly - //----------------------------------------------------- - self.TestAssembly?.addFile(fileURL) - self.transloadit.createAssembly(self.TestAssembly!) - - //----------------------------------------------------- - // MARK: Blocks - //----------------------------------------------------- - self.transloadit.assemblyCompletionBlock = {(_ completionDictionary: [AnyHashable: Any]) -> Void in - /*Invoking The Assebmly does NOT need to happen inside the completion block. However for sake of a small UI it is. - We do however need to add the URL to the Assembly object so that we do invoke it, it knows where to go. - */ - self.TestAssembly?.urlString = completionDictionary["assembly_ssl_url"] as! String - self.transloadit.invokeAssembly(self.TestAssembly!) - self.transloadit.check(self.TestAssembly!) - } - } - } - } + override func didReceiveMemoryWarning() { super.didReceiveMemoryWarning() diff --git a/Example/Transloadit_Example/test.jpg b/Example/Transloadit_Example/test.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5cbac186826cd2e4414f43fb55c679df530c66ec GIT binary patch literal 4767 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 literal 0 HcmV?d00001 diff --git a/Transloadit/Classes/Resources/API/Assembly.h b/Transloadit/Classes/Resources/API/Assembly.h index ad23b86..cca0116 100644 --- a/Transloadit/Classes/Resources/API/Assembly.h +++ b/Transloadit/Classes/Resources/API/Assembly.h @@ -19,6 +19,8 @@ @property (nonatomic, strong)NSMutableArray* stepsArray; @property (nonatomic, strong)NSMutableArray* files; +@property (nonatomic, strong)NSMutableArray* fileNames; + @property (nonatomic, strong)NSString* stepsJSONString; @@ -43,7 +45,7 @@ -(void)setExpirationWithMinutes:(int)minutes; //MARK: Files -- (void)addFile:(NSURL* )file; +- (void)addFile:(NSURL* )file andFileName:(NSString* ) fileName; -(int)fileCount; diff --git a/Transloadit/Classes/Resources/API/Assembly.m b/Transloadit/Classes/Resources/API/Assembly.m index fa5942a..f9945ac 100644 --- a/Transloadit/Classes/Resources/API/Assembly.m +++ b/Transloadit/Classes/Resources/API/Assembly.m @@ -22,6 +22,8 @@ - (id)initWithSteps:(NSMutableArray*)steps andNumberOfFiles:(int)numberO [self setStepsArray:steps]; [self setNumberOfFiles:&numberOfFiles]; [self setFiles:[[NSMutableArray alloc] initWithCapacity:numberOfFiles]]; + [self setFileNames:[[NSMutableArray alloc] initWithCapacity:numberOfFiles]]; + } return self; } @@ -32,7 +34,7 @@ - (id)initWithTemplate:(Template *)template andNumberOfFiles:(int)numberOfFiles NSLog(@"_init: %@", self); [self setTemplate:template]; [self setNumberOfFiles:&numberOfFiles]; - [self setFiles:[[NSMutableArray alloc] initWithCapacity:numberOfFiles]]; + [self setFileNames:[[NSMutableArray alloc] initWithCapacity:numberOfFiles]]; } return self; } @@ -66,9 +68,10 @@ -(NSMutableDictionary *)getSteps{ } --(void) addFile:(NSURL *)file{ +-(void) addFile:(NSURL* )file andFileName:(NSString* ) fileName{ if([self files]) { - [[self files] addObject:file]; + [[self fileNames] addObject:fileName]; + [[self files] addObject:file]; } } diff --git a/Transloadit/Classes/Transloadit.h b/Transloadit/Classes/Transloadit.h index d59ae52..2d204fc 100644 --- a/Transloadit/Classes/Transloadit.h +++ b/Transloadit/Classes/Transloadit.h @@ -23,11 +23,12 @@ typedef void (^TransloaditUploadFailureBlock)(NSError* _Nonnull error); typedef void (^TransloaditUploadProgressBlock)(int64_t bytesWritten, int64_t bytesTotal); -typedef void (^TransloaditAssemblyCreationCompletionBlock)(Assembly* _Nonnull assembly); +typedef void (^TransloaditAssemblyCreationResultBlock)(Assembly* _Nonnull assembly, NSDictionary* _Nonnull completionDictionary); typedef void (^TransloaditAssemblyCreationFailureBlock)(NSDictionary* _Nonnull completionDictionary); -typedef void (^TransloaditAssemblyCompletionBlock)(NSDictionary* _Nonnull completionDictionary); +typedef void (^TransloaditAssemblyResultBlock)(NSDictionary* _Nonnull completionDictionary); +typedef void (^TransloaditAssemblyFailureBlock)(NSDictionary* _Nonnull completionDictionary); typedef void (^TransloaditAssemblyStatusBlock)(NSDictionary* _Nonnull completionDictionary); @@ -37,13 +38,12 @@ typedef void (^TransloaditAssemblyStatusBlock)(NSDictionary* _Nonnull completion @property (readwrite, copy) _Nullable TransloaditUploadFailureBlock failureBlock; @property (readwrite, copy) _Nullable TransloaditUploadProgressBlock progressBlock; -@property (readwrite, copy) _Nullable TransloaditAssemblyCreationCompletionBlock assemblyCreationCompletionBlock; +@property (readwrite, copy) _Nullable TransloaditAssemblyCreationResultBlock assemblyCreationResultBlock; @property (readwrite, copy) _Nullable TransloaditAssemblyCreationFailureBlock assemblyCreationFailureBlock; - -@property (readwrite, copy) _Nullable TransloaditAssemblyCompletionBlock assemblyCompletionBlock; - +@property (readwrite, copy) _Nullable TransloaditAssemblyResultBlock assemblyResultBlock; +@property (readwrite, copy) _Nullable TransloaditAssemblyFailureBlock assemblyFailureBlock; @property (readwrite, copy) _Nullable TransloaditAssemblyStatusBlock assemblyStatusBlock; @@ -52,9 +52,9 @@ typedef void (^TransloaditAssemblyStatusBlock)(NSDictionary* _Nonnull completion @property (nonatomic, strong) NSString * _Nonnull key; // Transloadit Key #pragma mark - TUSKit References -@property (nonatomic, strong) TUSSession* _Nonnull tusSession; @property (nonatomic, strong) TUSResumableUpload * _Nonnull tus; @property (nonatomic, strong) TUSUploadStore * _Nonnull tusStore; +@property (nonatomic, strong) TUSSession * _Nonnull tusSession; - (id _Nonnull )init; diff --git a/Transloadit/Classes/Transloadit.m b/Transloadit/Classes/Transloadit.m index 4e5345a..d99b148 100644 --- a/Transloadit/Classes/Transloadit.m +++ b/Transloadit/Classes/Transloadit.m @@ -22,16 +22,8 @@ - (id)init { _key = PLIST_KEY; } - NSLog(PLIST_KEY); - NSLog(PLIST_SECRET); - - - - - NSLog(@"_init: %@", self); NSURL * applicationSupportURL = [[[NSFileManager defaultManager] URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask] firstObject]; _tusStore = [[TUSFileUploadStore alloc] initWithURL:[applicationSupportURL URLByAppendingPathComponent:@"Example"]]; - _tusSession = [[TUSSession alloc] initWithEndpoint:[[NSURL alloc] initWithString:[NSString stringWithFormat:@"%@%@%@", TRANSLOADIT_API_DEFAULT_PROTOCOL, TRANSLOADIT_API_DEFAULT_BASE_URL, TRANSLOADIT_API_TUS_RESUMABLE]] dataStore:_tusStore allowsCellularAccess:YES]; _tus = [TUSResumableUpload alloc]; } @@ -73,13 +65,12 @@ - (void) createTemplate: (Template *)template { } - (void) invokeAssembly: (Assembly *)assembly{ - + [self checkAssembly:assembly]; NSArray *files = [assembly files]; for (int x = 0; x < [files count]; x++) { - NSLog(@"File!!"); - NSLog([[files objectAtIndex:x] debugDescription]); - TUSResumableUpload *upload = [_tusSession createUploadFromFile:[files objectAtIndex:x] headers:@{} metadata:@{@"filename":@"tes2t.jpg", @"fieldname":@"file-input", @"assembly_url": [assembly urlString]}]; + NSString* fileName = [[assembly fileNames] objectAtIndex:x]; + TUSResumableUpload *upload = [_tusSession createUploadFromFile:[files objectAtIndex:x] headers:@{} metadata:@{@"filename":fileName, @"fieldname":@"file-input", @"assembly_url": [assembly urlString]}]; upload.progressBlock = _progressBlock; upload.resultBlock = _resultBlock; upload.failureBlock = _failureBlock; @@ -97,11 +88,6 @@ - (void) createAssembly: (Assembly *)assembly{ } NSMutableURLRequest *request = [[[TransloaditRequest alloc] initWithKey:_key andSecret:_secret] createRequestWithParams:params andEndpoint:TRANSLOADIT_API_ASSEMBLIES]; NSURLSessionDataTask *assemblyTask = [[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) { -// if (error) { -// NSLog(@"%@", [error debugDescription]); -// return; -// } - NSString* body = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; NSDictionary *json = [NSJSONSerialization JSONObjectWithData:[body dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingMutableContainers @@ -111,13 +97,9 @@ - (void) createAssembly: (Assembly *)assembly{ self.assemblyCreationFailureBlock(json); return; } else { - NSLog(@"%@", [json valueForKey:@"assembly_id"]); - NSLog(@"%@", [json valueForKey:@"assembly_ssl_url"]); - NSLog(@"%@", [json valueForKey:@"tus_url"]); - [assembly setUrlString: [json valueForKey:@"assembly_ssl_url"]]; - _tusSession = [[TUSSession alloc] initWithEndpoint:[[NSURL alloc] initWithString:[NSString stringWithFormat:@"%@", [json valueForKey:@"tus_url"]]] dataStore:_tusStore allowsCellularAccess:YES]; - self.assemblyCreationCompletionBlock(assembly); + _tusSession = [[TUSSession alloc] initWithEndpoint:[[NSURL alloc] initWithString:[json valueForKey:@"tus_url"]] dataStore:_tusStore allowsCellularAccess:YES]; + self.assemblyCreationResultBlock(assembly, json); //return; } }]; @@ -134,17 +116,17 @@ - (void) checkAssembly: (Assembly *)assembly { case 0: //Aborted [timer invalidate]; - self.assemblyStatusBlock(response); + self.assemblyFailureBlock(response); break; case 1: //canceld [timer invalidate]; - self.assemblyStatusBlock(response); + self.assemblyFailureBlock(response); break; case 2: //completed [timer invalidate]; - self.assemblyCompletionBlock(response); + self.assemblyResultBlock(response); default: break; } @@ -158,7 +140,6 @@ - (void) checkAssembly: (Assembly *)assembly { } - (void) assemblyStatus: (Assembly *)assembly completion:(void (^)(NSDictionary *))completion { - NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; NSMutableURLRequest *request = [[[TransloaditRequest alloc] initWithKey:_key andSecret:_secret] createGetRequestWithURL:[assembly urlString]]; NSURLSessionDataTask *assemblyTask = [[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) { @@ -176,7 +157,7 @@ - (void) assemblyStatus: (Assembly *)assembly completion:(void (^)(NSDictionary NSLog(@"%@", [json valueForKey:@"error"]); return; } else { - self.assemblyStatusBlock(json); + // } completion(json); diff --git a/Transloadit/Classes/TransloaditRequest.m b/Transloadit/Classes/TransloaditRequest.m index 092c22f..cf42a50 100644 --- a/Transloadit/Classes/TransloaditRequest.m +++ b/Transloadit/Classes/TransloaditRequest.m @@ -78,6 +78,11 @@ - (NSMutableURLRequest *) createRequestWithParams:(NSMutableDictionary *) params options:0 error:nil]; [body appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]]; + [body appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"tus_num_expected_upload_files\"\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]]; + int i = 2; + NSData *intData = [NSData dataWithBytes: &i length: sizeof(i)]; + [body appendData:[@"1" dataUsingEncoding:NSUTF8StringEncoding]]; + [body appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]]; [body appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"signature\"\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]]; [body appendData:[signature dataUsingEncoding:NSUTF8StringEncoding]]; [body appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]]; From 69184b6b267e10bf7b3fabf1368a88a162e1de60 Mon Sep 17 00:00:00 2001 From: "Mark R. Masterson" Date: Sun, 6 May 2018 10:47:55 -0700 Subject: [PATCH 3/7] Swift Example, renamed blocks --- Example/Pods/Pods.xcodeproj/project.pbxproj | 44 ++++++------- Example/Transloadit.xcodeproj/project.pbxproj | 8 +-- Example/Transloadit/Main.storyboard | 4 +- .../Transloadit/TransloaditViewController.m | 11 +--- ... => TransloaditViewControllerSwifty.swift} | 61 +++++++++++-------- Transloadit/Classes/Transloadit.h | 8 +-- Transloadit/Classes/Transloadit.m | 6 +- Transloadit/Classes/TransloaditDelegate.h | 26 ++++++++ 8 files changed, 96 insertions(+), 72 deletions(-) rename Example/Transloadit/{TransloaditViewController.swift => TransloaditViewControllerSwifty.swift} (53%) create mode 100644 Transloadit/Classes/TransloaditDelegate.h diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index f0bf70d..4893edf 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -182,7 +182,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 0013FAE3A85FD3DAAD077AE66D0CD734 /* FBSnapshotTestCase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = FBSnapshotTestCase.framework; path = FBSnapshotTestCase.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0013FAE3A85FD3DAAD077AE66D0CD734 /* FBSnapshotTestCase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FBSnapshotTestCase.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 01C7DD164A8495EF521801F3F383357E /* TransloaditRequest.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = TransloaditRequest.m; sourceTree = ""; }; 04B3D6B6D871AA10749B44C5E224FA61 /* UIImage+Compare.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIImage+Compare.m"; path = "FBSnapshotTestCase/Categories/UIImage+Compare.m"; sourceTree = ""; }; 05E0D119AF737816EA99709197DDAE8E /* TUSKit-OSX-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "TUSKit-OSX-dummy.m"; sourceTree = ""; }; @@ -197,14 +197,14 @@ 2595BB609C53FE468A8DD9798F97A767 /* UIApplication+StrictKeyWindow.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIApplication+StrictKeyWindow.h"; path = "FBSnapshotTestCase/Categories/UIApplication+StrictKeyWindow.h"; sourceTree = ""; }; 272F41FF46DB7860C715BE4418025407 /* Transloadit-iOS-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "Transloadit-iOS-prefix.pch"; path = "../Transloadit-iOS/Transloadit-iOS-prefix.pch"; sourceTree = ""; }; 28DECC1DCB90B17ABAE050E841DD54A9 /* Pods-Transloadit_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Transloadit_Example.debug.xcconfig"; sourceTree = ""; }; - 2926FFE37F3DAFDC8DFC2B277908EA4A /* Transloadit-OSX.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Transloadit-OSX.modulemap"; sourceTree = ""; }; + 2926FFE37F3DAFDC8DFC2B277908EA4A /* Transloadit-OSX.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Transloadit-OSX.modulemap"; sourceTree = ""; }; 29ABE98ECE07CEFB58DBFCC702663580 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; }; 2ABE248ADE49D64C2926EB8D9760A43D /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = Info.plist; path = "../Transloadit-iOS/Info.plist"; sourceTree = ""; }; 2C1FE0C78C46434795DC3BD3A021F18A /* UIImage+Snapshot.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIImage+Snapshot.m"; path = "FBSnapshotTestCase/Categories/UIImage+Snapshot.m"; sourceTree = ""; }; 3126501412E1B42BE7A09A0DA363A1CB /* Step.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Step.h; sourceTree = ""; }; 315E608A1FED2DEC457E3A3D8075A54B /* TUSSession.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TUSSession.m; path = Pod/Classes/TUSSession.m; sourceTree = ""; }; 334ADE67273A072766C2E194466E3A34 /* Transloadit-OSX-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Transloadit-OSX-dummy.m"; sourceTree = ""; }; - 35AEF995D9C72FD9536D69D3199EC3CA /* Transloadit-iOS.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; name = "Transloadit-iOS.modulemap"; path = "../Transloadit-iOS/Transloadit-iOS.modulemap"; sourceTree = ""; }; + 35AEF995D9C72FD9536D69D3199EC3CA /* Transloadit-iOS.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; name = "Transloadit-iOS.modulemap"; path = "../Transloadit-iOS/Transloadit-iOS.modulemap"; sourceTree = ""; }; 396F7E3A9427713B423B56F5558E5B42 /* TUSErrors.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSErrors.h; path = Pod/Classes/TUSErrors.h; sourceTree = ""; }; 3D74FE8101BA300D2810DAF7A5151578 /* TUSData.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSData.h; path = Pod/Classes/TUSData.h; sourceTree = ""; }; 404EC8483288FE3615CC43833EEEA20A /* 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; }; @@ -218,8 +218,8 @@ 4ED7369C1943E3386F9BEA3056AD8425 /* URLConstants.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = URLConstants.h; sourceTree = ""; }; 4F12056A314049F6E5BED270DC78F7D6 /* TUSFileUploadStore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSFileUploadStore.h; path = Pod/Classes/TUSFileUploadStore.h; sourceTree = ""; }; 501EFCDB9CB1D337F1A1677393752E0A /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = Info.plist; path = "../TUSKit-iOS/Info.plist"; sourceTree = ""; }; - 50E4474B25615AE19AC36744F907102E /* Transloadit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Transloadit.framework; path = "Transloadit-OSX.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5269CFEEA4DF80A54EF9DCDB5900F9DA /* FBSnapshotTestCase.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = FBSnapshotTestCase.modulemap; sourceTree = ""; }; + 50E4474B25615AE19AC36744F907102E /* Transloadit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Transloadit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 5269CFEEA4DF80A54EF9DCDB5900F9DA /* FBSnapshotTestCase.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = FBSnapshotTestCase.modulemap; sourceTree = ""; }; 53F9FC626A9FDC68E860AC31E130BB3F /* TUSKit-iOS-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "TUSKit-iOS-dummy.m"; path = "../TUSKit-iOS/TUSKit-iOS-dummy.m"; sourceTree = ""; }; 548AFC10E2E235CC63739E65DE4BC742 /* Pods-Transloadit_Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Transloadit_Tests-resources.sh"; sourceTree = ""; }; 54C1E0A65F10AB4C81479E747C50025B /* FBSnapshotTestController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSnapshotTestController.m; path = FBSnapshotTestCase/FBSnapshotTestController.m; sourceTree = ""; }; @@ -233,25 +233,25 @@ 641103A6694F2C748BD4628C4C9E55CC /* NSString+Utils.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSString+Utils.m"; sourceTree = ""; }; 64C61EB5208C7A048730B4D6807BA6E3 /* TUSKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSKit.h; path = Pod/Classes/TUSKit.h; sourceTree = ""; }; 65357793EA1CA2DF90FF060BE8AEEB80 /* Assembly.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Assembly.m; sourceTree = ""; }; - 6A5E4C44F8AD10F3476C25B0EE6A3460 /* TUSKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = TUSKit.framework; path = "TUSKit-OSX.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 70D29EAC87B1EDF7B08EB34462D3C229 /* TUSKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = TUSKit.framework; path = "TUSKit-iOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6A5E4C44F8AD10F3476C25B0EE6A3460 /* TUSKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TUSKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 70D29EAC87B1EDF7B08EB34462D3C229 /* TUSKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TUSKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 73C08737FB64F40E7F1F5C1EA3CF8B55 /* Pods-Transloadit_Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Transloadit_Tests-acknowledgements.plist"; sourceTree = ""; }; - 7659300E2CF8BFFF50FD93B953D50A49 /* TUSKit-iOS.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; name = "TUSKit-iOS.modulemap"; path = "../TUSKit-iOS/TUSKit-iOS.modulemap"; sourceTree = ""; }; + 7659300E2CF8BFFF50FD93B953D50A49 /* TUSKit-iOS.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; name = "TUSKit-iOS.modulemap"; path = "../TUSKit-iOS/TUSKit-iOS.modulemap"; sourceTree = ""; }; 785963EC959968B9A7FDB1598E23A24B /* UIImage+Snapshot.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+Snapshot.h"; path = "FBSnapshotTestCase/Categories/UIImage+Snapshot.h"; sourceTree = ""; }; 7888087589FF08134B36FE52AEF3DABA /* TUSKit-iOS-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "TUSKit-iOS-prefix.pch"; path = "../TUSKit-iOS/TUSKit-iOS-prefix.pch"; sourceTree = ""; }; 78E6F0311FD58CD1D0C5776216E648A2 /* TransloaditProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = TransloaditProtocol.h; sourceTree = ""; }; 7CE4324720FD25325F8EF1E9D449483C /* Pods-Transloadit_MacOS_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Transloadit_MacOS_Example-acknowledgements.markdown"; sourceTree = ""; }; 7E13CD9614F418F137D7AC527E5EB3CF /* Pods-Transloadit_MacOS_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Transloadit_MacOS_Example-umbrella.h"; sourceTree = ""; }; 7F0E5FDD9C38D931D5EE75FB49B13856 /* FBSnapshotTestCasePlatform.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSnapshotTestCasePlatform.h; path = FBSnapshotTestCase/FBSnapshotTestCasePlatform.h; sourceTree = ""; }; - 845CA98F5A1DFE6CEB82B3F3956E6F7D /* Pods_Transloadit_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Transloadit_Example.framework; path = "Pods-Transloadit_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 845CA98F5A1DFE6CEB82B3F3956E6F7D /* Pods_Transloadit_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Transloadit_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8B12319E96A75A526A1076DA55C6181B /* FBSnapshotTestCase-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "FBSnapshotTestCase-dummy.m"; sourceTree = ""; }; 8C29101BC282ADF2BDA2386FCDF59063 /* Pods-Transloadit_Tests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Transloadit_Tests-umbrella.h"; sourceTree = ""; }; 8E89959A9DA8F12FB6F875D4CD45F218 /* Pods-Transloadit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Transloadit_Tests.debug.xcconfig"; sourceTree = ""; }; 8F39BBEF992C9295368A99B1048AD1E9 /* FBSnapshotTestCase.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = FBSnapshotTestCase.xcconfig; sourceTree = ""; }; 91B5F7C68E33409F6869BB1A6FDA8544 /* TUSKit-OSX-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "TUSKit-OSX-prefix.pch"; sourceTree = ""; }; 9392AA76C69D0771F24169E8FCCC8BA0 /* TUSKit-OSX-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "TUSKit-OSX-umbrella.h"; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 94111EC7E7911D4C69BF676E996DCA9D /* module.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = module.modulemap; sourceTree = ""; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 94111EC7E7911D4C69BF676E996DCA9D /* module.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; 96ADAF4A2E4CDCE608D44E3FBDCA79B5 /* Pods-Transloadit_Tests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Transloadit_Tests-frameworks.sh"; sourceTree = ""; }; 9A7C0A0313AC65253E88F032137DEDF8 /* Assembly.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Assembly.h; sourceTree = ""; }; 9B4C6CDFD54DD9064A9BDF54800FBA31 /* Pods-Transloadit_Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Transloadit_Tests-dummy.m"; sourceTree = ""; }; @@ -264,7 +264,7 @@ A5296FF46D2DE2866EDC4E2EC9D40685 /* TUSKit-OSX.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "TUSKit-OSX.xcconfig"; sourceTree = ""; }; A57A6EA4EE27722711E2F16F6F950C4A /* Transloadit-iOS.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Transloadit-iOS.xcconfig"; path = "../Transloadit-iOS/Transloadit-iOS.xcconfig"; sourceTree = ""; }; A58307CDAA9BA7EB2AB1596013BFDF1D /* TUSFileData.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSFileData.h; path = Pod/Classes/TUSFileData.h; sourceTree = ""; }; - A8EA65B0EA3C80BABBC677584861D2C3 /* Pods_Transloadit_MacOS_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Transloadit_MacOS_Example.framework; path = "Pods-Transloadit_MacOS_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + A8EA65B0EA3C80BABBC677584861D2C3 /* Pods_Transloadit_MacOS_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Transloadit_MacOS_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B12225C4FC028CC53D321CC9CCD71B9F /* TUSErrors.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TUSErrors.m; path = Pod/Classes/TUSErrors.m; sourceTree = ""; }; B2F4F42C86C33493E5D90481953E5A22 /* SwiftSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SwiftSupport.swift; path = FBSnapshotTestCase/SwiftSupport.swift; sourceTree = ""; }; B63B7B1B243D038665BFB1C81A974F58 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; @@ -274,12 +274,12 @@ BCFEA4608FCC647BE2BF201BF5F3CBDA /* TUSUploadStore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TUSUploadStore.m; path = Pod/Classes/TUSUploadStore.m; sourceTree = ""; }; BEBFB7A31BEFD072C255D9A766A6C47A /* Transloadit-iOS-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "Transloadit-iOS-dummy.m"; path = "../Transloadit-iOS/Transloadit-iOS-dummy.m"; sourceTree = ""; }; BF4D3177289CA81B3DB14566315F8404 /* Pods-Transloadit_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Transloadit_Example-acknowledgements.markdown"; sourceTree = ""; }; - C392860B6310A54619B46B9CA7E13275 /* Pods-Transloadit_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-Transloadit_Tests.modulemap"; sourceTree = ""; }; + C392860B6310A54619B46B9CA7E13275 /* Pods-Transloadit_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-Transloadit_Tests.modulemap"; sourceTree = ""; }; C893844BEAB562428E4BCA5C99DDB656 /* Transloadit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Transloadit.h; sourceTree = ""; }; CA2A0ACAB62E6B60C471FBA47827334B /* APIObject.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = APIObject.h; sourceTree = ""; }; CDE5225462175C8E5B94FD38A7D8B0CF /* APIObjectType.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = APIObjectType.h; sourceTree = ""; }; - CF1DB861A04DB903C0995D009059A5A7 /* Transloadit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Transloadit.framework; path = "Transloadit-iOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - D2DEB7500AAA0629620F0875171FDB7C /* Pods_Transloadit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Transloadit_Tests.framework; path = "Pods-Transloadit_Tests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + CF1DB861A04DB903C0995D009059A5A7 /* Transloadit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Transloadit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D2DEB7500AAA0629620F0875171FDB7C /* Pods_Transloadit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Transloadit_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D9DD1543360674E64B74078F7247E072 /* Template.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Template.m; sourceTree = ""; }; DA3E19A63D24B1B29ACEF61FF3C260FC /* UIImage+Compare.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+Compare.h"; path = "FBSnapshotTestCase/Categories/UIImage+Compare.h"; sourceTree = ""; }; DA57027E6446B593C1943DDC3DB85E0E /* Transloadit-OSX-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Transloadit-OSX-umbrella.h"; sourceTree = ""; }; @@ -292,12 +292,12 @@ E11E4615570BB2FA8858F56DB8CE68A7 /* TUSSession.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TUSSession.h; path = Pod/Classes/TUSSession.h; sourceTree = ""; }; E3191106A4E2D73BA76EAA7D01FAA9C2 /* Pods-Transloadit_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Transloadit_Tests-acknowledgements.markdown"; sourceTree = ""; }; E328DE88BB4B2E54F86EBF9B320CBE72 /* Pods-Transloadit_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Transloadit_Example-frameworks.sh"; sourceTree = ""; }; - E5639F44E6D6379F0264D84E7D74E050 /* Pods-Transloadit_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-Transloadit_Example.modulemap"; sourceTree = ""; }; - E5FB2B4B64F89194F5F24358378AD6BA /* TUSKit-OSX.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "TUSKit-OSX.modulemap"; sourceTree = ""; }; + E5639F44E6D6379F0264D84E7D74E050 /* Pods-Transloadit_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-Transloadit_Example.modulemap"; sourceTree = ""; }; + E5FB2B4B64F89194F5F24358378AD6BA /* TUSKit-OSX.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "TUSKit-OSX.modulemap"; sourceTree = ""; }; E629EE8851C8F2CFC8635BB66CCAF853 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E819785D9D0E697EE348D14569AE8A41 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E853726DB07D122F794CF73A78E5C240 /* TUSFileData.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TUSFileData.m; path = Pod/Classes/TUSFileData.m; sourceTree = ""; }; - E8FDA705B40DF3AFD725610956295599 /* Pods-Transloadit_MacOS_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-Transloadit_MacOS_Example.modulemap"; sourceTree = ""; }; + E8FDA705B40DF3AFD725610956295599 /* Pods-Transloadit_MacOS_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-Transloadit_MacOS_Example.modulemap"; sourceTree = ""; }; EC211E0DC71A6918B24EA8ABF33B19A0 /* UIImage+Diff.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+Diff.h"; path = "FBSnapshotTestCase/Categories/UIImage+Diff.h"; sourceTree = ""; }; EC5C4AF4DDE967BBDC702260186424C8 /* Pods-Transloadit_MacOS_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Transloadit_MacOS_Example-frameworks.sh"; sourceTree = ""; }; EF2DCE54DF34D8D28AB6AFE56C2A4DA7 /* FBSnapshotTestCase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSnapshotTestCase.h; path = FBSnapshotTestCase/FBSnapshotTestCase.h; sourceTree = ""; }; @@ -417,7 +417,6 @@ BCFEA4608FCC647BE2BF201BF5F3CBDA /* TUSUploadStore.m */, A7AC4AED161B16C3C78100E3CAD8E186 /* Support Files */, ); - name = TUSKit; path = TUSKit; sourceTree = ""; }; @@ -449,7 +448,6 @@ B99E6614413B06EBA407D28EB80EC1A2 /* API */, 7D25BD62B9333CCBC6BFD22145B9065C /* Template */, ); - name = Resources; path = Resources; sourceTree = ""; }; @@ -491,7 +489,6 @@ 43EE70B1F11C23A58993CD38528869F2 /* Template.h */, D9DD1543360674E64B74078F7247E072 /* Template.m */, ); - name = Template; path = Template; sourceTree = ""; }; @@ -570,7 +567,6 @@ A3E46F7F711002B0C6E172E2CE899A53 /* Step.m */, 4ED7369C1943E3386F9BEA3056AD8425 /* URLConstants.h */, ); - name = API; path = API; sourceTree = ""; }; @@ -597,7 +593,6 @@ children = ( F1B083AC8762BC0B0B6811E475C4FE02 /* Classes */, ); - name = Transloadit; path = Transloadit; sourceTree = ""; }; @@ -684,7 +679,6 @@ F56C686170B211B3C92140F1EC09D4C3 /* CCommonCrypto */, 3341A277D031BF434510C06BCC3C0060 /* Resources */, ); - name = Classes; path = Classes; sourceTree = ""; }; @@ -693,7 +687,6 @@ children = ( 94111EC7E7911D4C69BF676E996DCA9D /* module.modulemap */, ); - name = CCommonCrypto; path = CCommonCrypto; sourceTree = ""; }; @@ -704,7 +697,6 @@ 7BAE57334870A1002AC1A4A2AACC3AE6 /* Support Files */, 8D7379DF33B351B9997481906FDAC08F /* SwiftSupport */, ); - name = FBSnapshotTestCase; path = FBSnapshotTestCase; sourceTree = ""; }; diff --git a/Example/Transloadit.xcodeproj/project.pbxproj b/Example/Transloadit.xcodeproj/project.pbxproj index d28646a..4e21126 100644 --- a/Example/Transloadit.xcodeproj/project.pbxproj +++ b/Example/Transloadit.xcodeproj/project.pbxproj @@ -9,7 +9,7 @@ /* Begin PBXBuildFile section */ 20D2CCD5F9B4E4DD7A240B0E /* Pods_Transloadit_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88F9C60B95E8311E4F861123 /* Pods_Transloadit_Tests.framework */; }; 28123E881F832782004CD204 /* Transloadit.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 28123E871F832782004CD204 /* Transloadit.podspec */; }; - 28296E871F5DFB36006892E3 /* TransloaditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28296E861F5DFB36006892E3 /* TransloaditViewController.swift */; }; + 28296E871F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28296E861F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift */; }; 2858DA351F68BF7D005325A3 /* test.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 2858DA341F68BF7D005325A3 /* test.jpg */; }; 289616D2203D1EBE0023EE37 /* CommonCrypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 289616C9203D1EBD0023EE37 /* CommonCrypto.framework */; }; 289616D9203D1EBE0023EE37 /* CommonCryptoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 289616D8203D1EBE0023EE37 /* CommonCryptoTests.swift */; }; @@ -110,7 +110,7 @@ /* Begin PBXFileReference section */ 00527FF412666775D11D7EF3 /* Pods-Transloadit_MacOS_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Transloadit_MacOS_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Transloadit_MacOS_Example/Pods-Transloadit_MacOS_Example.release.xcconfig"; sourceTree = ""; }; 28123E871F832782004CD204 /* Transloadit.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Transloadit.podspec; path = ../Transloadit.podspec; sourceTree = ""; }; - 28296E861F5DFB36006892E3 /* TransloaditViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransloaditViewController.swift; sourceTree = ""; }; + 28296E861F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransloaditViewControllerSwifty.swift; sourceTree = ""; }; 2858DA341F68BF7D005325A3 /* test.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = test.jpg; sourceTree = ""; }; 2858DA361F68C27C005325A3 /* test.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = test.jpg; path = ../../../../../Downloads/mpdf60/examples/test.jpg; sourceTree = ""; }; 289616C9203D1EBD0023EE37 /* CommonCrypto.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CommonCrypto.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -367,7 +367,7 @@ 6003F5A6195388D20070C39A /* TransloaditViewController.m */, 6003F5A8195388D20070C39A /* Images.xcassets */, 6003F594195388D20070C39A /* Supporting Files */, - 28296E861F5DFB36006892E3 /* TransloaditViewController.swift */, + 28296E861F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift */, ); name = "Example for Transloadit"; path = Transloadit; @@ -891,7 +891,7 @@ files = ( 6003F59E195388D20070C39A /* TransloaditAppDelegate.m in Sources */, 6003F5A7195388D20070C39A /* TransloaditViewController.m in Sources */, - 28296E871F5DFB36006892E3 /* TransloaditViewController.swift in Sources */, + 28296E871F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift in Sources */, 6003F59A195388D20070C39A /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Example/Transloadit/Main.storyboard b/Example/Transloadit/Main.storyboard index 92ccbab..349a8e8 100644 --- a/Example/Transloadit/Main.storyboard +++ b/Example/Transloadit/Main.storyboard @@ -9,10 +9,10 @@ - + - + diff --git a/Example/Transloadit/TransloaditViewController.m b/Example/Transloadit/TransloaditViewController.m index e9b5ad9..f56a717 100644 --- a/Example/Transloadit/TransloaditViewController.m +++ b/Example/Transloadit/TransloaditViewController.m @@ -40,15 +40,12 @@ @implementation TransloaditViewController - (void)viewDidLoad { [super viewDidLoad]; transloadit = [[Transloadit alloc] init]; - transloadit.failureBlock = failureBlock; - transloadit.progressBlock = progressBlock; - transloadit.resultBlock = resultBlock; + transloadit.uploadFailureBlock = failureBlock; + transloadit.uploadProgressBlock = progressBlock; + transloadit.uploadResultBlock = resultBlock; NSString *path = [[NSBundle mainBundle] pathForResource:@"test" ofType:@"jpg"]; - - NSData *img = [NSData dataWithContentsOfFile:path]; - NSMutableArray *steps = [[NSMutableArray alloc] init]; Step *step1 = [[Step alloc] initWithKey:@"encode"]; @@ -66,8 +63,6 @@ - (void)viewDidLoad { //MARK: We then create an Assembly Object with the steps and files [testAssembly addFile:[NSURL fileURLWithPath:path] andFileName:@"file.jpg"]; - - transloadit.assemblyCreationResultBlock = ^(Assembly* assembly, NSDictionary* completionDictionary){ NSLog(@"Assembly creation success"); NSLog(@"%@", @"Invoking assembly."); diff --git a/Example/Transloadit/TransloaditViewController.swift b/Example/Transloadit/TransloaditViewControllerSwifty.swift similarity index 53% rename from Example/Transloadit/TransloaditViewController.swift rename to Example/Transloadit/TransloaditViewControllerSwifty.swift index ba52808..1ffcd88 100644 --- a/Example/Transloadit/TransloaditViewController.swift +++ b/Example/Transloadit/TransloaditViewControllerSwifty.swift @@ -7,13 +7,11 @@ // import UIKit -import Photos import Transloadit -class TransloaditViewController: UIViewController, UIPickerViewDelegate, UINavigationBarDelegate { +class TransloaditViewControllerSwifty: UIViewController, UIPickerViewDelegate, UINavigationBarDelegate { let transloadit: Transloadit = Transloadit() - let imagePicker: UIImagePickerController = UIImagePickerController() var TestAssembly: Assembly? //var TestTemplate: Template @@ -28,37 +26,52 @@ class TransloaditViewController: UIViewController, UIPickerViewDelegate, UINavig let AssemblyStepsArray: NSMutableArray = NSMutableArray() let Step1 = Step (key: "encode") Step1?.setValue("/image/resize", forOption: "robot") + Step1?.setValue("75", forOption: "width") + Step1?.setValue("75", forOption: "height") + AssemblyStepsArray.add(Step1) + TestAssembly = Assembly(steps: AssemblyStepsArray, andNumberOfFiles: 1) + + let path = Bundle.main.path(forResource: "test", ofType: "jpg") + TestAssembly?.addFile(URL(fileURLWithPath: path!), andFileName: "testFile.jpg") + self.transloadit.createAssembly(TestAssembly!) + + self.transloadit.assemblyCreationResultBlock = { assembly, completionDictionary in + self.transloadit.invokeAssembly(assembly) + } + self.transloadit.assemblyCreationFailureBlock = { completionDictionary in + + } + + self.transloadit.assemblyResultBlock = { completionDictionary in + + } + self.transloadit.assemblyStatusBlock = { completionDictionary in + } - let TestTemplate: Template = Template() - // Do any additional setup after loading the view. + self.transloadit.assemblyFailureBlock = { completionDictionary in + + } + + self.transloadit.uploadResultBlock = { url in + + } + self.transloadit.uploadProgressBlock = {bytesWritten, bytesTotal in + + } + self.transloadit.uploadFailureBlock = { error in + + } } override func viewDidAppear(_ animated: Bool) { - self.selectFile("") + } - @IBAction func selectFile(_ sender: Any) { + func upload() { - let status: PHAuthorizationStatus = PHPhotoLibrary.authorizationStatus() - switch status { - case .authorized: - self.present(imagePicker, animated: true, completion: nil) - break - default: - PHPhotoLibrary.requestAuthorization({ - (newStatus) in - print("status is \(newStatus)") - if newStatus == PHAuthorizationStatus.authorized { - /* do stuff here */ - print("success") - } - }) - break - } } - override func didReceiveMemoryWarning() { super.didReceiveMemoryWarning() diff --git a/Transloadit/Classes/Transloadit.h b/Transloadit/Classes/Transloadit.h index 2d204fc..1112baa 100644 --- a/Transloadit/Classes/Transloadit.h +++ b/Transloadit/Classes/Transloadit.h @@ -34,9 +34,9 @@ typedef void (^TransloaditAssemblyStatusBlock)(NSDictionary* _Nonnull completion @interface Transloadit : NSObject -@property (readwrite, copy) _Nullable TransloaditUploadResultBlock resultBlock; -@property (readwrite, copy) _Nullable TransloaditUploadFailureBlock failureBlock; -@property (readwrite, copy) _Nullable TransloaditUploadProgressBlock progressBlock; +@property (readwrite, copy) _Nullable TransloaditUploadResultBlock uploadResultBlock; +@property (readwrite, copy) _Nullable TransloaditUploadFailureBlock uploadFailureBlock; +@property (readwrite, copy) _Nullable TransloaditUploadProgressBlock uploadProgressBlock; @property (readwrite, copy) _Nullable TransloaditAssemblyCreationResultBlock assemblyCreationResultBlock; @property (readwrite, copy) _Nullable TransloaditAssemblyCreationFailureBlock assemblyCreationFailureBlock; @@ -46,8 +46,6 @@ typedef void (^TransloaditAssemblyStatusBlock)(NSDictionary* _Nonnull completion @property (readwrite, copy) _Nullable TransloaditAssemblyFailureBlock assemblyFailureBlock; @property (readwrite, copy) _Nullable TransloaditAssemblyStatusBlock assemblyStatusBlock; - - @property (nonatomic, strong) NSString * _Nonnull secret; // Transloadit Secret @property (nonatomic, strong) NSString * _Nonnull key; // Transloadit Key diff --git a/Transloadit/Classes/Transloadit.m b/Transloadit/Classes/Transloadit.m index d99b148..5c4b9d1 100644 --- a/Transloadit/Classes/Transloadit.m +++ b/Transloadit/Classes/Transloadit.m @@ -71,9 +71,9 @@ - (void) invokeAssembly: (Assembly *)assembly{ for (int x = 0; x < [files count]; x++) { NSString* fileName = [[assembly fileNames] objectAtIndex:x]; TUSResumableUpload *upload = [_tusSession createUploadFromFile:[files objectAtIndex:x] headers:@{} metadata:@{@"filename":fileName, @"fieldname":@"file-input", @"assembly_url": [assembly urlString]}]; - upload.progressBlock = _progressBlock; - upload.resultBlock = _resultBlock; - upload.failureBlock = _failureBlock; + upload.progressBlock = _uploadProgressBlock; + upload.resultBlock = _uploadResultBlock; + upload.failureBlock = _uploadFailureBlock; [upload resume]; } } diff --git a/Transloadit/Classes/TransloaditDelegate.h b/Transloadit/Classes/TransloaditDelegate.h new file mode 100644 index 0000000..5cd3d7b --- /dev/null +++ b/Transloadit/Classes/TransloaditDelegate.h @@ -0,0 +1,26 @@ +// +// TransloaditDelegate.h +// Pods +// +// Created by Mark Masterson on 5/6/18. +// + +#import +#import "Resources/API/Assembly.h" + +@protocol TransloaditDelegate + +@optional +- (void) transloaditAssemblyCreationResult:(Assembly *)assembly completionDictionary:(NSDictionary *)completionDictionary; +@optional +- (void) transloaditAssemblyCreationFailure:(NSDictionary *)completionDictionary; + +@optional +- (void) transloaditAssemblyStatus:(NSDictionary *)completionDictionary; +@optional +- (void) transloaditAssemblyResult:(NSDictionary *)completionDictionary; +@optional +- (void) transloaditAssemblyFailure:(NSDictionary *)completionDictionary; + + +@end From 0e29d8a84f482359aefad311cfa4f21ad4539f0b Mon Sep 17 00:00:00 2001 From: "Mark R. Masterson" Date: Sun, 6 May 2018 11:31:55 -0700 Subject: [PATCH 4/7] Updated examples --- Example/Transloadit/Main.storyboard | 22 ++++-- .../TransloaditViewControllerSwifty.swift | 68 +++++++++++-------- Transloadit/Classes/Transloadit.h | 6 ++ Transloadit/Classes/Transloadit.m | 7 +- Transloadit/Classes/TransloaditRequest.m | 2 - 5 files changed, 67 insertions(+), 38 deletions(-) diff --git a/Example/Transloadit/Main.storyboard b/Example/Transloadit/Main.storyboard index 349a8e8..38dbf6a 100644 --- a/Example/Transloadit/Main.storyboard +++ b/Example/Transloadit/Main.storyboard @@ -21,16 +21,28 @@ - + + + + + + + diff --git a/Example/Transloadit/TransloaditViewControllerSwifty.swift b/Example/Transloadit/TransloaditViewControllerSwifty.swift index 1ffcd88..fd5aeab 100644 --- a/Example/Transloadit/TransloaditViewControllerSwifty.swift +++ b/Example/Transloadit/TransloaditViewControllerSwifty.swift @@ -12,65 +12,82 @@ import Transloadit class TransloaditViewControllerSwifty: UIViewController, UIPickerViewDelegate, UINavigationBarDelegate { let transloadit: Transloadit = Transloadit() - + var TestTemplate: Template? var TestAssembly: Assembly? - //var TestTemplate: Template - - + let path = Bundle.main.path(forResource: "test", ofType: "jpg") + let StepArray: NSMutableArray = NSMutableArray() + override func viewDidLoad() { super.viewDidLoad() //----------------------------------------------------- - // MARK: Assembly Setup + // MARK: Setup Steps //----------------------------------------------------- - let AssemblyStepsArray: NSMutableArray = NSMutableArray() let Step1 = Step (key: "encode") Step1?.setValue("/image/resize", forOption: "robot") Step1?.setValue("75", forOption: "width") Step1?.setValue("75", forOption: "height") - AssemblyStepsArray.add(Step1) - - TestAssembly = Assembly(steps: AssemblyStepsArray, andNumberOfFiles: 1) + StepArray.add(Step1) - let path = Bundle.main.path(forResource: "test", ofType: "jpg") - TestAssembly?.addFile(URL(fileURLWithPath: path!), andFileName: "testFile.jpg") - - self.transloadit.createAssembly(TestAssembly!) - self.transloadit.assemblyCreationResultBlock = { assembly, completionDictionary in + print("Assembly created!") + print("Assembly invoking!") self.transloadit.invokeAssembly(assembly) } self.transloadit.assemblyCreationFailureBlock = { completionDictionary in - + print("Assembly creation failed") } self.transloadit.assemblyResultBlock = { completionDictionary in - + print("Assembly finished executing!") } self.transloadit.assemblyStatusBlock = { completionDictionary in + print("Assembly is executing!") } self.transloadit.assemblyFailureBlock = { completionDictionary in - + print("Assembly failed executing!") } self.transloadit.uploadResultBlock = { url in - + print("file uploaded!") } self.transloadit.uploadProgressBlock = {bytesWritten, bytesTotal in - + print("Assembly uploading!") } self.transloadit.uploadFailureBlock = { error in - + print("Assembly failed uploading!") + } + + self.transloadit.templateCreationResultBlock = { template, completionDictionary in + print("Template created!") + print("Creating assembly with template!") + let assemblyWithTemplate = Assembly(template: template, andNumberOfFiles: 1) + assemblyWithTemplate?.addFile(URL(fileURLWithPath: self.path!), andFileName: "testFile.jpg") + self.transloadit.createAssembly(assemblyWithTemplate!) + } + + self.transloadit.templateCreationFailureBlock = { completionDictionary in + print("Template failed creating!") } + } - override func viewDidAppear(_ animated: Bool) { - + @IBAction func runAssembly(_ sender: Any) { + //Assembly Setup + self.TestAssembly = Assembly(steps: self.StepArray, andNumberOfFiles: 1) + self.TestAssembly!.addFile(URL(fileURLWithPath: self.path!), andFileName: "testFile.jpg") + self.transloadit.createAssembly(self.TestAssembly!) } - func upload() { - + @IBAction func runTemplate(_ sender: Any) { + //Template Setup + self.TestTemplate = Template(steps: self.StepArray, andName: "New Template") + self.transloadit.createTemplate(self.TestTemplate!) + } + + override func viewDidAppear(_ animated: Bool) { + } override func didReceiveMemoryWarning() { @@ -78,7 +95,6 @@ class TransloaditViewControllerSwifty: UIViewController, UIPickerViewDelegate, U // Dispose of any resources that can be recreated. } - /* // MARK: - Navigation @@ -90,5 +106,3 @@ class TransloaditViewControllerSwifty: UIViewController, UIPickerViewDelegate, U */ } - - diff --git a/Transloadit/Classes/Transloadit.h b/Transloadit/Classes/Transloadit.h index 1112baa..040cc59 100644 --- a/Transloadit/Classes/Transloadit.h +++ b/Transloadit/Classes/Transloadit.h @@ -10,6 +10,7 @@ #import "TransloaditProtocol.h" #import "TransloaditRequest.h" #import "Assembly.h" +#import "Template.h" #import "Step.h" #import "APIState.h" #import "APIObjectType.h" @@ -26,6 +27,9 @@ typedef void (^TransloaditUploadProgressBlock)(int64_t bytesWritten, int64_t byt typedef void (^TransloaditAssemblyCreationResultBlock)(Assembly* _Nonnull assembly, NSDictionary* _Nonnull completionDictionary); typedef void (^TransloaditAssemblyCreationFailureBlock)(NSDictionary* _Nonnull completionDictionary); +typedef void (^TransloaditTemplateCreationResultBlock)(Template* _Nonnull assembly, NSDictionary* _Nonnull completionDictionary); +typedef void (^TransloaditTemplateCreationFailureBlock)(NSDictionary* _Nonnull completionDictionary); + typedef void (^TransloaditAssemblyResultBlock)(NSDictionary* _Nonnull completionDictionary); typedef void (^TransloaditAssemblyFailureBlock)(NSDictionary* _Nonnull completionDictionary); @@ -41,6 +45,8 @@ typedef void (^TransloaditAssemblyStatusBlock)(NSDictionary* _Nonnull completion @property (readwrite, copy) _Nullable TransloaditAssemblyCreationResultBlock assemblyCreationResultBlock; @property (readwrite, copy) _Nullable TransloaditAssemblyCreationFailureBlock assemblyCreationFailureBlock; +@property (readwrite, copy) _Nullable TransloaditTemplateCreationResultBlock templateCreationResultBlock; +@property (readwrite, copy) _Nullable TransloaditTemplateCreationFailureBlock templateCreationFailureBlock; @property (readwrite, copy) _Nullable TransloaditAssemblyResultBlock assemblyResultBlock; @property (readwrite, copy) _Nullable TransloaditAssemblyFailureBlock assemblyFailureBlock; diff --git a/Transloadit/Classes/Transloadit.m b/Transloadit/Classes/Transloadit.m index 5c4b9d1..023d0c8 100644 --- a/Transloadit/Classes/Transloadit.m +++ b/Transloadit/Classes/Transloadit.m @@ -43,7 +43,6 @@ - (void) createTemplate: (Template *)template { NSURLSessionDataTask *assemblyTask = [[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) { if (error) { - NSLog(@"%@", [error debugDescription]); return; } @@ -53,11 +52,11 @@ - (void) createTemplate: (Template *)template { error:nil]; if([json valueForKey:@"error"]){ - NSLog(@"%@", [json valueForKey:@"error"]); + self.templateCreationFailureBlock(json); return; } else { - // self.assemblyCompletionBlock(json); - NSLog(@"%@", [json debugDescription]); + [template setTemplate_id:[json valueForKey:@"id"]]; + self.templateCreationResultBlock(template, json); } }]; diff --git a/Transloadit/Classes/TransloaditRequest.m b/Transloadit/Classes/TransloaditRequest.m index cf42a50..c512d69 100644 --- a/Transloadit/Classes/TransloaditRequest.m +++ b/Transloadit/Classes/TransloaditRequest.m @@ -62,8 +62,6 @@ -(NSMutableURLRequest *) createRequestWithParams:(NSMutableDictionary *)params a } - (NSMutableURLRequest *) createRequestWithParams:(NSMutableDictionary *) params andFinalURL:(NSString *)url { - NSLog(url); - NSLog([params debugDescription]); NSMutableDictionary *auth = [self createAuth]; [params setObject:auth forKey:@"auth"]; NSString *signature = [self generateSignatureWithParams: params]; From 1e313438a10ea4d5eda139b5cfcd313a659eae76 Mon Sep 17 00:00:00 2001 From: "Mark R. Masterson" Date: Sun, 6 May 2018 12:10:32 -0700 Subject: [PATCH 5/7] Fixed template --- Example/Transloadit/TransloaditViewControllerSwifty.swift | 3 ++- Transloadit/Classes/Resources/API/Assembly.m | 1 + Transloadit/Classes/Transloadit.m | 7 +++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Example/Transloadit/TransloaditViewControllerSwifty.swift b/Example/Transloadit/TransloaditViewControllerSwifty.swift index fd5aeab..5f2c164 100644 --- a/Example/Transloadit/TransloaditViewControllerSwifty.swift +++ b/Example/Transloadit/TransloaditViewControllerSwifty.swift @@ -64,6 +64,7 @@ class TransloaditViewControllerSwifty: UIViewController, UIPickerViewDelegate, U print("Creating assembly with template!") let assemblyWithTemplate = Assembly(template: template, andNumberOfFiles: 1) assemblyWithTemplate?.addFile(URL(fileURLWithPath: self.path!), andFileName: "testFile.jpg") + assemblyWithTemplate?.addStep(with: Step()) self.transloadit.createAssembly(assemblyWithTemplate!) } @@ -82,7 +83,7 @@ class TransloaditViewControllerSwifty: UIViewController, UIPickerViewDelegate, U @IBAction func runTemplate(_ sender: Any) { //Template Setup - self.TestTemplate = Template(steps: self.StepArray, andName: "New Template") + self.TestTemplate = Template(steps: self.StepArray, andName: "New Template2") self.transloadit.createTemplate(self.TestTemplate!) } diff --git a/Transloadit/Classes/Resources/API/Assembly.m b/Transloadit/Classes/Resources/API/Assembly.m index f9945ac..24a3be8 100644 --- a/Transloadit/Classes/Resources/API/Assembly.m +++ b/Transloadit/Classes/Resources/API/Assembly.m @@ -34,6 +34,7 @@ - (id)initWithTemplate:(Template *)template andNumberOfFiles:(int)numberOfFiles NSLog(@"_init: %@", self); [self setTemplate:template]; [self setNumberOfFiles:&numberOfFiles]; + [self setFiles:[[NSMutableArray alloc] initWithCapacity:numberOfFiles]]; [self setFileNames:[[NSMutableArray alloc] initWithCapacity:numberOfFiles]]; } return self; diff --git a/Transloadit/Classes/Transloadit.m b/Transloadit/Classes/Transloadit.m index 023d0c8..7778b7a 100644 --- a/Transloadit/Classes/Transloadit.m +++ b/Transloadit/Classes/Transloadit.m @@ -35,7 +35,11 @@ - (void) createTemplate: (Template *)template { NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; - [params setObject:steps forKey:@"template"]; + NSMutableDictionary *templateJSON = [[NSMutableDictionary alloc] init]; + + [templateJSON setObject:steps forKey:@"steps"]; + + [params setObject:templateJSON forKey:@"template"]; [params setObject:[template name] forKey:@"name"]; @@ -57,7 +61,6 @@ - (void) createTemplate: (Template *)template { } else { [template setTemplate_id:[json valueForKey:@"id"]]; self.templateCreationResultBlock(template, json); - } }]; [assemblyTask resume]; From 7e194202948772c5b32f4b21f589359083d349e7 Mon Sep 17 00:00:00 2001 From: "Mark R. Masterson" Date: Sun, 6 May 2018 12:26:17 -0700 Subject: [PATCH 6/7] New test image --- Example/Transloadit.xcodeproj/project.pbxproj | 4 ++++ .../TransloaditViewControllerSwifty.swift | 2 +- Example/Transloadit/transloadit.png | Bin 0 -> 10134 bytes Transloadit/Classes/Transloadit.m | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Example/Transloadit/transloadit.png diff --git a/Example/Transloadit.xcodeproj/project.pbxproj b/Example/Transloadit.xcodeproj/project.pbxproj index 4e21126..749a5a6 100644 --- a/Example/Transloadit.xcodeproj/project.pbxproj +++ b/Example/Transloadit.xcodeproj/project.pbxproj @@ -11,6 +11,7 @@ 28123E881F832782004CD204 /* Transloadit.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 28123E871F832782004CD204 /* Transloadit.podspec */; }; 28296E871F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28296E861F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift */; }; 2858DA351F68BF7D005325A3 /* test.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 2858DA341F68BF7D005325A3 /* test.jpg */; }; + 28615CFE209F8AD000E3D237 /* transloadit.png in Resources */ = {isa = PBXBuildFile; fileRef = 28615CFD209F8AD000E3D237 /* transloadit.png */; }; 289616D2203D1EBE0023EE37 /* CommonCrypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 289616C9203D1EBD0023EE37 /* CommonCrypto.framework */; }; 289616D9203D1EBE0023EE37 /* CommonCryptoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 289616D8203D1EBE0023EE37 /* CommonCryptoTests.swift */; }; 289616DB203D1EBE0023EE37 /* CommonCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = 289616CB203D1EBE0023EE37 /* CommonCrypto.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -113,6 +114,7 @@ 28296E861F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransloaditViewControllerSwifty.swift; sourceTree = ""; }; 2858DA341F68BF7D005325A3 /* test.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = test.jpg; sourceTree = ""; }; 2858DA361F68C27C005325A3 /* test.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = test.jpg; path = ../../../../../Downloads/mpdf60/examples/test.jpg; sourceTree = ""; }; + 28615CFD209F8AD000E3D237 /* transloadit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = transloadit.png; sourceTree = ""; }; 289616C9203D1EBD0023EE37 /* CommonCrypto.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CommonCrypto.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 289616CB203D1EBE0023EE37 /* CommonCrypto.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonCrypto.h; sourceTree = ""; }; 289616CC203D1EBE0023EE37 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -360,6 +362,7 @@ 6003F593195388D20070C39A /* Example for Transloadit */ = { isa = PBXGroup; children = ( + 28615CFD209F8AD000E3D237 /* transloadit.png */, 6003F59C195388D20070C39A /* TransloaditAppDelegate.h */, 6003F59D195388D20070C39A /* TransloaditAppDelegate.m */, 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */, @@ -690,6 +693,7 @@ 289616E8203D1EF00023EE37 /* CommonCrypto.xcconfig in Resources */, 28123E881F832782004CD204 /* Transloadit.podspec in Resources */, 6003F5A9195388D20070C39A /* Images.xcassets in Resources */, + 28615CFE209F8AD000E3D237 /* transloadit.png in Resources */, 6003F598195388D20070C39A /* InfoPlist.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Example/Transloadit/TransloaditViewControllerSwifty.swift b/Example/Transloadit/TransloaditViewControllerSwifty.swift index 5f2c164..2cce075 100644 --- a/Example/Transloadit/TransloaditViewControllerSwifty.swift +++ b/Example/Transloadit/TransloaditViewControllerSwifty.swift @@ -14,7 +14,7 @@ class TransloaditViewControllerSwifty: UIViewController, UIPickerViewDelegate, U let transloadit: Transloadit = Transloadit() var TestTemplate: Template? var TestAssembly: Assembly? - let path = Bundle.main.path(forResource: "test", ofType: "jpg") + let path = Bundle.main.path(forResource: "transloadit", ofType: "png") let StepArray: NSMutableArray = NSMutableArray() override func viewDidLoad() { diff --git a/Example/Transloadit/transloadit.png b/Example/Transloadit/transloadit.png new file mode 100644 index 0000000000000000000000000000000000000000..dca2d2158a3568ac5bfef681a966045e6ae95e3a GIT binary patch literal 10134 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 literal 0 HcmV?d00001 diff --git a/Transloadit/Classes/Transloadit.m b/Transloadit/Classes/Transloadit.m index 7778b7a..87c5162 100644 --- a/Transloadit/Classes/Transloadit.m +++ b/Transloadit/Classes/Transloadit.m @@ -109,7 +109,7 @@ - (void) createAssembly: (Assembly *)assembly{ } - (void) checkAssembly: (Assembly *)assembly { - NSTimer *timer = [NSTimer timerWithTimeInterval:2.0 repeats:true block:^(NSTimer * _Nonnull timer) { + NSTimer *timer = [NSTimer timerWithTimeInterval:1.0 repeats:true block:^(NSTimer * _Nonnull timer) { [self assemblyStatus:assembly completion:^(NSDictionary *response) { NSArray *responseArray = @[@"REQUEST_ABORTED", @"ASSEMBLY_CANCELED", @"ASSEMBLY_COMPLETED"]; int responseInterger = [responseArray indexOfObject:[response valueForKey:@"ok"]]; From 2fbddda7c01d4270e95f8c7c532896c7b6f412d3 Mon Sep 17 00:00:00 2001 From: "Mark R. Masterson" Date: Sun, 6 May 2018 12:42:55 -0700 Subject: [PATCH 7/7] Readme & pod spec update --- README.md | 185 ++++++++++++++++++++++++++++++-------------- Transloadit.podspec | 2 +- 2 files changed, 127 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index 3fa3b8c..c8c657b 100644 --- a/README.md +++ b/README.md @@ -35,85 +35,153 @@ If there are no errors, you can start using the pod. *Swift* ```Swift -import TransloaditKit +import Transloadit ``` ### Define your blocks +`Objective-C` ```objc -static TransloaditUploadProgressBlock progressBlock = ^(int64_t bytesWritten, int64_t bytesTotal){ - // Update your progress bar here - NSLog(@"progress: %llu / %llu", (unsigned long long)bytesWritten, (unsigned long long)bytesTotal); +transloadit.uploadingProgressBlock = ^(int64_t bytesWritten, int64_t bytesTotal){ +// Update your progress bar here +NSLog(@"progress: %llu / %llu", (unsigned long long)bytesWritten, (unsigned long long)bytesTotal); }; -static TransloaditUploadResultBlock resultBlock = ^(NSURL* fileURL){ - // Use the upload url - NSLog(@"url: %@", fileURL); +transloadit.uploadingResultBlock = ^(NSURL* fileURL){ +// Use the upload url +NSLog(@"url: %@", fileURL); }; -static TransloaditUploadFailureBlock failureBlock = ^(NSError* error){ - // Handle the error - NSLog(@"error: %@", error); +transloadit.uploadingFailureBlock = ^(NSError* error){ +// Handle the error +NSLog(@"error: %@", error); +}; + +transloadit.assemblyCreationResultBlock = ^(Assembly* assembly, NSDictionary* completionDictionary){ +NSLog(@"Assembly creation success"); +NSLog(@"%@", @"Invoking assembly."); +}; + +transloadit.assemblyCreationFailureBlock = ^(NSDictionary* completionDictionary){ +NSLog(@"Assembly creation failed: %@", [completionDictionary debugDescription]); +}; + +transloadit.assemblyStatusBlock = ^(NSDictionary* completionDictionary){ +NSLog(@"Assembly status: %@", [completionDictionary debugDescription]); +}; + +transloadit.assemblyResultBlock = ^(NSDictionary* completionDictionary){ +NSLog(@"Assembly finished : %@", [completionDictionary debugDescription]); +}; + +transloadit.assemblyFailureBlock = ^(NSDictionary* completionDictionary){ +NSLog(@"Assembly failed: %@", [completionDictionary debugDescription]); }; ``` +`Swift` +```Swift +self.transloadit.assemblyCreationResultBlock = { assembly, completionDictionary in +print("Assembly created!") +} +self.transloadit.assemblyCreationFailureBlock = { completionDictionary in +print("Assembly creation failed") +} + +self.transloadit.assemblyResultBlock = { completionDictionary in +print("Assembly finished executing!") +} +self.transloadit.assemblyStatusBlock = { completionDictionary in +print("Assembly is executing!") +} + +self.transloadit.assemblyFailureBlock = { completionDictionary in +print("Assembly failed executing!") +} + +self.transloadit.uploadResultBlock = { url in +print("file uploaded!") +} +self.transloadit.uploadProgressBlock = {bytesWritten, bytesTotal in +print("Assembly uploading!") +} +self.transloadit.uploadFailureBlock = { error in +print("Assembly failed uploading!") +} + +self.transloadit.templateCreationResultBlock = { template, completionDictionary in +print("Template created!") +} + +self.transloadit.templateCreationFailureBlock = { completionDictionary in +print("Template failed creating!") +} +``` + ### Setup TransloaditKit +`Objective-C` ```objc - (void)viewDidLoad { - [super viewDidLoad]; - transloadit = [[Transloadit alloc] initWithKey:@"YOUR_PUBLIC_KEY" andSecret:@"YOUR_SECRET_KIT"]; - // Do any additional setup after loading the view, typically from a nib. +[super viewDidLoad]; +transloadit = [[Transloadit alloc] init]; } ``` +`Swift` ```swift // Simply setup a Transloadit object let transloadit: Transloadit = Transloadit() ``` +*{PROJECT_NAME}.plist* +```xml +TRANSLOADIT_SECRET +SECRET_KEY_HERE +TRANSLOADIT_KEY +API_KEY_HERE +``` + ### Create an assembly and upload +`Objective-C` ```objc - NSMutableArray *steps = [[NSMutableArray alloc] init]; - - //MARK: A Sample step - Step *step1 = [[Step alloc] initWithKey:@"encode"]; - [step1 setValue:@"/image/resize" forOption:@"robot"]; - - // Add the step to the array - [steps addObject:step1]; - - //MARK: Create an assembly with steps - Assembly *TestAssemblyWithSteps = [[Assembly alloc] initWithSteps:steps andNumberOfFiles:1]; - [TestAssemblyWithSteps addFile:fileUrl]; - [TestAssemblyWithSteps setNotify_url:@""]; - - //MARK: Start The Assembly - [transloadit createAssembly:TestAssemblyWithSteps]; - - - transloadit.completionBlock = ^(NSDictionary* completionDictionary){ - - [TestAssemblyWithSteps setUrlString:[completionDictionary valueForKey:@"assembly_ssl_url"]]; - [transloadit invokeAssembly:TestAssemblyWithSteps]; +NSMutableArray *steps = [[NSMutableArray alloc] init]; + +//MARK: A Sample step +Step *step1 = [[Step alloc] initWithKey:@"encode"]; +[step1 setValue:@"/image/resize" forOption:@"robot"]; + +// Add the step to the array +[steps addObject:step1]; + +//MARK: Create an assembly with steps +Assembly *TestAssemblyWithSteps = [[Assembly alloc] initWithSteps:steps andNumberOfFiles:1]; +[TestAssemblyWithSteps addFile:fileUrl]; +[TestAssemblyWithSteps setNotify_url:@""]; + +//MARK: Start The Assembly +[transloadit createAssembly:TestAssemblyWithSteps]; + + +transloadit.assemblyCreationResultBlock = ^(Assembly* assembly, NSDictionary* completionDictionary){ +[transloadit invokeAssembly:assembly]; +} ``` +`Swift` ```swift override func viewDidLoad() { - super.viewDidLoad() - let AssemblyStepsArray: NSMutableArray = NSMutableArray() - let Step1 = Step (key: "encode") - Step1?.setValue("/image/resize", forOption: "robot") - TestAssembly = Assembly(steps: AssemblyStepsArray, andNumberOfFiles: 1) - - self.TestAssembly?.addFile(fileURL) - self.transloadit.createAssembly(self.TestAssembly!) - - self.transloadit.assemblyCompletionBlock = {(_ completionDictionary: [AnyHashable: Any]) -> Void in - /*Invoking The Assebmly does NOT need to happen inside the completion block. However for sake of a small UI it is. - We do however need to add the URL to the Assembly object so that we do invoke it, it knows where to go. - */ - self.TestAssembly?.urlString = completionDictionary["assembly_ssl_url"] as! String - self.transloadit.invokeAssembly(self.TestAssembly!) - self.transloadit.check(self.TestAssembly!) - } +super.viewDidLoad() +let AssemblyStepsArray: NSMutableArray = NSMutableArray() +let Step1 = Step (key: "encode") +Step1?.setValue("/image/resize", forOption: "robot") +TestAssembly = Assembly(steps: AssemblyStepsArray, andNumberOfFiles: 1) + +self.TestAssembly?.addFile(fileURL) +self.transloadit.createAssembly(self.TestAssembly!) + +self.transloadit.assemblyCreationResultBlock = { assembly, completionDictionary in +print("Assembly created!") +print("Assembly invoking!") +self.transloadit.invokeAssembly(assembly) +} } ``` @@ -128,24 +196,22 @@ We'd be happy to accept pull requests. If you plan on working on something big, ### Building -The SDK is written in Objective-C for both iOS and MacOS. +The SDK is written in Objective-C for both iOS and MacOS. ### Releasing Releasing a new version to CocoaPods can be done via CocoaPods Trunk: - - Bump the version inside the `Transloadit.podspec` - - Save a release commit with the updated version in Git - - Push a tag to Github - - Publish to Cocoapods with Trunk +- Bump the version inside the `Transloadit.podspec` +- Save a release commit with the updated version in Git +- Push a tag to Github +- Publish to Cocoapods with Trunk ### To Do -- update examples - bridge TUSKit networking - websockets -- ~remove Arcane dependency~ ## Dependencies @@ -162,3 +228,4 @@ Contributions from: ## License [MIT Licensed](LICENSE). + diff --git a/Transloadit.podspec b/Transloadit.podspec index f0587fd..39c82e8 100644 --- a/Transloadit.podspec +++ b/Transloadit.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'Transloadit' -s.version = '1.0.3' +s.version = '1.0.4' s.summary = 'An iOS and MacOS SDK for Transloadit.' # This description is used to generate tags and improve search results.