Skip to content

Commit 0fd63ac

Browse files
author
Julian Locke
authored
Merge pull request #385 from dropbox/prep-for-xcode-16
Bump deployment targets and fix openUrl calls
2 parents 2e44b6c + 0cd7707 commit 0fd63ac

File tree

6 files changed

+25
-22
lines changed

6 files changed

+25
-22
lines changed

‎ObjectiveDropboxOfficial.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
1818
s.requires_arc = true
1919

2020
s.osx.deployment_target = '10.13'
21-
s.ios.deployment_target = '11.0'
21+
s.ios.deployment_target = '12.0'
2222

2323
s.public_header_files = 'Source/ObjectiveDropboxOfficial/Shared/**/*.h', 'Source/ObjectiveDropboxOfficial/Headers/Umbrella/*.h'
2424
s.osx.public_header_files = 'Source/ObjectiveDropboxOfficial/Platform/ObjectiveDropboxOfficial_macOS/**/*.h'

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ Please ensure that the supplied view controller is the top-most controller, so t
317317
[DBClientsManager authorizeFromControllerV2:[UIApplication sharedApplication]
318318
controller:[[self class] topMostController]
319319
loadingStatusDelegate:nil
320-
openURL:^(NSURL *url) { [[UIApplication sharedApplication] openURL:url]; }
320+
openURL:^(NSURL *url) { [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil]; }
321321
scopeRequest:scopeRequest];
322322
}
323323

‎TestObjectiveDropbox/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
use_frameworks!
22

33
target "TestObjectiveDropbox_iOS" do
4-
platform :ios, '11.0'
4+
platform :ios, '12.0'
55
pod 'ObjectiveDropboxOfficial', :path => '../'
66
target "TestObjectiveDropbox_iOSTests" do
77
pod 'ObjectiveDropboxOfficial', :path => '../'
88
end
99
end
1010

1111
target "TestObjectiveDropbox_macOS" do
12-
platform :osx, '10.10'
12+
platform :osx, '10.13'
1313
pod 'ObjectiveDropboxOfficial', :path => '../'
1414
target "TestObjectiveDropbox_macOSTests" do
1515
pod 'ObjectiveDropboxOfficial', :path => '../'

‎TestObjectiveDropbox/TestObjectiveDropbox.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@
701701
GCC_C_LANGUAGE_STANDARD = gnu11;
702702
INFOPLIST_FILE = TestObjectiveDropbox_macOSTests/Info.plist;
703703
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
704-
MACOSX_DEPLOYMENT_TARGET = 10.10;
704+
MACOSX_DEPLOYMENT_TARGET = 10.13;
705705
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
706706
MTL_FAST_MATH = YES;
707707
PRODUCT_BUNDLE_IDENTIFIER = "com.getdropbox.TestObjectiveDropbox-macOSTests";
@@ -726,7 +726,7 @@
726726
GCC_C_LANGUAGE_STANDARD = gnu11;
727727
INFOPLIST_FILE = TestObjectiveDropbox_macOSTests/Info.plist;
728728
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
729-
MACOSX_DEPLOYMENT_TARGET = 10.10;
729+
MACOSX_DEPLOYMENT_TARGET = 10.13;
730730
MTL_FAST_MATH = YES;
731731
PRODUCT_BUNDLE_IDENTIFIER = "com.getdropbox.TestObjectiveDropbox-macOSTests";
732732
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -793,7 +793,7 @@
793793
COMBINE_HIDPI_IMAGES = YES;
794794
INFOPLIST_FILE = TestObjectiveDropbox_macOS/Info.plist;
795795
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
796-
MACOSX_DEPLOYMENT_TARGET = 10.10;
796+
MACOSX_DEPLOYMENT_TARGET = 10.13;
797797
PRODUCT_BUNDLE_IDENTIFIER = "com.dropbox.TestObjectiveDropbox-macOS-Test";
798798
PRODUCT_NAME = "$(TARGET_NAME)";
799799
SDKROOT = macosx;
@@ -811,7 +811,7 @@
811811
COMBINE_HIDPI_IMAGES = YES;
812812
INFOPLIST_FILE = TestObjectiveDropbox_macOS/Info.plist;
813813
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
814-
MACOSX_DEPLOYMENT_TARGET = 10.10;
814+
MACOSX_DEPLOYMENT_TARGET = 10.13;
815815
PRODUCT_BUNDLE_IDENTIFIER = "com.dropbox.TestObjectiveDropbox-macOS-Test";
816816
PRODUCT_NAME = "$(TARGET_NAME)";
817817
SDKROOT = macosx;
@@ -935,7 +935,7 @@
935935
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
936936
DEVELOPMENT_TEAM = NX6T6UBSFF;
937937
INFOPLIST_FILE = TestObjectiveDropbox_iOS/Info.plist;
938-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
938+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
939939
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
940940
PRODUCT_BUNDLE_IDENTIFIER = "com.dropbox.TestObjectiveDropbox-iOS-Test";
941941
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -953,7 +953,7 @@
953953
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
954954
DEVELOPMENT_TEAM = NX6T6UBSFF;
955955
INFOPLIST_FILE = TestObjectiveDropbox_iOS/Info.plist;
956-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
956+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
957957
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
958958
PRODUCT_BUNDLE_IDENTIFIER = "com.dropbox.TestObjectiveDropbox-iOS-Test";
959959
PRODUCT_NAME = "$(TARGET_NAME)";

‎TestObjectiveDropbox/TestObjectiveDropbox_iOS/AppDelegate.m

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
7575
return YES;
7676
}
7777

78-
- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
78+
79+
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
7980
BOOL urlHandled = NO;
8081
if ([[url absoluteString] containsString:@"openWith"]) {
8182
NSLog(@"Successfully retrieved openWith url");
@@ -85,17 +86,17 @@ - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
8586

8687
for (NSString *pair in pairs) {
8788
NSArray *kv = [pair componentsSeparatedByString:@"="];
88-
NSString *unEscapedValue = [[kv objectAtIndex:1] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
89+
NSString *unEscapedValue = [[kv objectAtIndex:1] stringByRemovingPercentEncoding];
8990
[urlData setObject:unEscapedValue forKey:[kv objectAtIndex:0]];
9091
}
9192

92-
DBOfficialAppConnector *connector = [[DBOfficialAppConnector alloc] initWithAppKey:[TestData new].fullDropboxAppKey
93-
canOpenURLWrapper:^BOOL(NSURL *url) {
94-
return [[UIApplication sharedApplication] canOpenURL:url];
95-
}
96-
openURLWrapper:^(NSURL *url) {
97-
[[UIApplication sharedApplication] openURL:url];
98-
}];
93+
DBOfficialAppConnector *connector = [[DBOfficialAppConnector alloc] initWithAppKey:[TestData new].fullDropboxAppKey
94+
canOpenURLWrapper:^BOOL(NSURL *url) {
95+
return [[UIApplication sharedApplication] canOpenURL:url];
96+
}
97+
openURLWrapper:^(NSURL *url) {
98+
[[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
99+
}];
99100

100101
DBOpenWithInfo *openWithInfo = [connector openWithInfoFromURL:url];
101102
[((ViewController *)self.window.rootViewController) setOpenWithInfoNSURL:openWithInfo];

‎TestObjectiveDropbox/TestObjectiveDropbox_iOS/ViewController.m

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ - (IBAction)codeFlowlinkButton:(id)sender {
4444
[DBClientsManager authorizeFromControllerV2:[UIApplication sharedApplication]
4545
controller:self
4646
loadingStatusDelegate:nil
47-
openURL:^(NSURL *url) { [[UIApplication sharedApplication] openURL:url]; }
47+
openURL:^(NSURL *url) {
48+
[[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
49+
}
4850
scopeRequest:scopeRequest];
4951
}
5052

@@ -91,7 +93,7 @@ - (IBAction)openWithButtonPressedRunTests:(id)sender {
9193
return [[UIApplication sharedApplication] canOpenURL:url];
9294
}
9395
openURLWrapper:^(NSURL *url) {
94-
[[UIApplication sharedApplication] openURL:url];
96+
[[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
9597
}];
9698
DBOpenWithInfo *openWithInfo = [DBOfficialAppConnector retriveOfficialDropboxAppOpenWithInfo];
9799

@@ -107,7 +109,7 @@ - (IBAction)openWithButtonPressedRunTests:(id)sender {
107109
return [[UIApplication sharedApplication] canOpenURL:url];
108110
}
109111
openURLWrapper:^(NSURL *url) {
110-
[[UIApplication sharedApplication] openURL:url];
112+
[[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
111113
}];
112114
[appConnector returnToDropboxApp:s_openWithInfoNSURL changesPending:NO];
113115
} else {

0 commit comments

Comments
 (0)