Update submodules; Swift 2.2 now required

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+
+## 2.2.3
+
+- Address deprecation warnings appearing with Swift 2.2 (now requires Swift 2.2)
+
+
 ## 2.2.2
 
 - Implement automatic dynamic client registration if the client has no `client_id`

Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.2</string>
+	<string>2.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.2.0</string>
+	<string>2.2.3.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

README.md

@@ -12,6 +12,7 @@ See the `develop` branch or specific `feature/x` branches for new Swift or FHIR
 
  Version |   Swift   |      FHIR     |  
 ---------|-----------|---------------|-----------------------------
+**2.2.3**|       2.2 |  `1.0.2.7202` | DSTU 2 (_+ technical errata_)
  **2.2** |   2.0-2.2 |  `1.0.2.7202` | DSTU 2 (_+ technical errata_)
  **2.1** |   2.0-2.2 |  `1.0.1.7108` | DSTU 2
  **2.0** |   2.0-2.2 |  `0.5.0.5149` | DSTU 2 Ballot, May 2015

SMART.podspec

@@ -7,7 +7,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "SMART"
-  s.version      = "2.2.2"
+  s.version      = "2.2.3"
   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.
@@ -41,7 +41,7 @@ Pod::Spec.new do |s|
                             "Swift-FHIR/Sources/Client/Reference+Resolving.swift",
                             "Swift-FHIR/Sources/Client/Resource+Instantiation.swift",
                             "Swift-FHIR/Sources/Client/Resource+REST.swift",
-                            "OAuth2/SwiftKeychain/SwiftKeychain/Keychain/*.swift",
+                            "OAuth2/SwiftKeychain/Keychain/Keychain.swift",
                             "OAuth2/Sources/Base/*.swift"
   s.ios.source_files      = "Sources/iOS/*.swift",
                             "OAuth2/Sources/iOS/*.swift"

Sources/Client/PatientList.swift

@@ -116,7 +116,7 @@ public class PatientList {
 					sectionIndexTitles.append(lastSection.title)
 				}
 				lastSection.addPatient(patient)
-				n++
+				n += 1
 			}
 
 			// not all patients fetched yet?

Sources/iOS/Auth+iOS.swift

@@ -45,7 +45,7 @@ extension Auth {
 			// instantiate patient list view
 			let view = PatientListViewController(list: PatientListAll(), server: self.server)
 			view.title = self.oauth?.authConfig.ui.title
-			view.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .Done, target: view, action: "dismissFromModal:")
+			view.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .Done, target: view, action: Selector("dismissFromModal:"))
 			view.onPatientSelect = { patient in
 				var params = parameters
 				if let patient = patient {

Tests/ServerTests.swift

@@ -3,7 +3,7 @@
 //  SMART-on-FHIR
 //
 //  Created by Pascal Pfiffner on 6/23/14.
-//  2014, SMART Platforms.
+//  2014, SMART Health IT.
 //
 
 import XCTest
@@ -12,11 +12,11 @@ import XCTest
 import SMART
 
 
-class ServerTests: XCTestCase
-{
+class ServerTests: XCTestCase {
+	
 	func testMetadataParsing() throws {
 		let server = Server(base: "https://api.io")
-		XCTAssertEqual("https://api.io", server.baseURL.absoluteString)
+		XCTAssertEqual("https://api.io/", server.baseURL.absoluteString)
 		XCTAssertEqual("https://api.io", server.aud)
 
 		let metaURL = NSBundle(forClass: self.dynamicType).URLForResource("metadata", withExtension: "")
@@ -38,7 +38,7 @@ class ServerTests: XCTestCase
 			exp1.fulfill()
 		}
 
-		let fileURL = NSURL(fileURLWithPath: "\(__FILE__)".smart_stringByDeletingLastPathComponent)
+		let fileURL = NSURL(fileURLWithPath: "\(#file)".smart_stringByDeletingLastPathComponent)
 		server = Server(baseURL: fileURL)
 		let exp2 = self.expectationWithDescription("Metadata fetch expectation 2")
 		server.getConformance { error in
@@ -58,8 +58,8 @@ class ServerTests: XCTestCase
 }
 
 
-extension String
-{
+extension String {
+	
 	func smart_stringByAppendingPathComponent(part: String) -> String {
 		return (self as NSString).stringByAppendingPathComponent(part)
 	}

generate-docs.sh

@@ -6,7 +6,7 @@
 jazzy \
 	-r "http://smart-on-fhir.github.io/Swift-SMART" \
 	-o "docs" \
-	--module-version "2.2.2"
+	--module-version "2.2.3"
 
 mkdir docs/assets 2>/dev/null
 cp assets/banner.png docs/assets/