Prepare for version 3.0

.swift-version

@@ -0,0 +1 @@
+3.0

CHANGELOG.md

@@ -2,6 +2,11 @@ Changelog
 =========
 
 
+## 3.0
+
+- Update to FHIR **STU-3** (`3.0.0.11832`)
+
+
 ## 2.9
 
 - Update to FHIR `1.6.0.9663`

Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.9</string>
+	<string>3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.9.0.0</string>
+	<string>3.0.0.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

README.md

@@ -1,18 +1,21 @@
 <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**][smart].
-Written in _Swift 3_ it is compatible with **iOS 8** and **OS X 10.9** and newer and requires Xcode 8 or newer.
+Written in _Swift 3_ it is compatible with **iOS 8** and **OS X 10.10** and newer and requires Xcode 8 or newer.
 
 
 ### Versioning
 
 Due to the complications of combining two volatile technologies, here's an overview of which version numbers use which **Swift** and **FHIR versions**.
-The `master` branch should always compile and is on (point releases of) these main versions.
-See the `develop` branch or specific `feature/x` branches for new Swift or FHIR versions, and check the [tags](https://github.com/smart-on-fhir/Swift-FHIR/releases).
+
+- The [`master`](https://github.com/smart-on-fhir/Swift-SMART) branch should always compile and is on (point releases of) these main versions.
+- The [`develop`](https://github.com/smart-on-fhir/Swift-SMART/tree/develop) branch should be on versions corresponding to the latest freezes and may be updated from time to time with the latest and greatest CI build.
+
+See [tags/releases](https://github.com/smart-on-fhir/Swift-SMART/releases).
 
  Version |   Swift   |      FHIR     | &nbsp;
 ---------|-----------|---------------|-----------------------------
- **3.0** |       3.0 | `2.0.0.xxxxx` | STU 3 (_planned_)
+ **3.0** |       3.0 | `3.0.0.11832` | STU 3
  **2.9** |       3.0 |  `1.6.0.9663` | STU 3 Ballot, Sep 2016
  **2.8** |       3.0 |  `1.0.2.7202` | DSTU 2 (_+ technical errata_)
  **2.4** |       2.2 |  `1.6.0.9663` | STU 3 Ballot, Sep 2016

SMART.podspec

@@ -7,7 +7,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "SMART"
-  s.version      = "2.9.0"
+  s.version      = "3.0.0"
   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.
@@ -27,25 +27,31 @@ Pod::Spec.new do |s|
   s.prepare_command   = "git submodule update --init --recursive"  # The :submodules flag above is not recursive :P
 
   s.ios.deployment_target = "8.0"
-  s.osx.deployment_target = "10.9"
+  s.osx.deployment_target = "10.10"
 
-  s.pod_target_xcconfig   = { 'OTHER_SWIFT_FLAGS' => '-DNO_MODEL_IMPORT -DNO_KEYCHAIN_IMPORT' }
+  s.pod_target_xcconfig   = { 'OTHER_SWIFT_FLAGS' => '-DNO_MODEL_IMPORT -DNO_MODULE_IMPORT -DNO_KEYCHAIN_IMPORT' }
   s.source_files          = "Sources/Client/*.swift",
                             "Swift-FHIR/Sources/Models/*.swift",
                             "Swift-FHIR/Sources/Client/DomainResource+Containment.swift",
                             "Swift-FHIR/Sources/Client/Element+Extensions.swift",
+                            "Swift-FHIR/Sources/Client/FHIRBaseRequestHandler.swift",
+                            "Swift-FHIR/Sources/Client/FHIRMinimalServer.swift",
                             "Swift-FHIR/Sources/Client/FHIROpenServer.swift",
                             "Swift-FHIR/Sources/Client/FHIROperation.swift",
                             "Swift-FHIR/Sources/Client/FHIRSearch.swift",
-                            "Swift-FHIR/Sources/Client/FHIRServer*.swift",
+                            "Swift-FHIR/Sources/Client/FHIRServerDataResponse.swift",
+                            "Swift-FHIR/Sources/Client/FHIRString+Localization.swift",
+                            "Swift-FHIR/Sources/Client/Patient+SMART.swift",
                             "Swift-FHIR/Sources/Client/Reference+Resolving.swift",
                             "Swift-FHIR/Sources/Client/Resource+Instantiation.swift",
+                            "Swift-FHIR/Sources/Client/Resource+Operation.swift",
                             "Swift-FHIR/Sources/Client/Resource+REST.swift",
-                            "Swift-FHIR/Sources/Client/Patient+SMART.swift",
+                            "Swift-FHIR/Sources/Client/ValueSet+Localization.swift",
                             "OAuth2/SwiftKeychain/Keychain/Keychain.swift",
-                            "OAuth2/Sources/Base/*.swift"
+                            "OAuth2/Sources/Base/*.swift",
+                            "OAuth2/Sources/Flows/*.swift"
   s.ios.source_files      = "Sources/iOS/*.swift",
                             "OAuth2/Sources/iOS/*.swift"
-  s.osx.source_files      = "Sources/OSX/*.swift",
-                            "OAuth2/Sources/OSX/*.swift"
+  s.osx.source_files      = "Sources/macOS/*.swift",
+                            "OAuth2/Sources/macOS/*.swift"
 end

SwiftSMART.xcodeproj/project.pbxproj

@@ -933,9 +933,9 @@
 				EE43B1AA19546D880017679A /* Client */,
 				EE02F8101ACF30B000179969 /* iOS */,
 				EE02F8161ACF30EA00179969 /* macOS */,
-				EE43B1AB19546D880017679A /* Supporting Files */,
 				EE56A45F1ABB0B5B00FA99EB /* SwiftFHIR */,
 				EE56A4601ABB0B6200FA99EB /* OAuth2 */,
+				EE43B1AB19546D880017679A /* Supporting Files */,
 				EE43B1B719546D880017679A /* Tests */,
 				EE43B5C8195497A10017679A /* Frameworks */,
 				EE55C26A1948906000849670 /* Products */,

generate-docs.sh

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