Skip to content

Commit cf99cb6

Browse files
Merge pull request #833 from segmentio/djackins/devel
adding “name” field to payload;updated nimble to version 7.3.4
2 parents 892e09d + 1521431 commit cf99cb6

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

Analytics.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@
541541
files = (
542542
);
543543
inputPaths = (
544-
"${SRCROOT}/Pods/Target Support Files/Pods-AnalyticsTests/Pods-AnalyticsTests-frameworks.sh",
544+
"${PODS_ROOT}/Target Support Files/Pods-AnalyticsTests/Pods-AnalyticsTests-frameworks.sh",
545545
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
546546
"${BUILT_PRODUCTS_DIR}/Alamofire-Synchronous/Alamofire_Synchronous.framework",
547547
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
@@ -560,7 +560,7 @@
560560
);
561561
runOnlyForDeploymentPostprocessing = 0;
562562
shellPath = /bin/sh;
563-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AnalyticsTests/Pods-AnalyticsTests-frameworks.sh\"\n";
563+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AnalyticsTests/Pods-AnalyticsTests-frameworks.sh\"\n";
564564
showEnvVarsInLog = 0;
565565
};
566566
/* End PBXShellScriptBuildPhase section */

Analytics/Classes/Internal/SEGSegmentIntegration.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ - (NSDictionary *)staticContext
167167
dict[@"type"] = @"ios";
168168
dict[@"model"] = GetDeviceModel();
169169
dict[@"id"] = [[device identifierForVendor] UUIDString];
170+
dict[@"name"] = [device model];
170171
if (NSClassFromString(SEGAdvertisingClassIdentifier)) {
171172
dict[@"adTrackingEnabled"] = @(GetAdTrackingEnabled());
172173
}

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ target 'AnalyticsTests' do
44
use_frameworks!
55

66
pod 'Quick', '~> 1.2.0'
7-
pod 'Nimble', '~> 7.3.1'
7+
pod 'Nimble', '~> 7.3.4'
88
pod 'Nocilla', '~> 0.11.0'
99
pod 'Alamofire', '~> 4.5'
1010
pod 'Alamofire-Synchronous', '~> 4.0'

Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ PODS:
22
- Alamofire (4.6.0)
33
- Alamofire-Synchronous (4.0.0):
44
- Alamofire (~> 4.0)
5-
- Nimble (7.3.1)
5+
- Nimble (7.3.4)
66
- Nocilla (0.11.0)
77
- Quick (1.2.0)
88
- SwiftTryCatch (1.0.0)
99

1010
DEPENDENCIES:
1111
- Alamofire (~> 4.5)
1212
- Alamofire-Synchronous (~> 4.0)
13-
- Nimble (~> 7.3.1)
13+
- Nimble (~> 7.3.4)
1414
- Nocilla (~> 0.11.0)
1515
- Quick (~> 1.2.0)
1616
- SwiftTryCatch (from `https://github.com/segmentio/SwiftTryCatch.git`)
@@ -35,11 +35,11 @@ CHECKOUT OPTIONS:
3535
SPEC CHECKSUMS:
3636
Alamofire: f41a599bd63041760b26d393ec1069d9d7b917f4
3737
Alamofire-Synchronous: eedf1e6e961c3795a63c74990b3f7d9fbfac7e50
38-
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
38+
Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
3939
Nocilla: 7af7a386071150cc8aa5da4da97d060f049dd61c
4040
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
4141
SwiftTryCatch: 2f4ef36cf5396bdb450006b70633dbce5260d3b3
4242

43-
PODFILE CHECKSUM: cf4abb4263c7b514d71c70514284ac657d90865d
43+
PODFILE CHECKSUM: 96037d813a3e1239ea354ede97146038cd4a31bb
4444

45-
COCOAPODS: 1.5.3
45+
COCOAPODS: 1.7.4

0 commit comments

Comments
 (0)