Skip to content

Commit 7ae65cc

Browse files
dflemsdflems
authored
Merge pull request #203 from kmcbride/prepare-2.1.0
Bump to 2.1.0
2 parents 3ec513e + b343c60 commit 7ae65cc

File tree

142 files changed

+178
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+178
-149
lines changed

‎CHANGELOG.md

+12

‎Framework/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.1.1</string>
18+
<string>2.1.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
2222
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>NSHumanReadableCopyright</key>
24-
<string>Copyright © 2020 Spotify. All rights reserved.</string>
24+
<string>Copyright © 2021 Spotify. All rights reserved.</string>
2525
<key>NSPrincipalClass</key>
2626
<string></string>
2727
</dict>

‎Framework/SPTDataLoader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎SPTDataLoader.podspec

+25-8
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.0.0"
4+
s.version = "2.1.0"
55
s.summary = "SPTDataLoader is Spotify’s HTTP library for Objective-C"
66

77
s.description = <<-DESC
@@ -23,12 +23,29 @@ Pod::Spec.new do |s|
2323
"Will Sackfield" => "[email protected]"
2424
}
2525

26-
s.source = { :git => "https://github.com/spotify/SPTDataLoader.git", :tag => s.version }
27-
s.source_files = "include/SPTDataLoader/*.h", "SPTDataLoader/*.{h,m}"
28-
s.public_header_files = "include/SPTDataLoader/*.h"
29-
s.framework = "Security"
30-
s.xcconfig = {
31-
"OTHER_LDFLAGS" => "-lObjC"
32-
}
26+
s.source = { :git => "https://github.com/spotify/SPTDataLoader.git", :tag => s.version }
27+
s.swift_version = "5.1"
28+
29+
s.default_subspec = "Core"
30+
31+
s.subspec "Core" do |sp|
32+
sp.source_files = "include/SPTDataLoader/*.h", "Sources/SPTDataLoader/*.{h,m}"
33+
sp.public_header_files = "include/SPTDataLoader/*.h"
34+
sp.framework = "Security"
35+
sp.xcconfig = {
36+
"OTHER_LDFLAGS" => "-lObjC"
37+
}
38+
end
39+
40+
s.subspec "Swift" do |sp|
41+
sp.dependency "SPTDataLoader/Core"
42+
43+
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"
49+
end
3350

3451
end

‎Sources/SPTDataLoader/NSDictionary+HeaderSize.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/NSDictionary+HeaderSize.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoader.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderBlockWrapper.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderCancellationTokenFactory.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderCancellationTokenFactoryImplementation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderCancellationTokenFactoryImplementation.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderCancellationTokenImplementation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderCancellationTokenImplementation.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderExponentialTimer.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderFactory+Private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderFactory.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderImplementation+Private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderRateLimiter+Private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderRateLimiter.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderRequest+Private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderRequest.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderRequestResponseHandler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderRequestTaskHandler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderRequestTaskHandler.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderResolver.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderResolverAddress.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderResolverAddress.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderResponse+Private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderResponse.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderServerTrustPolicy+Private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderServerTrustPolicy.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderService+Private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderService.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderServiceSessionSelector.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderServiceSessionSelector.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderTimeProvider.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderTimeProviderImplementation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoader/SPTDataLoaderTimeProviderImplementation.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33
44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoaderSwift/DataLoader.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33

44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoaderSwift/DataLoaderError.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33

44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoaderSwift/DataLoaderWrapper.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33

44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoaderSwift/Request.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33

44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoaderSwift/Response.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33

44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoaderSwift/ResponseDecoder.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33

44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoaderSwift/ResponseSerializer.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33

44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoaderSwift/SPTDataLoader.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33

44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoaderSwift/Utilities/AccessLock.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33

44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

‎Sources/SPTDataLoaderSwift/Utilities/Result+Convenience.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2020 Spotify AB.
2+
Copyright (c) 2015-2021 Spotify AB.
33

44
Licensed to the Apache Software Foundation (ASF) under one
55
or more contributor license agreements. See the NOTICE file

0 commit comments

Comments
 (0)