Skip to content

Commit 5c083b0

Browse files
dflemsdflems
authored
Merge pull request #205 from spotify/dflems/20210217-std
Standardize deployment targets & version bump
2 parents c406ac9 + 434f667 commit 5c083b0

File tree

8 files changed

+45
-73
lines changed

8 files changed

+45
-73
lines changed

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010

1111
Authentication and back-off logic is a pain, let's do it once and forget about it! This is a library that allows you to centralise this logic and forget about the ugly parts of making HTTP requests.
1212

13-
- [x] 📱 iOS 8.0+
14-
- [x] 💻 OS X 10.9+
15-
- [x] ⌚️ watchOS 2.0+
16-
- [x] 📺 tvOS 9.0+
13+
- [x] 📱 iOS 10.0+
14+
- [x] 💻 OS X 10.12+
15+
- [x] ⌚️ watchOS 3.0+
16+
- [x] 📺 tvOS 10.0+
1717

1818
Yet another networking library? Well apart from some unique benefits such as built-in rate limiting and powerful request authentication, a significant benefit for you is that any tagged version has been tested in production. We only tag a new release once it’s been used for two weeks by the Spotify app (which has millions of active users a day). As such you can be sure tagged versions are as stable as possible.
1919

‎SPTDataLoader.podspec

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "SPTDataLoader"
4-
s.version = "2.1.0"
4+
s.version = "2.1.1"
55
s.summary = "SPTDataLoader is Spotify’s HTTP library for Objective-C"
66

77
s.description = <<-DESC
@@ -11,10 +11,10 @@ Pod::Spec.new do |s|
1111
making HTTP requests.
1212
DESC
1313

14-
s.ios.deployment_target = "8.0"
15-
s.osx.deployment_target = "10.9"
16-
s.tvos.deployment_target = "9.0"
17-
s.watchos.deployment_target = "2.0"
14+
s.ios.deployment_target = "10.0"
15+
s.osx.deployment_target = "10.12"
16+
s.tvos.deployment_target = "10.0"
17+
s.watchos.deployment_target = "3.0"
1818

1919
s.homepage = "https://github.com/spotify/SPTDataLoader"
2020
s.social_media_url = "https://twitter.com/spotifyeng"
@@ -39,13 +39,7 @@ Pod::Spec.new do |s|
3939

4040
s.subspec "Swift" do |sp|
4141
sp.dependency "SPTDataLoader/Core"
42-
4342
sp.source_files = "Sources/SPTDataLoaderSwift/**/*.swift"
44-
45-
sp.ios.deployment_target = "10.0"
46-
sp.osx.deployment_target = "10.12"
47-
sp.tvos.deployment_target = "10.0"
48-
sp.watchos.deployment_target = "3.0"
4943
end
5044

5145
end

‎SPTDataLoader.xcodeproj/project.pbxproj

-16
Original file line numberDiff line numberDiff line change
@@ -857,49 +857,33 @@
857857
isa = XCBuildConfiguration;
858858
buildSettings = {
859859
DEFINES_MODULE = YES;
860-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
861-
MACOSX_DEPLOYMENT_TARGET = 10.12;
862860
PRODUCT_NAME = "$(TARGET_NAME)";
863-
TVOS_DEPLOYMENT_TARGET = 10.0;
864-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
865861
};
866862
name = Debug;
867863
};
868864
F5B6409B250060D1004B9B83 /* Release */ = {
869865
isa = XCBuildConfiguration;
870866
buildSettings = {
871867
DEFINES_MODULE = YES;
872-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
873-
MACOSX_DEPLOYMENT_TARGET = 10.12;
874868
PRODUCT_NAME = "$(TARGET_NAME)";
875-
TVOS_DEPLOYMENT_TARGET = 10.0;
876-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
877869
};
878870
name = Release;
879871
};
880872
F5B640A72500633C004B9B83 /* Debug */ = {
881873
isa = XCBuildConfiguration;
882874
buildSettings = {
883875
INFOPLIST_FILE = "$(SRCROOT)/Tests/SPTDataLoaderSwift/Info.plist";
884-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
885-
MACOSX_DEPLOYMENT_TARGET = 10.12;
886876
PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.$(PRODUCT_NAME:rfc1034identifier)";
887877
PRODUCT_NAME = "$(TARGET_NAME)";
888-
TVOS_DEPLOYMENT_TARGET = 10.0;
889-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
890878
};
891879
name = Debug;
892880
};
893881
F5B640A82500633C004B9B83 /* Release */ = {
894882
isa = XCBuildConfiguration;
895883
buildSettings = {
896884
INFOPLIST_FILE = "$(SRCROOT)/Tests/SPTDataLoaderSwift/Info.plist";
897-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
898-
MACOSX_DEPLOYMENT_TARGET = 10.12;
899885
PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.$(PRODUCT_NAME:rfc1034identifier)";
900886
PRODUCT_NAME = "$(TARGET_NAME)";
901-
TVOS_DEPLOYMENT_TARGET = 10.0;
902-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
903887
};
904888
name = Release;
905889
};

‎SPTDataLoaderDemo.xcodeproj/project.pbxproj

+30-2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,20 @@
3737
remoteGlobalIDString = 050E06951A10C62100A10A0E;
3838
remoteInfo = SPTDataLoaderTests;
3939
};
40+
69F804AC25DDACFB0082D4D2 /* PBXContainerItemProxy */ = {
41+
isa = PBXContainerItemProxy;
42+
containerPortal = 0513AA991C6067E000A25F54 /* SPTDataLoader.xcodeproj */;
43+
proxyType = 2;
44+
remoteGlobalIDString = F5B64096250060D1004B9B83;
45+
remoteInfo = SPTDataLoaderSwift;
46+
};
47+
69F804AE25DDACFB0082D4D2 /* PBXContainerItemProxy */ = {
48+
isa = PBXContainerItemProxy;
49+
containerPortal = 0513AA991C6067E000A25F54 /* SPTDataLoader.xcodeproj */;
50+
proxyType = 2;
51+
remoteGlobalIDString = F5B640A12500633C004B9B83;
52+
remoteInfo = SPTDataLoaderSwiftTests;
53+
};
4054
/* End PBXContainerItemProxy section */
4155

4256
/* Begin PBXCopyFilesBuildPhase section */
@@ -118,6 +132,8 @@
118132
children = (
119133
0513AAA41C6067E000A25F54 /* libSPTDataLoader.a */,
120134
0513AAA61C6067E000A25F54 /* SPTDataLoaderTests.xctest */,
135+
69F804AD25DDACFB0082D4D2 /* libSPTDataLoaderSwift.a */,
136+
69F804AF25DDACFB0082D4D2 /* SPTDataLoaderSwiftTests.xctest */,
121137
);
122138
name = Products;
123139
sourceTree = "<group>";
@@ -265,6 +281,20 @@
265281
remoteRef = 0513AAA51C6067E000A25F54 /* PBXContainerItemProxy */;
266282
sourceTree = BUILT_PRODUCTS_DIR;
267283
};
284+
69F804AD25DDACFB0082D4D2 /* libSPTDataLoaderSwift.a */ = {
285+
isa = PBXReferenceProxy;
286+
fileType = archive.ar;
287+
path = libSPTDataLoaderSwift.a;
288+
remoteRef = 69F804AC25DDACFB0082D4D2 /* PBXContainerItemProxy */;
289+
sourceTree = BUILT_PRODUCTS_DIR;
290+
};
291+
69F804AF25DDACFB0082D4D2 /* SPTDataLoaderSwiftTests.xctest */ = {
292+
isa = PBXReferenceProxy;
293+
fileType = wrapper.cfbundle;
294+
path = SPTDataLoaderSwiftTests.xctest;
295+
remoteRef = 69F804AE25DDACFB0082D4D2 /* PBXContainerItemProxy */;
296+
sourceTree = BUILT_PRODUCTS_DIR;
297+
};
268298
/* End PBXReferenceProxy section */
269299

270300
/* Begin PBXResourcesBuildPhase section */
@@ -326,7 +356,6 @@
326356
"$(inherited)",
327357
include,
328358
);
329-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
330359
ONLY_ACTIVE_ARCH = YES;
331360
};
332361
name = Debug;
@@ -340,7 +369,6 @@
340369
"$(inherited)",
341370
include,
342371
);
343-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
344372
VALIDATE_PRODUCT = YES;
345373
};
346374
name = Release;

‎SPTDataLoaderFramework.xcodeproj/project.pbxproj

-34
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,6 @@
11391139
05A638141C46B53800061E37 /* Debug */ = {
11401140
isa = XCBuildConfiguration;
11411141
buildSettings = {
1142-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
11431142
PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoader-iOS";
11441143
SDKROOT = iphoneos;
11451144
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -1150,7 +1149,6 @@
11501149
05A638151C46B53800061E37 /* Release */ = {
11511150
isa = XCBuildConfiguration;
11521151
buildSettings = {
1153-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
11541152
PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoader-iOS";
11551153
SDKROOT = iphoneos;
11561154
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -1161,134 +1159,102 @@
11611159
F5A73169250075CF00405927 /* Debug */ = {
11621160
isa = XCBuildConfiguration;
11631161
buildSettings = {
1164-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1165-
MACOSX_DEPLOYMENT_TARGET = 10.12;
11661162
PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-iOS";
11671163
PRODUCT_NAME = SPTDataLoaderSwift;
11681164
SDKROOT = iphoneos;
11691165
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
11701166
SWIFT_INSTALL_OBJC_HEADER = NO;
11711167
SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
11721168
TARGETED_DEVICE_FAMILY = "1,2";
1173-
TVOS_DEPLOYMENT_TARGET = 10.0;
1174-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
11751169
};
11761170
name = Debug;
11771171
};
11781172
F5A7316A250075CF00405927 /* Release */ = {
11791173
isa = XCBuildConfiguration;
11801174
buildSettings = {
1181-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1182-
MACOSX_DEPLOYMENT_TARGET = 10.12;
11831175
PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-iOS";
11841176
PRODUCT_NAME = SPTDataLoaderSwift;
11851177
SDKROOT = iphoneos;
11861178
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
11871179
SWIFT_INSTALL_OBJC_HEADER = NO;
11881180
SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
11891181
TARGETED_DEVICE_FAMILY = "1,2";
1190-
TVOS_DEPLOYMENT_TARGET = 10.0;
1191-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
11921182
};
11931183
name = Release;
11941184
};
11951185
F5A7319B25007D3800405927 /* Debug */ = {
11961186
isa = XCBuildConfiguration;
11971187
buildSettings = {
1198-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1199-
MACOSX_DEPLOYMENT_TARGET = 10.12;
12001188
PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-OSX";
12011189
PRODUCT_NAME = SPTDataLoaderSwift;
12021190
SDKROOT = macosx;
12031191
SUPPORTED_PLATFORMS = macosx;
12041192
SWIFT_INSTALL_OBJC_HEADER = NO;
12051193
SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
1206-
TVOS_DEPLOYMENT_TARGET = 10.0;
1207-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
12081194
};
12091195
name = Debug;
12101196
};
12111197
F5A7319C25007D3800405927 /* Release */ = {
12121198
isa = XCBuildConfiguration;
12131199
buildSettings = {
1214-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1215-
MACOSX_DEPLOYMENT_TARGET = 10.12;
12161200
PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-OSX";
12171201
PRODUCT_NAME = SPTDataLoaderSwift;
12181202
SDKROOT = macosx;
12191203
SUPPORTED_PLATFORMS = macosx;
12201204
SWIFT_INSTALL_OBJC_HEADER = NO;
12211205
SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
1222-
TVOS_DEPLOYMENT_TARGET = 10.0;
1223-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
12241206
};
12251207
name = Release;
12261208
};
12271209
F5A731AD25007D4000405927 /* Debug */ = {
12281210
isa = XCBuildConfiguration;
12291211
buildSettings = {
1230-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1231-
MACOSX_DEPLOYMENT_TARGET = 10.12;
12321212
PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-TV";
12331213
PRODUCT_NAME = SPTDataLoaderSwift;
12341214
SDKROOT = appletvos;
12351215
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
12361216
SWIFT_INSTALL_OBJC_HEADER = NO;
12371217
SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
12381218
TARGETED_DEVICE_FAMILY = 3;
1239-
TVOS_DEPLOYMENT_TARGET = 10.0;
1240-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
12411219
};
12421220
name = Debug;
12431221
};
12441222
F5A731AE25007D4000405927 /* Release */ = {
12451223
isa = XCBuildConfiguration;
12461224
buildSettings = {
1247-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1248-
MACOSX_DEPLOYMENT_TARGET = 10.12;
12491225
PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-TV";
12501226
PRODUCT_NAME = SPTDataLoaderSwift;
12511227
SDKROOT = appletvos;
12521228
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
12531229
SWIFT_INSTALL_OBJC_HEADER = NO;
12541230
SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
12551231
TARGETED_DEVICE_FAMILY = 3;
1256-
TVOS_DEPLOYMENT_TARGET = 10.0;
1257-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
12581232
};
12591233
name = Release;
12601234
};
12611235
F5A731BF25007D4600405927 /* Debug */ = {
12621236
isa = XCBuildConfiguration;
12631237
buildSettings = {
1264-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1265-
MACOSX_DEPLOYMENT_TARGET = 10.12;
12661238
PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-Watch";
12671239
PRODUCT_NAME = SPTDataLoaderSwift;
12681240
SDKROOT = watchos;
12691241
SUPPORTED_PLATFORMS = "watchsimulator watchos";
12701242
SWIFT_INSTALL_OBJC_HEADER = NO;
12711243
SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
12721244
TARGETED_DEVICE_FAMILY = 4;
1273-
TVOS_DEPLOYMENT_TARGET = 10.0;
1274-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
12751245
};
12761246
name = Debug;
12771247
};
12781248
F5A731C025007D4600405927 /* Release */ = {
12791249
isa = XCBuildConfiguration;
12801250
buildSettings = {
1281-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1282-
MACOSX_DEPLOYMENT_TARGET = 10.12;
12831251
PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-Watch";
12841252
PRODUCT_NAME = SPTDataLoaderSwift;
12851253
SDKROOT = watchos;
12861254
SUPPORTED_PLATFORMS = "watchsimulator watchos";
12871255
SWIFT_INSTALL_OBJC_HEADER = NO;
12881256
SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
12891257
TARGETED_DEVICE_FAMILY = 4;
1290-
TVOS_DEPLOYMENT_TARGET = 10.0;
1291-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
12921258
};
12931259
name = Release;
12941260
};

‎ci/spotify_os.xcconfig

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ ARCHS[sdk=watchsimulator*] = i386
2727
ARCHS[sdk=appletvos*] = arm64
2828
ARCHS[sdk=appletvsimulator*] = x86_64
2929

30-
IPHONEOS_DEPLOYMENT_TARGET = 8.0
31-
WATCHOS_DEPLOYMENT_TARGET = 2.0
32-
TVOS_DEPLOYMENT_TARGET = 9.0
33-
MACOSX_DEPLOYMENT_TARGET = 10.10
30+
IPHONEOS_DEPLOYMENT_TARGET = 10.0
31+
WATCHOS_DEPLOYMENT_TARGET = 3.0
32+
TVOS_DEPLOYMENT_TARGET = 10.0
33+
MACOSX_DEPLOYMENT_TARGET = 10.12
3434

3535
ENABLE_NS_ASSERTIONS_Debug = YES
3636
ENABLE_NS_ASSERTIONS_Release = NO

‎demo/AppDelegate.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
5656
return YES;
5757
}
5858

59-
- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url
59+
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
6060
{
6161
NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO];
6262
if ([components.scheme isEqualToString:@"sptdataloaderdemo"] && [components.host isEqualToString:@"login"]) {

‎demo/ViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ - (IBAction)logInButtonTouchedUpInside:(id)sender
4141
accountsComponents.queryItems = @[ responseTypeQueryItem, clientIDQueryItem, scopeQueryItem, redirectURIQueryItem, stateQueryItem ];
4242

4343
NSURL *URL = accountsComponents.URL;
44-
[[UIApplication sharedApplication] openURL:URL];
44+
[[UIApplication sharedApplication] openURL:URL options:@{} completionHandler:nil];
4545
}
4646

4747
@end

0 commit comments

Comments
 (0)