Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Commit f8302e7

Browse files
heyzooiheyzooi
committed
Merge branch 'release/3.11.0'
2 parents a09eeaf + 8cace1e commit f8302e7

File tree

13 files changed

+126
-54
lines changed

13 files changed

+126
-54
lines changed

‎.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode9
2+
osx_image: xcode9.1
33
cache:
44
directories:
55
- Carthage
@@ -16,6 +16,10 @@ before_script:
1616
-P $KEY_PASSWORD -T /usr/bin/codesign
1717
- "security set-key-partition-list -S apple-tool:,apple: -s -k travis ios-build.keychain"
1818
- date
19+
- brew update
20+
- brew install tree
21+
- brew upgrade carthage
22+
- tree -L 2 -P '*.framework' -I '*.dSYM' Carthage/Build
1923
- carthage version
2024
- if [ ! -d "Carthage/Checkouts/CwlPreconditionTesting" ] || [ ! -d "Carthage/Checkouts/KeychainAccess" ] || [ ! -d "Carthage/Checkouts/KIF" ] || [ ! -d "Carthage/Checkouts/ObjectMapper" ] || [ ! -d "Carthage/Checkouts/PromiseKit" ] || [ ! -d "Carthage/Checkouts/realm-cocoa" ] || [ ! -d "Carthage/Checkouts/XCGLogger" ]; then
2125
carthage checkout --no-use-binaries;
@@ -59,7 +63,6 @@ before_script:
5963
- if [ ! -d "Carthage/Build/$PLATFORM/Swifter.framework" ]; then
6064
carthage build --platform $PLATFORM swifter;
6165
fi
62-
- brew install tree
6366
- tree -L 2 -P '*.framework' -I '*.dSYM' Carthage/Build
6467
- date
6568
script:

‎Cartfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github "tjboneman/NSPredicate-MongoDB-Adaptor" "master"
22
github "mxcl/PromiseKit" ~> 4.0
33
github "kishikawakatsumi/KeychainAccess" ~> 3.0
4-
github "realm/realm-cocoa" ~> 2.0
5-
github "Hearst-DD/ObjectMapper" ~> 2.0
6-
github "DaveWoodCom/XCGLogger" "4.0.0"
4+
github "realm/realm-cocoa" ~> 3.0
5+
github "Hearst-DD/ObjectMapper" ~> 3.0
6+
github "DaveWoodCom/XCGLogger" ~> 6.0
77
github "pubnub/objective-c" ~> 4.0

‎Cartfile.resolved

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
github "DaveWoodCom/XCGLogger" "4.0.0"
2-
github "Hearst-DD/ObjectMapper" "2.2.9"
1+
github "DaveWoodCom/XCGLogger" "6.0.1"
2+
github "Hearst-DD/ObjectMapper" "3.1.0"
33
github "Quick/Nimble" "v7.0.2"
44
github "glock45/swifter" "1.3.3"
55
github "kif-framework/KIF" "v3.6.0"
66
github "kishikawakatsumi/KeychainAccess" "v3.1.0"
7-
github "mxcl/PromiseKit" "4.4.3"
8-
github "pubnub/objective-c" "v4.7.2"
9-
github "realm/realm-cocoa" "v2.10.2"
7+
github "mxcl/PromiseKit" "4.5.0"
8+
github "pubnub/objective-c" "v4.7.4"
9+
github "realm/realm-cocoa" "v3.0.2"
1010
github "tjboneman/NSPredicate-MongoDB-Adaptor" "2b48b18d32ee6d0d9050725452277e704c4de1d4"

‎Kinvey.podspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
#
1717

1818
s.name = "Kinvey"
19-
s.version = "3.10.1"
19+
s.version = "3.11.0"
2020
s.summary = "Kinvey iOS SDK"
2121

2222
# This description is used to generate tags and improve search results.
@@ -141,10 +141,10 @@ Pod::Spec.new do |s|
141141

142142
s.dependency "PromiseKit", "~> 4.0"
143143
s.dependency "KeychainAccess", "~> 3.0"
144-
s.dependency "Realm", "~> 2.0"
145-
s.dependency "RealmSwift", "~> 2.0"
146-
s.dependency "ObjectMapper", "~> 2.0"
147-
s.dependency "XCGLogger", "~> 4.0.0"
144+
s.dependency "Realm", "~> 3.0"
145+
s.dependency "RealmSwift", "~> 3.0"
146+
s.dependency "ObjectMapper", "~> 3.0"
147+
s.dependency "XCGLogger", "~> 6.0"
148148
s.dependency "PubNub", "~> 4.0"
149149

150150
end

‎Kinvey/BackgroundFetch/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import PromiseKit
1212

1313
class Book: Entity {
1414

15-
dynamic var name: String?
15+
@objc dynamic var name: String?
1616

1717
override class func collectionName() -> String {
1818
return "Book"

‎Kinvey/Kinvey.xcodeproj/project.pbxproj

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
571991091CB45EEE00070CDA /* Person.swift in Sources */ = {isa = PBXBuildFile; fileRef = 571991081CB45EEE00070CDA /* Person.swift */; };
4343
571ADCC31ED8EF6100D0A127 /* PubNub.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 57E6BCFE1EC51F64000E5C52 /* PubNub.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4444
571ADCC41ED8EF6A00D0A127 /* PubNub.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 57E6BCFE1EC51F64000E5C52 /* PubNub.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
45+
571B5BC31FC3B6E7007AD4C8 /* ObjcExceptionBridging.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5768BAA21FA070DC0040AA0B /* ObjcExceptionBridging.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
46+
571B5BC41FC3B6F1007AD4C8 /* ObjcExceptionBridging.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5768BAA21FA070DC0040AA0B /* ObjcExceptionBridging.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4547
571BA2611F55D9E600DE1886 /* MyFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 571BA2601F55D9E600DE1886 /* MyFile.swift */; };
4648
571BA2621F55DA1C00DE1886 /* MyFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 571BA2601F55D9E600DE1886 /* MyFile.swift */; };
4749
572005C81D30236300AE9AC5 /* NetworkStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 576E95AC1C20DB7C00258CC3 /* NetworkStoreTests.swift */; };
@@ -95,6 +97,8 @@
9597
5765B84E1C9771BC00080FFA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5765B84D1C9771BC00080FFA /* Assets.xcassets */; };
9698
5765B8511C9771BC00080FFA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5765B84F1C9771BC00080FFA /* LaunchScreen.storyboard */; };
9799
5765B8641C97751000080FFA /* Kinvey.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57A27C811C178F17000DF951 /* Kinvey.framework */; };
100+
5768BAA11FA070B10040AA0B /* ObjcExceptionBridging.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5768BAA01FA070A60040AA0B /* ObjcExceptionBridging.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
101+
5768BAA31FA071190040AA0B /* ObjcExceptionBridging.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5768BAA21FA070DC0040AA0B /* ObjcExceptionBridging.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
98102
576A1D361CCA92CA006B261E /* DataTypeTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 576A1D351CCA92CA006B261E /* DataTypeTestCase.swift */; };
99103
576E95A41C1FB10700258CC3 /* DataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 576E95A31C1FB10700258CC3 /* DataStore.swift */; };
100104
576F1E821F1958E600C854CE /* PerformanceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5706231F1F1825CA00B7FAE9 /* PerformanceTest.swift */; };
@@ -643,6 +647,7 @@
643647
578870DE1DD530210087FE78 /* ObjectMapper.framework in Embed Frameworks */,
644648
578870D51DD52FE00087FE78 /* Kinvey.framework in Embed Frameworks */,
645649
5776EE9A1E2FFA38003B9DF0 /* XCGLogger.framework in Embed Frameworks */,
650+
571B5BC41FC3B6F1007AD4C8 /* ObjcExceptionBridging.framework in Embed Frameworks */,
646651
571ADCC31ED8EF6100D0A127 /* PubNub.framework in Embed Frameworks */,
647652
);
648653
name = "Embed Frameworks";
@@ -661,6 +666,7 @@
661666
578870EC1DD530540087FE78 /* PromiseKit.framework in Embed Frameworks */,
662667
578870EE1DD530540087FE78 /* Realm.framework in Embed Frameworks */,
663668
5776EE9B1E2FFA7D003B9DF0 /* XCGLogger.framework in Embed Frameworks */,
669+
571B5BC31FC3B6E7007AD4C8 /* ObjcExceptionBridging.framework in Embed Frameworks */,
664670
571ADCC41ED8EF6A00D0A127 /* PubNub.framework in Embed Frameworks */,
665671
);
666672
name = "Embed Frameworks";
@@ -736,6 +742,7 @@
736742
57C2F6C71F75EED7001C0D9D /* Kinvey.framework in CopyFiles */,
737743
57C2F6BE1F75DDB3001C0D9D /* PubNub.framework in CopyFiles */,
738744
57C2F6BF1F75DDB3001C0D9D /* XCGLogger.framework in CopyFiles */,
745+
5768BAA31FA071190040AA0B /* ObjcExceptionBridging.framework in CopyFiles */,
739746
57C2F6C01F75DDB3001C0D9D /* ObjectMapper.framework in CopyFiles */,
740747
57C2F6C11F75DDB3001C0D9D /* KeychainAccess.framework in CopyFiles */,
741748
57C2F6C21F75DDB3001C0D9D /* PromiseKit.framework in CopyFiles */,
@@ -757,6 +764,7 @@
757764
57C731F21F575DBB00B67C13 /* Realm.framework in CopyFiles */,
758765
57C731F31F575DC600B67C13 /* RealmSwift.framework in CopyFiles */,
759766
57C731F41F575DD100B67C13 /* XCGLogger.framework in CopyFiles */,
767+
5768BAA11FA070B10040AA0B /* ObjcExceptionBridging.framework in CopyFiles */,
760768
);
761769
runOnlyForDeploymentPostprocessing = 0;
762770
};
@@ -883,6 +891,8 @@
883891
5765B84D1C9771BC00080FFA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
884892
5765B8501C9771BC00080FFA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
885893
5765B8521C9771BC00080FFA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
894+
5768BAA01FA070A60040AA0B /* ObjcExceptionBridging.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ObjcExceptionBridging.framework; sourceTree = "<group>"; };
895+
5768BAA21FA070DC0040AA0B /* ObjcExceptionBridging.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ObjcExceptionBridging.framework; sourceTree = "<group>"; };
886896
576A1D351CCA92CA006B261E /* DataTypeTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataTypeTestCase.swift; sourceTree = "<group>"; };
887897
576E95A31C1FB10700258CC3 /* DataStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataStore.swift; sourceTree = "<group>"; };
888898
576E95AC1C20DB7C00258CC3 /* NetworkStoreTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkStoreTests.swift; sourceTree = "<group>"; };
@@ -946,7 +956,6 @@
946956
578F5C921C99EED100B20F17 /* KIF.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KIF.swift; sourceTree = "<group>"; };
947957
5793B8991D2306A60088B5F9 /* KinveyTests Encrypted.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "KinveyTests Encrypted.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
948958
5795AB011DD136B8001FC808 /* NoCacheTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoCacheTestCase.swift; sourceTree = "<group>"; };
949-
5795AB0F1DD3B894001FC808 /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/SafariServices.framework; sourceTree = DEVELOPER_DIR; };
950959
57A27C811C178F17000DF951 /* Kinvey.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Kinvey.framework; sourceTree = BUILT_PRODUCTS_DIR; };
951960
57A27C841C178F17000DF951 /* Kinvey.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Kinvey.h; sourceTree = "<group>"; };
952961
57A27C861C178F17000DF951 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1686,8 +1695,9 @@
16861695
57B0C1C11CDCE88900492D6C /* iOS */ = {
16871696
isa = PBXGroup;
16881697
children = (
1689-
57E6BCFE1EC51F64000E5C52 /* PubNub.framework */,
16901698
577751381DF8B8EA006C98F1 /* XCGLogger.framework */,
1699+
5768BAA21FA070DC0040AA0B /* ObjcExceptionBridging.framework */,
1700+
57E6BCFE1EC51F64000E5C52 /* PubNub.framework */,
16911701
57B7687C1D10C01F0086AA38 /* ObjectMapper.framework */,
16921702
57B0C1D01CDCE88900492D6C /* KeychainAccess.framework */,
16931703
57B0C1D81CDCE88900492D6C /* PromiseKit.framework */,
@@ -1704,6 +1714,7 @@
17041714
57B0C1DE1CDCE88900492D6C /* Mac */ = {
17051715
isa = PBXGroup;
17061716
children = (
1717+
5768BAA01FA070A60040AA0B /* ObjcExceptionBridging.framework */,
17071718
57E6BD001EC51F80000E5C52 /* PubNub.framework */,
17081719
577751391DF8B908006C98F1 /* XCGLogger.framework */,
17091720
57B7687D1D10C02C0086AA38 /* ObjectMapper.framework */,
@@ -1771,7 +1782,6 @@
17711782
DBD4AA6B25714F7AAA213880 /* Frameworks */ = {
17721783
isa = PBXGroup;
17731784
children = (
1774-
5795AB0F1DD3B894001FC808 /* SafariServices.framework */,
17751785
57BEAE2E1C98805E00479206 /* QuartzCore.framework */,
17761786
57BEAE2C1C98805600479206 /* CoreGraphics.framework */,
17771787
57B0C1C11CDCE88900492D6C /* iOS */,
@@ -1993,6 +2003,7 @@
19932003
5788708D1DD52EC70087FE78 /* Frameworks */,
19942004
5788708E1DD52EC70087FE78 /* Resources */,
19952005
578870D81DD52FE00087FE78 /* Embed Frameworks */,
2006+
5768BA9E1FA06FDF0040AA0B /* Carthage Copy Frameworks */,
19962007
);
19972008
buildRules = (
19982009
);
@@ -2031,6 +2042,7 @@
20312042
578870B11DD52ECF0087FE78 /* Frameworks */,
20322043
578870B21DD52ECF0087FE78 /* Resources */,
20332044
578870F11DD530540087FE78 /* Embed Frameworks */,
2045+
5768BA9F1FA070390040AA0B /* Carthage Copy Frameworks */,
20342046
);
20352047
buildRules = (
20362048
);
@@ -2659,6 +2671,34 @@
26592671
/* End PBXResourcesBuildPhase section */
26602672

26612673
/* Begin PBXShellScriptBuildPhase section */
2674+
5768BA9E1FA06FDF0040AA0B /* Carthage Copy Frameworks */ = {
2675+
isa = PBXShellScriptBuildPhase;
2676+
buildActionMask = 2147483647;
2677+
files = (
2678+
);
2679+
inputPaths = (
2680+
);
2681+
name = "Carthage Copy Frameworks";
2682+
outputPaths = (
2683+
);
2684+
runOnlyForDeploymentPostprocessing = 0;
2685+
shellPath = /bin/sh;
2686+
shellScript = "carthage copy-frameworks";
2687+
};
2688+
5768BA9F1FA070390040AA0B /* Carthage Copy Frameworks */ = {
2689+
isa = PBXShellScriptBuildPhase;
2690+
buildActionMask = 2147483647;
2691+
files = (
2692+
);
2693+
inputPaths = (
2694+
);
2695+
name = "Carthage Copy Frameworks";
2696+
outputPaths = (
2697+
);
2698+
runOnlyForDeploymentPostprocessing = 0;
2699+
shellPath = /bin/sh;
2700+
shellScript = "carthage copy-frameworks";
2701+
};
26622702
5771CD691ECF6CDC0057E505 /* Carthage Copy Frameworks */ = {
26632703
isa = PBXShellScriptBuildPhase;
26642704
buildActionMask = 2147483647;
@@ -2688,6 +2728,7 @@
26882728
"$(SRCROOT)/../Carthage/Build/iOS/RealmSwift.framework",
26892729
"$(SRCROOT)/../Carthage/Build/iOS/XCGLogger.framework",
26902730
"$(SRCROOT)/../Carthage/Build/iOS/PubNub.framework",
2731+
"$(SRCROOT)/../Carthage/Build/iOS/ObjcExceptionBridging.framework",
26912732
);
26922733
name = "Carthage Copy Frameworks";
26932734
outputPaths = (
@@ -2848,6 +2889,7 @@
28482889
"$(SRCROOT)/../Carthage/Build/Mac/PromiseKit.framework",
28492890
"$(SRCROOT)/../Carthage/Build/Mac/RealmSwift.framework",
28502891
"$(SRCROOT)/../Carthage/Build/Mac/XCGLogger.framework",
2892+
"$(SRCROOT)/../Carthage/Build/Mac/ObjcExceptionBridging.framework",
28512893
);
28522894
name = "Carthage Copy Frameworks";
28532895
outputPaths = (

‎Kinvey/Kinvey/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>3.10.1</string>
18+
<string>3.11.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎Kinvey/Kinvey/Persistable.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ class ListValueTransform<T: RealmSwift.Object>: TransformOf<List<T>, [JsonDictio
190190
}
191191

192192
/// Overload operator for `List` values
193-
public func <-<T: BaseMappable>(lhs: List<T>, rhs: (String, Map)) {
193+
public func <-<T: Object & BaseMappable>(lhs: List<T>, rhs: (String, Map)) {
194194
let (right, map) = rhs
195195
var list = lhs
196196
let transform = ListValueTransform<T>(list)

‎Kinvey/Kinvey/RealmCache.swift

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,9 @@ extension RealmCache: DynamicCacheType {
518518
if let schema = realm.schema[entityType] {
519519
for property in schema.properties {
520520
switch property.type {
521-
case .array:
522-
if let primaryKeyProperty = schema.primaryKeyProperty,
521+
case .object:
522+
if property.isArray,
523+
let primaryKeyProperty = schema.primaryKeyProperty,
523524
let entityId = entity[primaryKeyProperty.name],
524525
let dynamicObject = realm.dynamicObject(ofType: entityType, forPrimaryKey: entityId),
525526
let objectClassName = property.objectClassName,
@@ -530,9 +531,7 @@ extension RealmCache: DynamicCacheType {
530531
entityType: objectClassName,
531532
entities: nestedArray
532533
)
533-
}
534-
case .object:
535-
if let objectClassName = property.objectClassName,
534+
} else if let objectClassName = property.objectClassName,
536535
let nestedObject = entity[property.name] as? Object
537536
{
538537
cascadeDelete(
@@ -575,7 +574,7 @@ extension RealmCache: DynamicCacheType {
575574
entity: nestedObject
576575
)
577576
} else if let property = properties[translatedKey],
578-
property.type == .array,
577+
property.isArray,
579578
let objectClassName = property.objectClassName,
580579
let entityId = entity[Entity.Key.entityId],
581580
let dynamicObject = realm.dynamicObject(ofType: entityType, forPrimaryKey: entityId),
@@ -603,7 +602,7 @@ extension RealmCache: DynamicCacheType {
603602
if let transform = transform,
604603
let value = transform.transformFromJSON(entity[key]) as? NSObject,
605604
let property = properties[translatedKey],
606-
property.type != .array,
605+
!property.isArray,
607606
let objectClassName = property.objectClassName,
608607
let schema = realm.schema[objectClassName]
609608
{

‎Kinvey/Kinvey/User.swift

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,31 +1567,30 @@ open class User: NSObject, Credential, Mappable {
15671567
public struct UserSocialIdentity : StaticMappable {
15681568

15691569
/// Facebook social identity
1570-
public let facebook: [String : Any]?
1570+
public var facebook: [String : Any]?
15711571

15721572
/// Twitter social identity
1573-
public let twitter: [String : Any]?
1573+
public var twitter: [String : Any]?
15741574

15751575
/// Google+ social identity
1576-
public let googlePlus: [String : Any]?
1576+
public var googlePlus: [String : Any]?
15771577

15781578
/// LinkedIn social identity
1579-
public let linkedIn: [String : Any]?
1579+
public var linkedIn: [String : Any]?
15801580

15811581
/// Kinvey MIC social identity
1582-
public let kinvey: [String : Any]?
1582+
public var kinvey: [String : Any]?
15831583

15841584
public static func objectForMapping(map: Map) -> BaseMappable? {
1585-
return UserSocialIdentity(
1586-
facebook: map[AuthSource.facebook.rawValue].value(),
1587-
twitter: map[AuthSource.twitter.rawValue].value(),
1588-
googlePlus: map[AuthSource.googlePlus.rawValue].value(),
1589-
linkedIn: map[AuthSource.linkedIn.rawValue].value(),
1590-
kinvey: map[AuthSource.kinvey.rawValue].value()
1591-
)
1585+
return UserSocialIdentity()
15921586
}
15931587

15941588
public mutating func mapping(map: Map) {
1589+
facebook <- map[AuthSource.facebook.rawValue]
1590+
twitter <- map[AuthSource.twitter.rawValue]
1591+
googlePlus <- map[AuthSource.googlePlus.rawValue]
1592+
linkedIn <- map[AuthSource.linkedIn.rawValue]
1593+
kinvey <- map[AuthSource.kinvey.rawValue]
15951594
}
15961595

15971596
}

‎Kinvey/KinveyAppUITests/KinveyAppUITests.swift

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,14 @@ class KinveyAppUITests: XCTestCase {
4242

4343
app.staticTexts["MIC Login"].tap()
4444
app.switches["SFAuthenticationSession"].tap()
45+
46+
addUIInterruptionMonitor(withDescription: "SFAuthenticationSession") { (alert) -> Bool in
47+
alert.buttons["Continue"].tap()
48+
return true
49+
}
50+
4551
app.buttons["Login"].tap()
52+
app.tap()
4653

4754
let code = UUID().uuidString
4855
let userId = UUID().uuidString
@@ -87,8 +94,6 @@ class KinveyAppUITests: XCTestCase {
8794
server.stop()
8895
}
8996

90-
app.buttons["URL"].tap()
91-
9297
let userIdValue = app.staticTexts["User ID Value"]
9398
XCTAssertTrue(userIdValue.waitForExistence(timeout: 30))
9499
XCTAssertEqual(userIdValue.label, userId)

0 commit comments

Comments
 (0)