Skip to content

Commit

Permalink
Swift 3.1 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
p2 committed May 15, 2017
1 parent 442a1e9 commit 911da7e
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ Changelog
=========


## 3.0.1

- Address Swift 3.1 compiler warnings


## 3.0

- Update to FHIR **STU-3** (`3.0.0.11832`)
Expand Down
4 changes: 2 additions & 2 deletions Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0</string>
<string>3.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>3.0.0.0</string>
<string>3.0.1.0</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion OAuth2
2 changes: 1 addition & 1 deletion SMART.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

Pod::Spec.new do |s|
s.name = "SMART"
s.version = "3.0.0"
s.version = "3.0.1"
s.summary = "Swift SMART on FHIR framework for iOS and OS X"
s.description = <<-DESC
Swift SMART on FHIR framework for iOS and OS X.
Expand Down
4 changes: 2 additions & 2 deletions Sources/Client/Server.swift
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ open class Server: FHIROpenServer, OAuth2RequestPerformer {
// MARK: - FHIROpenServer

open override func perform(request: URLRequest, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void) -> URLSessionTask? {
logger?.debug("SMART", msg: "---> \(request.httpMethod) \(request.url?.description ?? "No URL")")
logger?.debug("SMART", msg: "---> \(String(describing: request.httpMethod)) \(request.url?.description ?? "No URL")")
logger?.trace("SMART", msg: "REQUEST\n\(request.debugDescription)\n---")
return super.perform(request: request) { data, response, error in
self.logger?.trace("SMART", msg: "RESPONSE\n\(response.debugDescription)\n---")
Expand Down Expand Up @@ -251,7 +251,7 @@ open class Server: FHIROpenServer, OAuth2RequestPerformer {
}
else if let patientId = parameters?["patient"] as? String {
Patient.read(patientId, server: self) { resource, error in
self.logger?.debug("SMART", msg: "Did read patient \(resource) with error \(error)")
self.logger?.debug("SMART", msg: "Did read patient \(String(describing: resource)) with error \(String(describing: error))")
callback(resource as? Patient, error)
}
}
Expand Down

0 comments on commit 911da7e

Please sign in to comment.