Skip to content

Commit

Permalink
Update submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
p2 committed Nov 24, 2017
1 parent bfa3eba commit 7f4b266
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ Changelog
=========


## 3.2.0

- Address Swift 3.2 compiler warnings

## 3.0.1

- Address Swift 3.1 compiler warnings
Expand Down
4 changes: 2 additions & 2 deletions Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.1</string>
<string>3.2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>3.0.1.0</string>
<string>3.2.0.0</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ See [tags/releases](https://github.com/smart-on-fhir/Swift-SMART/releases).

Version | Swift | FHIR | &nbsp;
---------|-----------|---------------|-----------------------------
**3.2** | 3.2 | `3.0.0.11832` | STU 3
**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_)
Expand Down
2 changes: 1 addition & 1 deletion SMART.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

Pod::Spec.new do |s|
s.name = "SMART"
s.version = "3.0.1"
s.version = "3.2.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.
Expand Down
2 changes: 1 addition & 1 deletion Sources/Client/PatientList.swift
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ open class PatientList {
var lastTitle: Character = "$"
var lastSection = PatientListSection(title: "")
for patient in patients {
let pre: Character = patient.displayNameFamilyGiven.characters.first ?? "$" // TODO: use another method depending on current ordering
let pre: Character = patient.displayNameFamilyGiven.first ?? "$" // TODO: use another method depending on current ordering
if pre != lastTitle {
lastTitle = pre
lastSection = PatientListSection(title: String(lastTitle))
Expand Down
2 changes: 1 addition & 1 deletion Sources/Client/Server.swift
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ open class Server: FHIROpenServer, OAuth2RequestPerformer {
// MARK: - FHIROpenServer

open override func perform(request: URLRequest, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void) -> URLSessionTask? {
logger?.debug("SMART", msg: "---> \(String(describing: request.httpMethod)) \(request.url?.description ?? "No URL")")
logger?.debug("SMART", msg: "---> \(request.httpMethod ?? "???") \(request.url?.description ?? "No URL")")
logger?.trace("SMART", msg: "REQUEST\n\(request.debugDescription)\n---")
return super.perform(request: request) { data, response, error in
self.logger?.trace("SMART", msg: "RESPONSE\n\(response.debugDescription)\n---")
Expand Down
14 changes: 13 additions & 1 deletion SwiftSMART.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1328,7 +1328,7 @@
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0810;
LastUpgradeCheck = 0910;
ORGANIZATIONNAME = "SMART Health IT";
TargetAttributes = {
EE13AA911A5D44D100B901FD = {
Expand Down Expand Up @@ -2074,14 +2074,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -2121,14 +2127,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0820"
LastUpgradeVersion = "0910"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -40,6 +40,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand Down Expand Up @@ -69,6 +70,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0820"
LastUpgradeVersion = "0910"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -40,6 +40,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand Down Expand Up @@ -69,6 +70,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
2 changes: 1 addition & 1 deletion generate-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
jazzy \
-r "http://smart-on-fhir.github.io/Swift-SMART" \
-o "docs" \
--module-version "3.0.0"
--module-version "3.2.0"

mkdir docs/assets 2>/dev/null
cp assets/banner.png docs/assets/

0 comments on commit 7f4b266

Please sign in to comment.