Merge branch 'master' into develop, update submodules

CHANGELOG.md

@@ -1,14 +1,18 @@
 Changelog
 =========
 
-## 2.3
+## 2.2.2
 
-- Implement automatic dynamic client registration
+- Implement automatic dynamic client registration if the client has no `client_id`
+
+## 2.2.1
+
+- Update Podspec for CocoaPods compatibility
 
 ## 2.2
 
 - Update to FHIR `1.0.2.7202` (DSTU 2 with technical errata, compatible with `1.0.1`)
-- Add a very simple base implementation of `FHIRServer` called `FHIROpenServer`and a typealias `FHIRBaseServer`
+- Add a very simple base implementation of `FHIRServer` called `FHIROpenServer`, which also serves as superclass for our SMART `Server` class
 - New error handling using `FHIRError`
 - Implement absolute reference resolver (will not work if the other server is protected)
 - Fixes to `ElementDefinition`
@@ -23,6 +27,7 @@ Changelog
 
 - Update to Swift 2.0
 
+
 ## 1.0
 
 - Update to swift 1.2

Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3</string>
+	<string>2.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>${CURRENT_PROJECT_VERSION}</string>
+	<string>2.2.2.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

README.md

@@ -1,4 +1,4 @@
-![](assets/banner.png)
+<p align="center"><img src="./assets/banner.png" alt=""></p>
 
 Swift-SMART is a full client implementation of the 🔥FHIR specification for building apps that interact with healthcare data through [**SMART on FHIR**](http://docs.smarthealthit.org).
 Written in _Swift 2_ it is compatible with **iOS 8** and **OS X 10.9** and newer and requires Xcode 7 or newer.
@@ -79,6 +79,15 @@ smart.authorize() { patient, error in
 ```
 
 
+Installation
+------------
+
+The suggested approach is to add _Swift-SMART_ as a git submodule to your project.
+Detailed instructions on how this is done can be glanced from the [OAuth2 installation instructions](https://github.com/p2/OAuth2#installation).
+
+The framework is also available via _CocoaPods_ under the name [SMART](https://cocoapods.org/?q=smart).
+
+
 License
 -------
 

SMART.podspec

@@ -7,7 +7,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "SMART"
-  s.version      = "2.2"
+  s.version      = "2.2.2"
   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.
@@ -28,8 +28,22 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.9"
-  s.requires_arc          = true
-  s.source_files          = "Classes/*", "Swift-FHIR/Classes/*", "Swift-FHIR/Models/*", "OAuth2/SwiftKeychain/SwiftKeychain/Keychain/*.swift", "OAuth2/OAuth2/*.swift"
-  s.ios.source_files      = "Classes+iOS/*", "OAuth2/OAuth2+iOS/*"
-  s.osx.source_files      = "Classes+OSX/*", "OAuth2/OAuth2+OSX/*"
+
+  s.source_files          = "Classes/*.swift",
+                            "Swift-FHIR/Models/*.swift",
+                            "Swift-FHIR/Classes/FHIRElement+Utilities.swift",
+                            "Swift-FHIR/Classes/FHIRError.swift",
+                            "Swift-FHIR/Classes/FHIROpenServer.swift",
+                            "Swift-FHIR/Classes/FHIROperation.swift",
+                            "Swift-FHIR/Classes/FHIRSearch.swift",
+                            "Swift-FHIR/Classes/FHIRServer*.swift",
+                            "Swift-FHIR/Classes/Reference+Resolving.swift",
+                            "Swift-FHIR/Classes/Resource+REST.swift",
+                            "Swift-FHIR/Classes/String+Localization.swift",
+                            "OAuth2/SwiftKeychain/SwiftKeychain/Keychain/*.swift",
+                            "OAuth2/OAuth2/*.swift"
+  s.ios.source_files      = "Classes+iOS/*.swift",
+                            "OAuth2/OAuth2+iOS/*.swift"
+  s.osx.source_files      = "Classes+OSX/*.swift",
+                            "OAuth2/OAuth2+OSX/*.swift"
 end

SwiftSMART.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		EE01F97A1C591640003AEA7E /* DomainResource+Containment.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE01F9791C591640003AEA7E /* DomainResource+Containment.swift */; };
+		EE01F97B1C59166C003AEA7E /* DomainResource+Containment.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE01F9791C591640003AEA7E /* DomainResource+Containment.swift */; };
+		EE01F97E1C59171C003AEA7E /* OAuth2WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE01F97C1C591717003AEA7E /* OAuth2WebViewController.swift */; };
 		EE02F8051ACF2FC500179969 /* FamilyMemberHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE02F8031ACF2FC500179969 /* FamilyMemberHistory.swift */; };
 		EE02F8061ACF2FC500179969 /* FamilyMemberHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE02F8031ACF2FC500179969 /* FamilyMemberHistory.swift */; };
 		EE02F8071ACF2FC500179969 /* Flag.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE02F8041ACF2FC500179969 /* Flag.swift */; };
@@ -405,6 +408,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		EE01F9791C591640003AEA7E /* DomainResource+Containment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DomainResource+Containment.swift"; sourceTree = "<group>"; };
+		EE01F97C1C591717003AEA7E /* OAuth2WebViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OAuth2WebViewController.swift; sourceTree = "<group>"; };
 		EE02F8031ACF2FC500179969 /* FamilyMemberHistory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FamilyMemberHistory.swift; sourceTree = "<group>"; };
 		EE02F8041ACF2FC500179969 /* Flag.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Flag.swift; sourceTree = "<group>"; };
 		EE02F8091ACF2FDB00179969 /* FHIRSearch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FHIRSearch.swift; sourceTree = "<group>"; };
@@ -937,6 +942,7 @@
 			isa = PBXGroup;
 			children = (
 				EE8EE6C21B1290B7005B90C5 /* OAuth2+OSX.swift */,
+				EE01F97C1C591717003AEA7E /* OAuth2WebViewController.swift */,
 			);
 			name = OSX;
 			path = OAuth2/Sources/OSX;
@@ -963,6 +969,7 @@
 				EE3907D81C3E855D005BFF3D /* Resource+Instantiation.swift */,
 				EE9B31F71ACADAF700980AA9 /* Resource+REST.swift */,
 				EE9B32021ACADE9900980AA9 /* Reference+Resolving.swift */,
+				EE01F9791C591640003AEA7E /* DomainResource+Containment.swift */,
 				EE1F49E11C0D366A0095BF0F /* FHIROpenServer.swift */,
 				EE9B32051ACAE6A900980AA9 /* FHIRServerRequestHandler.swift */,
 				EE3907D71C3E855D005BFF3D /* FHIRServerDataResponse.swift */,
@@ -1242,6 +1249,7 @@
 				EE3907DF1C3E855D005BFF3D /* Resource+Instantiation.swift in Sources */,
 				EE56A5861ABB0B7900FA99EB /* MedicationDispense.swift in Sources */,
 				EE56A5AC1ABB0B7A00FA99EB /* PaymentNotice.swift in Sources */,
+				EE01F97A1C591640003AEA7E /* DomainResource+Containment.swift in Sources */,
 				EE56A5BC1ABB0B7A00FA99EB /* ProcedureRequest.swift in Sources */,
 				EE56A6271ABB6A6F00FA99EB /* ProcessRequest.swift in Sources */,
 				EE56A5E41ABB0B7A00FA99EB /* Specimen.swift in Sources */,
@@ -1480,6 +1488,7 @@
 				EEEE31421BB2F520008866E2 /* Account.swift in Sources */,
 				EE56A4ED1ABB0B7900FA99EB /* Address.swift in Sources */,
 				EE56A5831ABB0B7900FA99EB /* Medication.swift in Sources */,
+				EE01F97E1C59171C003AEA7E /* OAuth2WebViewController.swift in Sources */,
 				EE3907D31C3E846D005BFF3D /* JSON-extensions.swift in Sources */,
 				EE56A5DF1ABB0B7A00FA99EB /* SearchParameter.swift in Sources */,
 				EE56A5451ABB0B7900FA99EB /* EligibilityRequest.swift in Sources */,
@@ -1528,6 +1537,7 @@
 				EE56A5AB1ABB0B7A00FA99EB /* Patient.swift in Sources */,
 				EE3907CB1C3E846D005BFF3D /* Element.swift in Sources */,
 				EE02F8061ACF2FC500179969 /* FamilyMemberHistory.swift in Sources */,
+				EE01F97B1C59166C003AEA7E /* DomainResource+Containment.swift in Sources */,
 				EE56A52F1ABB0B7900FA99EB /* DeviceMetric.swift in Sources */,
 				EE56A5F71ABB0B7A00FA99EB /* ValueSet.swift in Sources */,
 				EEEE31431BB2F520008866E2 /* Annotation.swift in Sources */,

generate-docs.sh

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