Merge branch 'develop' into prototype/Swift_3_2

# Conflicts:
#	Sources/DynamicSchema+Convenience.swift
This commit is contained in:
John Estropia
2017-08-31 18:33:12 +09:00
5 changed files with 15 additions and 15 deletions

View File

@@ -114,7 +114,7 @@ public extension DynamicSchema {
}
case .decimalAttributeType:
valueType = NSDecimalNumber.self
if let defaultValue = (attribute.defaultValue as! NSDecimalNumber.QueryableNativeType?).flatMap(NSDecimalNumber.cs_fromQueryableNativeType) {
if let defaultValue = (attribute.defaultValue as! NSDecimalNumber?) {
defaultString = ", initial: NSDecimalNumber(string: \"\(defaultValue.description(withLocale: nil))\")"
}

View File

@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.1.0</string>
<string>4.1.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>