Skip to content

Commit 6c6f71d

Browse files
authored
Merge pull request #5 from shingt/xcode-12
Use Xcode 12
2 parents e9d687f + 8d54534 commit 6c6f71d

File tree

4 files changed

+25
-31
lines changed

4 files changed

+25
-31
lines changed

GitHub-GraphQL-API-Example-iOS.xcodeproj/project.pbxproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
isa = PBXProject;
119119
attributes = {
120120
LastSwiftUpdateCheck = 0810;
121-
LastUpgradeCheck = 1150;
121+
LastUpgradeCheck = 1200;
122122
ORGANIZATIONNAME = shingt;
123123
TargetAttributes = {
124124
1201036F1DFBE26E00E8128E = {
@@ -246,6 +246,7 @@
246246
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
247247
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
248248
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
249+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
249250
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
250251
CLANG_WARN_STRICT_PROTOTYPES = YES;
251252
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -271,7 +272,7 @@
271272
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
272273
GCC_WARN_UNUSED_FUNCTION = YES;
273274
GCC_WARN_UNUSED_VARIABLE = YES;
274-
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
275+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
275276
MTL_ENABLE_DEBUG_INFO = YES;
276277
ONLY_ACTIVE_ARCH = YES;
277278
SDKROOT = iphoneos;
@@ -307,6 +308,7 @@
307308
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
308309
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
309310
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
311+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
310312
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
311313
CLANG_WARN_STRICT_PROTOTYPES = YES;
312314
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -326,7 +328,7 @@
326328
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
327329
GCC_WARN_UNUSED_FUNCTION = YES;
328330
GCC_WARN_UNUSED_VARIABLE = YES;
329-
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
331+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
330332
MTL_ENABLE_DEBUG_INFO = NO;
331333
SDKROOT = iphoneos;
332334
SWIFT_COMPILATION_MODE = wholemodule;
@@ -400,7 +402,7 @@
400402
repositoryURL = "https://github.com/apollographql/apollo-ios.git";
401403
requirement = {
402404
kind = upToNextMinorVersion;
403-
minimumVersion = 0.30.0;
405+
minimumVersion = 0.34.1;
404406
};
405407
};
406408
/* End XCRemoteSwiftPackageReference section */

GitHub-GraphQL-API-Example-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GitHub-GraphQL-API-Example-iOS/RepositoriesViewController.swift

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@ final class RepositoriesViewController: UITableViewController {
1111
}
1212

1313
private lazy var apollo: ApolloClient = {
14-
let url = URL(string: "https://api.github.com/graphql")!
15-
let transport = HTTPNetworkTransport(url: url)
16-
transport.delegate = self
17-
return ApolloClient(networkTransport: transport)
14+
let network = RequestChainNetworkTransport(
15+
interceptorProvider: LegacyInterceptorProvider(),
16+
endpointURL: URL(string: "https://api.github.com/graphql")!,
17+
additionalHeaders: [
18+
"Authorization": "Bearer \(token)"
19+
]
20+
)
21+
return .init(networkTransport: network)
1822
}()
1923

2024
override func viewWillAppear(_ animated: Bool) {
@@ -63,15 +67,3 @@ final class RepositoriesViewController: UITableViewController {
6367
return 54.0
6468
}
6569
}
66-
67-
extension RepositoriesViewController: HTTPNetworkTransportPreflightDelegate {
68-
func networkTransport(_ networkTransport: HTTPNetworkTransport, shouldSend request: URLRequest) -> Bool {
69-
true
70-
}
71-
72-
func networkTransport(_ networkTransport: HTTPNetworkTransport, willSend request: inout URLRequest) {
73-
var headers = request.allHTTPHeaderFields ?? [String: String]()
74-
headers["Authorization"] = "Bearer \(token)"
75-
request.allHTTPHeaderFields = headers
76-
}
77-
}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ An example iOS app that uses [Apollo iOS](https://github.com/apollographql/apoll
77
* Article (deprecated as it's for older version of Apollo)
88
* https://shingt.com/blog/2017-04-02-graphql-on-ios-using-apollo/
99

10-
## Requirements
10+
## Environments
1111

12-
- Xcode 11.5
13-
- Swift 5.2
12+
- Xcode 12.0.1
13+
- Swift 5.3
1414

1515
## How to start
1616

0 commit comments

Comments
 (0)