Merge pull request #205 from spotify/dflems/20210217-std

Standardize deployment targets & version bump

README.md

@@ -10,10 +10,10 @@
 
 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.
 
-- [x] 📱 iOS 8.0+
-- [x] 💻 OS X 10.9+
-- [x] ⌚️ watchOS 2.0+
-- [x] 📺 tvOS 9.0+
+- [x] 📱 iOS 10.0+
+- [x] 💻 OS X 10.12+
+- [x] ⌚️ watchOS 3.0+
+- [x] 📺 tvOS 10.0+
 
 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.
 

SPTDataLoader.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
     s.name         = "SPTDataLoader"
-    s.version      = "2.1.0"
+    s.version      = "2.1.1"
     s.summary      = "SPTDataLoader is Spotify’s HTTP library for Objective-C"
 
     s.description  = <<-DESC
@@ -11,10 +11,10 @@ Pod::Spec.new do |s|
                         making HTTP requests.
                      DESC
 
-    s.ios.deployment_target     = "8.0"
-    s.osx.deployment_target     = "10.9"
-    s.tvos.deployment_target    = "9.0"
-    s.watchos.deployment_target = "2.0"
+    s.ios.deployment_target     = "10.0"
+    s.osx.deployment_target     = "10.12"
+    s.tvos.deployment_target    = "10.0"
+    s.watchos.deployment_target = "3.0"
 
     s.homepage          = "https://github.com/spotify/SPTDataLoader"
     s.social_media_url  = "https://twitter.com/spotifyeng"
@@ -39,13 +39,7 @@ Pod::Spec.new do |s|
 
     s.subspec "Swift" do |sp|
         sp.dependency "SPTDataLoader/Core"
-
         sp.source_files  = "Sources/SPTDataLoaderSwift/**/*.swift"
-
-        sp.ios.deployment_target      = "10.0"
-        sp.osx.deployment_target      = "10.12"
-        sp.tvos.deployment_target     = "10.0"
-        sp.watchos.deployment_target  = "3.0"
     end
 
 end

SPTDataLoader.xcodeproj/project.pbxproj

@@ -857,49 +857,33 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEFINES_MODULE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
 		F5B6409B250060D1004B9B83 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEFINES_MODULE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};
 		F5B640A72500633C004B9B83 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = "$(SRCROOT)/Tests/SPTDataLoaderSwift/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
 		F5B640A82500633C004B9B83 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = "$(SRCROOT)/Tests/SPTDataLoaderSwift/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};

SPTDataLoaderDemo.xcodeproj/project.pbxproj

@@ -37,6 +37,20 @@
 			remoteGlobalIDString = 050E06951A10C62100A10A0E;
 			remoteInfo = SPTDataLoaderTests;
 		};
+		69F804AC25DDACFB0082D4D2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0513AA991C6067E000A25F54 /* SPTDataLoader.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = F5B64096250060D1004B9B83;
+			remoteInfo = SPTDataLoaderSwift;
+		};
+		69F804AE25DDACFB0082D4D2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0513AA991C6067E000A25F54 /* SPTDataLoader.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = F5B640A12500633C004B9B83;
+			remoteInfo = SPTDataLoaderSwiftTests;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -118,6 +132,8 @@
 			children = (
 				0513AAA41C6067E000A25F54 /* libSPTDataLoader.a */,
 				0513AAA61C6067E000A25F54 /* SPTDataLoaderTests.xctest */,
+				69F804AD25DDACFB0082D4D2 /* libSPTDataLoaderSwift.a */,
+				69F804AF25DDACFB0082D4D2 /* SPTDataLoaderSwiftTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -265,6 +281,20 @@
 			remoteRef = 0513AAA51C6067E000A25F54 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		69F804AD25DDACFB0082D4D2 /* libSPTDataLoaderSwift.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libSPTDataLoaderSwift.a;
+			remoteRef = 69F804AC25DDACFB0082D4D2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		69F804AF25DDACFB0082D4D2 /* SPTDataLoaderSwiftTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = SPTDataLoaderSwiftTests.xctest;
+			remoteRef = 69F804AE25DDACFB0082D4D2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -326,7 +356,6 @@
 					"$(inherited)",
 					include,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = YES;
 			};
 			name = Debug;
@@ -340,7 +369,6 @@
 					"$(inherited)",
 					include,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

SPTDataLoaderFramework.xcodeproj/project.pbxproj

@@ -1139,7 +1139,6 @@
 		05A638141C46B53800061E37 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoader-iOS";
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -1150,7 +1149,6 @@
 		05A638151C46B53800061E37 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoader-iOS";
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -1161,134 +1159,102 @@
 		F5A73169250075CF00405927 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-iOS";
 				PRODUCT_NAME = SPTDataLoaderSwift;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
 		F5A7316A250075CF00405927 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-iOS";
 				PRODUCT_NAME = SPTDataLoaderSwift;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};
 		F5A7319B25007D3800405927 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-OSX";
 				PRODUCT_NAME = SPTDataLoaderSwift;
 				SDKROOT = macosx;
 				SUPPORTED_PLATFORMS = macosx;
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
 		F5A7319C25007D3800405927 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-OSX";
 				PRODUCT_NAME = SPTDataLoaderSwift;
 				SDKROOT = macosx;
 				SUPPORTED_PLATFORMS = macosx;
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};
 		F5A731AD25007D4000405927 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-TV";
 				PRODUCT_NAME = SPTDataLoaderSwift;
 				SDKROOT = appletvos;
 				SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
 		F5A731AE25007D4000405927 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-TV";
 				PRODUCT_NAME = SPTDataLoaderSwift;
 				SDKROOT = appletvos;
 				SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};
 		F5A731BF25007D4600405927 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-Watch";
 				PRODUCT_NAME = SPTDataLoaderSwift;
 				SDKROOT = watchos;
 				SUPPORTED_PLATFORMS = "watchsimulator watchos";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
 				TARGETED_DEVICE_FAMILY = 4;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
 		F5A731C025007D4600405927 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.spotify.SPTDataLoaderSwift-Watch";
 				PRODUCT_NAME = SPTDataLoaderSwift;
 				SDKROOT = watchos;
 				SUPPORTED_PLATFORMS = "watchsimulator watchos";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "SPTDataLoader-Swift.h";
 				TARGETED_DEVICE_FAMILY = 4;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};

ci/spotify_os.xcconfig

@@ -27,10 +27,10 @@ ARCHS[sdk=watchsimulator*] = i386
 ARCHS[sdk=appletvos*] = arm64
 ARCHS[sdk=appletvsimulator*] = x86_64
 
-IPHONEOS_DEPLOYMENT_TARGET = 8.0
-WATCHOS_DEPLOYMENT_TARGET = 2.0
-TVOS_DEPLOYMENT_TARGET = 9.0
-MACOSX_DEPLOYMENT_TARGET = 10.10
+IPHONEOS_DEPLOYMENT_TARGET = 10.0
+WATCHOS_DEPLOYMENT_TARGET = 3.0
+TVOS_DEPLOYMENT_TARGET = 10.0
+MACOSX_DEPLOYMENT_TARGET = 10.12
 
 ENABLE_NS_ASSERTIONS_Debug = YES
 ENABLE_NS_ASSERTIONS_Release = NO

demo/AppDelegate.m

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

demo/ViewController.m

@@ -41,7 +41,7 @@ - (IBAction)logInButtonTouchedUpInside:(id)sender
     accountsComponents.queryItems = @[ responseTypeQueryItem, clientIDQueryItem, scopeQueryItem, redirectURIQueryItem, stateQueryItem ];
 
     NSURL *URL = accountsComponents.URL;
-    [[UIApplication sharedApplication] openURL:URL];
+    [[UIApplication sharedApplication] openURL:URL options:@{} completionHandler:nil];
 }
 
 @end