diff --git a/CHANGELOG.md b/CHANGELOG.md index 18456163..069e3d20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========= +## 2.2.4 + +- Support resolving bundled references +- Some logging improvements + ## 2.2.3 diff --git a/Info.plist b/Info.plist index 3b440602..9592517b 100644 --- a/Info.plist +++ b/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.2.3 + 2.2.4 CFBundleSignature ???? CFBundleVersion - 2.2.3.0 + 2.2.4.0 NSPrincipalClass diff --git a/Sources/Client/Auth.swift b/Sources/Client/Auth.swift index c4746fef..7ee03546 100644 --- a/Sources/Client/Auth.swift +++ b/Sources/Client/Auth.swift @@ -42,7 +42,10 @@ class Auth { /// The authentication object, used internally. var oauth: OAuth2? { didSet { - if nil == server.logger, let logger = oauth?.logger { + if let logger = server.logger { + oauth?.logger = logger + } + else if let logger = oauth?.logger { server.logger = logger } } diff --git a/SwiftSMART.xcodeproj/project.pbxproj b/SwiftSMART.xcodeproj/project.pbxproj index 5fad35ea..b866a849 100644 --- a/SwiftSMART.xcodeproj/project.pbxproj +++ b/SwiftSMART.xcodeproj/project.pbxproj @@ -349,6 +349,7 @@ EEF47D371B1E483A0057D838 /* OAuth2Base.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF47D341B1E483A0057D838 /* OAuth2Base.swift */; }; EEF47D381B1E483A0057D838 /* OAuth2DynReg.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF47D351B1E483A0057D838 /* OAuth2DynReg.swift */; }; EEF47D391B1E483A0057D838 /* OAuth2DynReg.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF47D351B1E483A0057D838 /* OAuth2DynReg.swift */; }; + EEF7BC3C1D465FA400DCF872 /* OAuth2Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEB4810B1CDBEB4F0088D7F3 /* OAuth2Logger.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -1520,6 +1521,7 @@ EE56A4FB1ABB0B7900FA99EB /* AuditEvent.swift in Sources */, EE56A5691ABB0B7900FA99EB /* Group.swift in Sources */, EE56A56B1ABB0B7900FA99EB /* HealthcareService.swift in Sources */, + EEF7BC3C1D465FA400DCF872 /* OAuth2Logger.swift in Sources */, EE56A53B1ABB0B7900FA99EB /* DocumentManifest.swift in Sources */, EE02F8081ACF2FC500179969 /* Flag.swift in Sources */, EE56A6141ABB0B9E00FA99EB /* OAuth2CodeGrant.swift in Sources */, diff --git a/generate-docs.sh b/generate-docs.sh index 5bf46271..5de67db4 100755 --- a/generate-docs.sh +++ b/generate-docs.sh @@ -6,7 +6,7 @@ jazzy \ -r "http://smart-on-fhir.github.io/Swift-SMART" \ -o "docs" \ - --module-version "2.2.3" + --module-version "2.2.4" mkdir docs/assets 2>/dev/null cp assets/banner.png docs/assets/