Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding “name” field to payload;updated nimble to version 7.3.4 #833

Merged
merged 1 commit into from
Jul 19, 2019
Merged

adding “name” field to payload;updated nimble to version 7.3.4 #833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Analytics.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-AnalyticsTests/Pods-AnalyticsTests-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-AnalyticsTests/Pods-AnalyticsTests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/Alamofire-Synchronous/Alamofire_Synchronous.framework",
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
Expand All @@ -560,7 +560,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AnalyticsTests/Pods-AnalyticsTests-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AnalyticsTests/Pods-AnalyticsTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down
1 change: 1 addition & 0 deletions Analytics/Classes/Internal/SEGSegmentIntegration.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ - (NSDictionary *)staticContext
dict[@"type"] = @"ios";
dict[@"model"] = GetDeviceModel();
dict[@"id"] = [[device identifierForVendor] UUIDString];
dict[@"name"] = [device model];
if (NSClassFromString(SEGAdvertisingClassIdentifier)) {
dict[@"adTrackingEnabled"] = @(GetAdTrackingEnabled());
}
Expand Down
2 changes: 1 addition & 1 deletion Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ target 'AnalyticsTests' do
use_frameworks!

pod 'Quick', '~> 1.2.0'
pod 'Nimble', '~> 7.3.1'
pod 'Nimble', '~> 7.3.4'
pod 'Nocilla', '~> 0.11.0'
pod 'Alamofire', '~> 4.5'
pod 'Alamofire-Synchronous', '~> 4.0'
Expand Down
10 changes: 5 additions & 5 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ PODS:
- Alamofire (4.6.0)
- Alamofire-Synchronous (4.0.0):
- Alamofire (~> 4.0)
- Nimble (7.3.1)
- Nimble (7.3.4)
- Nocilla (0.11.0)
- Quick (1.2.0)
- SwiftTryCatch (1.0.0)

DEPENDENCIES:
- Alamofire (~> 4.5)
- Alamofire-Synchronous (~> 4.0)
- Nimble (~> 7.3.1)
- Nimble (~> 7.3.4)
- Nocilla (~> 0.11.0)
- Quick (~> 1.2.0)
- SwiftTryCatch (from `https://github.com/segmentio/SwiftTryCatch.git`)
Expand All @@ -35,11 +35,11 @@ CHECKOUT OPTIONS:
SPEC CHECKSUMS:
Alamofire: f41a599bd63041760b26d393ec1069d9d7b917f4
Alamofire-Synchronous: eedf1e6e961c3795a63c74990b3f7d9fbfac7e50
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
Nocilla: 7af7a386071150cc8aa5da4da97d060f049dd61c
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
SwiftTryCatch: 2f4ef36cf5396bdb450006b70633dbce5260d3b3

PODFILE CHECKSUM: cf4abb4263c7b514d71c70514284ac657d90865d
PODFILE CHECKSUM: 96037d813a3e1239ea354ede97146038cd4a31bb

COCOAPODS: 1.5.3
COCOAPODS: 1.7.4