From 1173be86f71fac7e808453ae82d734c73763eb8c Mon Sep 17 00:00:00 2001 From: Superbil Date: Tue, 5 Dec 2017 01:47:56 +0800 Subject: [PATCH 1/5] Let badge show on current branch --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 10ad39c..5285c1e 100644 --- a/Readme.md +++ b/Readme.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/hackfoldr/hackfoldr-iOS.svg?branch=develop)](https://travis-ci.org/hackfoldr/hackfoldr-iOS) +[![Build Status](https://travis-ci.org/hackfoldr/hackfoldr-iOS.svg?branch=master)](https://travis-ci.org/hackfoldr/hackfoldr-iOS) # hackfoldr-iOS # From 4e3c7b78684ca2e9d194a01c48a1d9265b15c180 Mon Sep 17 00:00:00 2001 From: Superbil Date: Sun, 28 Apr 2019 19:52:12 +0800 Subject: [PATCH 2/5] Upgrade all pods - `pod update` --- Podfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 2c8f72d..5e9ae4e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -48,25 +48,25 @@ PODS: - MagicalRecord (2.3.2): - MagicalRecord/Core (= 2.3.2) - MagicalRecord/Core (2.3.2) - - OHHTTPStubs (6.1.0): - - OHHTTPStubs/Default (= 6.1.0) - - OHHTTPStubs/Core (6.1.0) - - OHHTTPStubs/Default (6.1.0): + - OHHTTPStubs (8.0.0): + - OHHTTPStubs/Default (= 8.0.0) + - OHHTTPStubs/Core (8.0.0) + - OHHTTPStubs/Default (8.0.0): - OHHTTPStubs/Core - OHHTTPStubs/JSON - OHHTTPStubs/NSURLSession - OHHTTPStubs/OHPathHelpers - - OHHTTPStubs/JSON (6.1.0): + - OHHTTPStubs/JSON (8.0.0): - OHHTTPStubs/Core - - OHHTTPStubs/NSURLSession (6.1.0): + - OHHTTPStubs/NSURLSession (8.0.0): - OHHTTPStubs/Core - - OHHTTPStubs/OHPathHelpers (6.1.0) + - OHHTTPStubs/OHPathHelpers (8.0.0) - PocketSVG (2.4.2) - RATreeView (2.1.2) - TOWebViewController (2.2.8): - TOWebViewController/Core (= 2.2.8) - TOWebViewController/Core (2.2.8) - - XLForm (4.0.0) + - XLForm (4.0.1) DEPENDENCIES: - AFCSVParserResponseSerializer @@ -111,11 +111,11 @@ SPEC CHECKSUMS: CHCSVParser: 3bcc7bdb72111a31222e95d57eacceefe4e537e8 FontAwesomeKit: 3614979b3dbb0ec3f7fac1bd760b91f66c31db67 MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755 - OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0 + OHHTTPStubs: 9cbce6364bec557cc3439aa6bb7514670d780881 PocketSVG: c30139829206a43df2ec203880e3970531facba7 RATreeView: 380cde0090cfde21dc6ac29137f49d3b768fdd28 TOWebViewController: 953a24619d32f7aa1d9d4098a74885a9236f7348 - XLForm: 04110197c12187dd28a6c7295d3d8b95f4fdb4de + XLForm: b8d47a9a00fb6166981cb40de7169d70d611e9be PODFILE CHECKSUM: 1b60b2d866db7e542bbedcac696f4826fffe25a7 From 9513a41ddcfcd72a8895acb29bcb33272ebdbd66 Mon Sep 17 00:00:00 2001 From: Superbil Date: Sun, 28 Apr 2019 22:10:30 +0800 Subject: [PATCH 3/5] Fix warning, change to use new API - compiler warning about block --- hackfoldr-iOS/AppDelegate.m | 2 +- hackfoldr-iOS/HackfoldrClient.m | 14 +++++++------- .../AppIcon.appiconset/Contents.json | 7 ------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/hackfoldr-iOS/AppDelegate.m b/hackfoldr-iOS/AppDelegate.m index ddec553..7a994d3 100644 --- a/hackfoldr-iOS/AppDelegate.m +++ b/hackfoldr-iOS/AppDelegate.m @@ -102,7 +102,7 @@ - (BOOL)tryUpdateHackfoldrPageKeyWithURL:(NSURL *)url { return canHandle; } -- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void(^)(NSArray * __nullable restorableObjects))restorationHandler { +- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray> * _Nullable))restorationHandler { if ([userActivity.activityType isEqualToString:CSSearchableItemActionType]) { NSLog(@"CSSearchableItemActionType"); NSString *uniqueIdentifier = userActivity.userInfo[CSSearchableItemActivityIdentifier]; diff --git a/hackfoldr-iOS/HackfoldrClient.m b/hackfoldr-iOS/HackfoldrClient.m index 92f7e05..4d8d27c 100644 --- a/hackfoldr-iOS/HackfoldrClient.m +++ b/hackfoldr-iOS/HackfoldrClient.m @@ -71,10 +71,10 @@ - (HackfoldrTaskCompletionSource *)_taskCompletionWithPath:(NSString *)inPath { HackfoldrTaskCompletionSource *source = [HackfoldrTaskCompletionSource taskCompletionSource]; NSString *requestPath = [NSString stringWithFormat:@"%@.csv.json", inPath]; - source.connectionTask = [self GET:requestPath parameters:nil success:^(NSURLSessionDataTask *task, id fieldArray) { + source.connectionTask = [self GET:requestPath parameters:nil progress:nil success:^(NSURLSessionDataTask *task, id fieldArray) { HackfoldrPage *page = [[HackfoldrPage alloc] initWithKey:inPath fieldArray:fieldArray]; - _lastPage = [page copy]; - [source setResult:_lastPage]; + self->_lastPage = [page copy]; + [source setResult:self->_lastPage]; } failure:^(NSURLSessionDataTask *task, NSError *error) { [source setError:error]; }]; @@ -94,12 +94,12 @@ - (HackfoldrTaskCompletionSource *)taskCompletionFromGoogleSheetWithSheetKey:(NS AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:[NSURL URLWithString:@"https://docs.google.com/"]]; manager.responseSerializer = [[self class] CSVSerializer]; - NSString *requestKeyID = [keyID stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + NSString *requestKeyID = [keyID stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLPathAllowedCharacterSet]]; NSString *requestPath = [NSString stringWithFormat:@"spreadsheets/d/%@/export?format=csv&gid=0", requestKeyID]; - source.connectionTask = [manager GET:requestPath parameters:nil success:^(NSURLSessionDataTask *task, id csvFieldArray) { + source.connectionTask = [manager GET:requestPath parameters:nil progress:nil success:^(NSURLSessionDataTask *task, id csvFieldArray) { HackfoldrPage *page = [[HackfoldrPage alloc] initWithKey:keyID fieldArray:csvFieldArray]; - _lastPage = [page copy]; - [source setResult:_lastPage]; + self->_lastPage = [page copy]; + [source setResult:self->_lastPage]; } failure:^(NSURLSessionDataTask *task, NSError *error) { NSLog(@"error:%@ %@", error, task.response); [source setError:error]; diff --git a/hackfoldr-iOS/Images.xcassets/AppIcon.appiconset/Contents.json b/hackfoldr-iOS/Images.xcassets/AppIcon.appiconset/Contents.json index 50eec90..178313d 100644 --- a/hackfoldr-iOS/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/hackfoldr-iOS/Images.xcassets/AppIcon.appiconset/Contents.json @@ -176,13 +176,6 @@ "idiom" : "watch-marketing", "size" : "1024x1024", "scale" : "1x" - }, - { - "size" : "44x44", - "idiom" : "watch", - "scale" : "2x", - "role" : "longLook", - "subtype" : "42mm" } ], "info" : { From 2fa0828a9391544a000e04b2bd4bd976675de17f Mon Sep 17 00:00:00 2001 From: Superbil Date: Sun, 28 Apr 2019 22:04:02 +0800 Subject: [PATCH 4/5] Bump version to 1.5 --- hackfoldr-iOS.xcodeproj/project.pbxproj | 1 + hackfoldr-iOS/hackfoldr-iOS-Info.plist | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hackfoldr-iOS.xcodeproj/project.pbxproj b/hackfoldr-iOS.xcodeproj/project.pbxproj index aabd09a..02e8b40 100644 --- a/hackfoldr-iOS.xcodeproj/project.pbxproj +++ b/hackfoldr-iOS.xcodeproj/project.pbxproj @@ -365,6 +365,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, "zh-Hant", diff --git a/hackfoldr-iOS/hackfoldr-iOS-Info.plist b/hackfoldr-iOS/hackfoldr-iOS-Info.plist index 1ad4fed..5884fe2 100644 --- a/hackfoldr-iOS/hackfoldr-iOS-Info.plist +++ b/hackfoldr-iOS/hackfoldr-iOS-Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.4 + 1.5 CFBundleSignature ???? CFBundleURLTypes From 0a2901468ea130a1425bf390cdb621766ab3c858 Mon Sep 17 00:00:00 2001 From: Superbil Date: Sun, 28 Apr 2019 22:04:57 +0800 Subject: [PATCH 5/5] Update Changelog --- Changelog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Changelog.md b/Changelog.md index 6031961..aeabb71 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,10 @@ # Change Log +### 1.5 + +- Fix warning, change to use new API +- Update pods + ### 1.4 - Fix iPhone X layout problem