Update to Swift 5.0

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+## 4.1
+
+- Update to Swift 5.0
+
+
 ## 4.0
 
 - Update to FHIR **R4** (`4.0.0-a53ec6ee1b`)

Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.0</string>
+	<string>4.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.0.0.0</string>
+	<string>4.1.0.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

README.md

@@ -1,7 +1,7 @@
 <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 4.2_ it is compatible with **iOS 11** and **macOS 10.13** and newer and requires Xcode 10 or newer.
+Written in _Swift 5.0_ it is compatible with **iOS 11** and **macOS 10.13** and newer and requires Xcode 10.2 or newer.
 
 
 ### Versioning
@@ -15,6 +15,7 @@ See [tags/releases](https://github.com/smart-on-fhir/Swift-SMART/releases).
 
  Version |   Swift   |      FHIR     | &nbsp;
 ---------|-----------|---------------|-----------------------------
+ **4.1** |       5.0 | `4.0.0-a53ec6ee1b` | R4
  **4.0** |       4.2 | `4.0.0-a53ec6ee1b` | R4
  **3.2** |       3.2 | `3.0.0.11832` | STU 3
  **3.0** |       3.0 | `3.0.0.11832` | STU 3

SMART.podspec

@@ -7,7 +7,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "SMART"
-  s.version      = "4.0.0"
+  s.version      = "4.1.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.

Sources/Client/Auth.swift

@@ -210,12 +210,14 @@ class Auth {
 			oa.scope = scope
 
 			// start authorization (method implemented in iOS and OS X extensions)
-			authorize(with: oa, properties: properties) { parameters, error in
-				if let error = error {
-					self.authDidFail(withError: error)
-				}
-				else {
-					self.authDidSucceed(withParameters: parameters ?? OAuth2JSON())
+			callOnMainThread {
+				authorize(with: oa, properties: properties) { parameters, error in
+					if let error = error {
+						self.authDidFail(withError: error)
+					}
+					else {
+						self.authDidSucceed(withParameters: parameters ?? OAuth2JSON())
+					}
 				}
 			}
 		}

SwiftSMART.xcodeproj/project.pbxproj

@@ -8,6 +8,10 @@
 
 /* Begin PBXBuildFile section */
 		B4081C27222B0030005A1CFE /* CONTRIBUTORS.md in Resources */ = {isa = PBXBuildFile; fileRef = B4081C26222B0030005A1CFE /* CONTRIBUTORS.md */; };
+		B41192EA22947878008A45BA /* FHIRCanonical+Resolving.swift in Sources */ = {isa = PBXBuildFile; fileRef = B41192E922947878008A45BA /* FHIRCanonical+Resolving.swift */; };
+		B41192EC2294788A008A45BA /* FHIRCanonical.swift in Sources */ = {isa = PBXBuildFile; fileRef = B41192EB2294788A008A45BA /* FHIRCanonical.swift */; };
+		B41192ED229478E0008A45BA /* FHIRCanonical+Resolving.swift in Sources */ = {isa = PBXBuildFile; fileRef = B41192E922947878008A45BA /* FHIRCanonical+Resolving.swift */; };
+		B41192EE229478F3008A45BA /* FHIRCanonical.swift in Sources */ = {isa = PBXBuildFile; fileRef = B41192EB2294788A008A45BA /* FHIRCanonical.swift */; };
 		B4FA91CF2220F5CD00BD72A1 /* ChargeItemDefinition.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4FA90FC2220F5B100BD72A1 /* ChargeItemDefinition.swift */; };
 		B4FA91D12220F5CD00BD72A1 /* ClaimResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4FA90FD2220F5B100BD72A1 /* ClaimResponse.swift */; };
 		B4FA91D32220F5CD00BD72A1 /* MedicationDispense.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4FA90FE2220F5B100BD72A1 /* MedicationDispense.swift */; };
@@ -600,6 +604,8 @@
 
 /* Begin PBXFileReference section */
 		B4081C26222B0030005A1CFE /* CONTRIBUTORS.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTORS.md; sourceTree = SOURCE_ROOT; };
+		B41192E922947878008A45BA /* FHIRCanonical+Resolving.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FHIRCanonical+Resolving.swift"; sourceTree = "<group>"; };
+		B41192EB2294788A008A45BA /* FHIRCanonical.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FHIRCanonical.swift; sourceTree = "<group>"; };
 		B4FA90FC2220F5B100BD72A1 /* ChargeItemDefinition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChargeItemDefinition.swift; sourceTree = "<group>"; };
 		B4FA90FD2220F5B100BD72A1 /* ClaimResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ClaimResponse.swift; sourceTree = "<group>"; };
 		B4FA90FE2220F5B100BD72A1 /* MedicationDispense.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MedicationDispense.swift; sourceTree = "<group>"; };
@@ -1169,6 +1175,7 @@
 				B4FA91A92220F5CC00BD72A1 /* FHIRAbstractBase+Factory.swift */,
 				B4FA91102220F5B400BD72A1 /* FHIRAbstractResource.swift */,
 				B4FA91672220F5C200BD72A1 /* FHIRBool.swift */,
+				B41192EB2294788A008A45BA /* FHIRCanonical.swift */,
 				B4FA91852220F5C600BD72A1 /* FHIRDecimal.swift */,
 				B4FA91202220F5B700BD72A1 /* FHIREnum.swift */,
 				B4FA91BD2220F5CD00BD72A1 /* FHIRError.swift */,
@@ -1350,6 +1357,7 @@
 		EE9B31F81ACADAF700980AA9 /* Client */ = {
 			isa = PBXGroup;
 			children = (
+				B41192E922947878008A45BA /* FHIRCanonical+Resolving.swift */,
 				EE1F49E11C0D366A0095BF0F /* FHIROpenServer.swift */,
 				EEB832F61E6734F20084E030 /* FHIRMinimalServer.swift */,
 				EE1597841E60255B00592E62 /* FHIRBaseRequestHandler.swift */,
@@ -1471,7 +1479,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "SMART Health IT";
 				TargetAttributes = {
 					EE13AA911A5D44D100B901FD = {
@@ -1497,6 +1505,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = EE55C2601948906000849670;
@@ -1727,6 +1736,7 @@
 				B4FA92152220F5CD00BD72A1 /* Library.swift in Sources */,
 				B4FA924D2220F5CE00BD72A1 /* MedicinalProductPharmaceutical.swift in Sources */,
 				B4FA93292220F5CE00BD72A1 /* FHIRAbstractBase+Factory.swift in Sources */,
+				B41192EA22947878008A45BA /* FHIRCanonical+Resolving.swift in Sources */,
 				B4FA93712220F5CE00BD72A1 /* Slot.swift in Sources */,
 				B4FA92812220F5CE00BD72A1 /* EnrollmentResponse.swift in Sources */,
 				B4FA93372220F5CE00BD72A1 /* ChargeItem.swift in Sources */,
@@ -1848,6 +1858,7 @@
 				B4FA92B32220F5CE00BD72A1 /* AllergyIntolerance.swift in Sources */,
 				B4FA92B72220F5CE00BD72A1 /* DeviceRequest.swift in Sources */,
 				B4FA93632220F5CE00BD72A1 /* NamingSystem.swift in Sources */,
+				B41192EC2294788A008A45BA /* FHIRCanonical.swift in Sources */,
 				B4FA92832220F5CE00BD72A1 /* VisionPrescription.swift in Sources */,
 				B4FA91F72220F5CD00BD72A1 /* FHIRAbstractResource.swift in Sources */,
 				B4FA92872220F5CE00BD72A1 /* Substance.swift in Sources */,
@@ -1969,11 +1980,13 @@
 				B4FA93FE2221015400BD72A1 /* Duration.swift in Sources */,
 				B4FA93FF2221015400BD72A1 /* EffectEvidenceSynthesis.swift in Sources */,
 				B4FA94002221015400BD72A1 /* Element.swift in Sources */,
+				B41192ED229478E0008A45BA /* FHIRCanonical+Resolving.swift in Sources */,
 				B4FA94012221015400BD72A1 /* ElementDefinition.swift in Sources */,
 				B4FA94022221015400BD72A1 /* Encounter.swift in Sources */,
 				B4FA94032221015400BD72A1 /* Endpoint.swift in Sources */,
 				B4FA94042221015400BD72A1 /* EnrollmentRequest.swift in Sources */,
 				B4FA94052221015400BD72A1 /* EnrollmentResponse.swift in Sources */,
+				B41192EE229478F3008A45BA /* FHIRCanonical.swift in Sources */,
 				B4FA94062221015400BD72A1 /* EpisodeOfCare.swift in Sources */,
 				B4FA94072221015400BD72A1 /* EventDefinition.swift in Sources */,
 				B4FA94082221015400BD72A1 /* Evidence.swift in Sources */,
@@ -2180,7 +2193,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -2199,7 +2212,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -2221,7 +2234,7 @@
 				PRODUCT_NAME = SMART;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -2247,7 +2260,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -2265,7 +2278,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -2280,14 +2293,15 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
 		EE55C27B1948906000849670 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -2343,6 +2357,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -2408,7 +2423,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -2434,7 +2449,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";

SwiftSMART.xcodeproj/xcshareddata/xcschemes/SwiftSMART-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SwiftSMART.xcodeproj/xcshareddata/xcschemes/SwiftSMART-macOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"