Skip to content

Commit 5b2d512

Browse files
author
Julian Locke
authored
Merge pull request #355 from dropbox/iOS-16-prep
Prepare for Xcode 14
2 parents c56ba72 + dfb8d90 commit 5b2d512

File tree

8 files changed

+56
-51
lines changed

8 files changed

+56
-51
lines changed

ObjectiveDropboxOfficial.podspec

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

1616
s.osx.deployment_target = '10.10'
17-
s.ios.deployment_target = '9.0'
17+
s.ios.deployment_target = '11.0'
1818

1919
s.public_header_files = 'Source/ObjectiveDropboxOfficial/Shared/**/*.h', 'Source/ObjectiveDropboxOfficial/Headers/Umbrella/*.h'
2020
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
@@ -57,7 +57,7 @@ NOTE: Please do not rely on `master` in production. Please instead use one of ou
5757

5858
## System requirements
5959

60-
- iOS 9.0+
60+
- iOS 11.0+
6161
- macOS 10.10+
6262
- Xcode 8+ (11.0+ if you use Carthage)
6363

TestObjectiveDropbox/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use_frameworks!
22

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

TestObjectiveDropbox/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- ObjectiveDropboxOfficial (6.2.3)
2+
- ObjectiveDropboxOfficial (6.3.2)
33

44
DEPENDENCIES:
55
- ObjectiveDropboxOfficial (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
99
:path: "../"
1010

1111
SPEC CHECKSUMS:
12-
ObjectiveDropboxOfficial: fe206ce8c0bc49976c249d472db7fdbc53ebbd53
12+
ObjectiveDropboxOfficial: a3981e58f087e056b26d02dfeb994d6af21b980f
1313

14-
PODFILE CHECKSUM: 9fd03646bd8426ab0dfe9b4eaa0407fd51d7b8ff
14+
PODFILE CHECKSUM: 34ac610e6620890c744476957559b5cef359d526
1515

16-
COCOAPODS: 1.11.2
16+
COCOAPODS: 1.11.3

TestObjectiveDropbox/TestObjectiveDropbox.xcodeproj/project.pbxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@
353353
F27BA7FC1D63BBA100FB7864 /* Project object */ = {
354354
isa = PBXProject;
355355
attributes = {
356-
LastUpgradeCheck = 1140;
356+
LastUpgradeCheck = 1400;
357357
ORGANIZATIONNAME = Dropbox;
358358
TargetAttributes = {
359359
0C1FE64F2603031100D879BB = {
@@ -862,7 +862,7 @@
862862
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
863863
GCC_WARN_UNUSED_FUNCTION = YES;
864864
GCC_WARN_UNUSED_VARIABLE = YES;
865-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
865+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
866866
MTL_ENABLE_DEBUG_INFO = YES;
867867
ONLY_ACTIVE_ARCH = YES;
868868
SDKROOT = iphoneos;
@@ -912,7 +912,7 @@
912912
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
913913
GCC_WARN_UNUSED_FUNCTION = YES;
914914
GCC_WARN_UNUSED_VARIABLE = YES;
915-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
915+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
916916
MTL_ENABLE_DEBUG_INFO = NO;
917917
SDKROOT = iphoneos;
918918
TARGETED_DEVICE_FAMILY = "1,2";
@@ -931,7 +931,7 @@
931931
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
932932
DEVELOPMENT_TEAM = NX6T6UBSFF;
933933
INFOPLIST_FILE = TestObjectiveDropbox_iOS/Info.plist;
934-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
934+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
935935
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
936936
PRODUCT_BUNDLE_IDENTIFIER = "com.dropbox.TestObjectiveDropbox-iOS-Test";
937937
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -949,7 +949,7 @@
949949
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
950950
DEVELOPMENT_TEAM = NX6T6UBSFF;
951951
INFOPLIST_FILE = TestObjectiveDropbox_iOS/Info.plist;
952-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
952+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
953953
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
954954
PRODUCT_BUNDLE_IDENTIFIER = "com.dropbox.TestObjectiveDropbox-iOS-Test";
955955
PRODUCT_NAME = "$(TARGET_NAME)";

TestObjectiveDropbox/TestObjectiveDropbox.xcodeproj/xcshareddata/xcschemes/TestObjectiveDropbox_iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1400"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

TestObjectiveDropbox/TestObjectiveDropbox.xcodeproj/xcshareddata/xcschemes/TestObjectiveDropbox_macOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1400"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

TestObjectiveDropbox/TestObjectiveDropbox_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,92 +2,97 @@
22
"images" : [
33
{
44
"idiom" : "iphone",
5-
"size" : "20x20",
6-
"scale" : "2x"
5+
"scale" : "2x",
6+
"size" : "20x20"
77
},
88
{
99
"idiom" : "iphone",
10-
"size" : "20x20",
11-
"scale" : "3x"
10+
"scale" : "3x",
11+
"size" : "20x20"
1212
},
1313
{
1414
"idiom" : "iphone",
15-
"size" : "29x29",
16-
"scale" : "2x"
15+
"scale" : "2x",
16+
"size" : "29x29"
1717
},
1818
{
1919
"idiom" : "iphone",
20-
"size" : "29x29",
21-
"scale" : "3x"
20+
"scale" : "3x",
21+
"size" : "29x29"
2222
},
2323
{
2424
"idiom" : "iphone",
25-
"size" : "40x40",
26-
"scale" : "2x"
25+
"scale" : "2x",
26+
"size" : "40x40"
2727
},
2828
{
2929
"idiom" : "iphone",
30-
"size" : "40x40",
31-
"scale" : "3x"
30+
"scale" : "3x",
31+
"size" : "40x40"
3232
},
3333
{
3434
"idiom" : "iphone",
35-
"size" : "60x60",
36-
"scale" : "2x"
35+
"scale" : "2x",
36+
"size" : "60x60"
3737
},
3838
{
3939
"idiom" : "iphone",
40-
"size" : "60x60",
41-
"scale" : "3x"
40+
"scale" : "3x",
41+
"size" : "60x60"
4242
},
4343
{
4444
"idiom" : "ipad",
45-
"size" : "20x20",
46-
"scale" : "1x"
45+
"scale" : "1x",
46+
"size" : "20x20"
4747
},
4848
{
4949
"idiom" : "ipad",
50-
"size" : "20x20",
51-
"scale" : "2x"
50+
"scale" : "2x",
51+
"size" : "20x20"
5252
},
5353
{
5454
"idiom" : "ipad",
55-
"size" : "29x29",
56-
"scale" : "1x"
55+
"scale" : "1x",
56+
"size" : "29x29"
5757
},
5858
{
5959
"idiom" : "ipad",
60-
"size" : "29x29",
61-
"scale" : "2x"
60+
"scale" : "2x",
61+
"size" : "29x29"
6262
},
6363
{
6464
"idiom" : "ipad",
65-
"size" : "40x40",
66-
"scale" : "1x"
65+
"scale" : "1x",
66+
"size" : "40x40"
6767
},
6868
{
6969
"idiom" : "ipad",
70-
"size" : "40x40",
71-
"scale" : "2x"
70+
"scale" : "2x",
71+
"size" : "40x40"
7272
},
7373
{
7474
"idiom" : "ipad",
75-
"size" : "76x76",
76-
"scale" : "1x"
75+
"scale" : "1x",
76+
"size" : "76x76"
7777
},
7878
{
7979
"idiom" : "ipad",
80-
"size" : "76x76",
81-
"scale" : "2x"
80+
"scale" : "2x",
81+
"size" : "76x76"
8282
},
8383
{
8484
"idiom" : "ipad",
85-
"size" : "83.5x83.5",
86-
"scale" : "2x"
85+
"scale" : "2x",
86+
"size" : "83.5x83.5"
87+
},
88+
{
89+
"idiom" : "ios-marketing",
90+
"scale" : "1x",
91+
"size" : "1024x1024"
8792
}
8893
],
8994
"info" : {
90-
"version" : 1,
91-
"author" : "xcode"
95+
"author" : "xcode",
96+
"version" : 1
9297
}
93-
}
98+
}

0 commit comments

Comments
 (0)