Skip to content

Commit b433e8a

Browse files
committed
Merge branch 'main' of github.com:segmentio/analytics-swift
2 parents 246a4d2 + 6b0e7b9 commit b433e8a

File tree

5 files changed

+695
-3
lines changed

5 files changed

+695
-3
lines changed

Examples/apps/DestinationsExample/DestinationsExample.xcodeproj/project.pbxproj

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
965DC1262671656C00DDF9C7 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 965DC1252671656C00DDF9C7 /* GoogleService-Info.plist */; };
2828
9697C1F52679156C00B87EC1 /* Segment_Logo_Avatar_Grey-1024.png in Resources */ = {isa = PBXBuildFile; fileRef = 9697C1F42679156C00B87EC1 /* Segment_Logo_Avatar_Grey-1024.png */; };
2929
96D8F16F26EFFA09007F8B28 /* ExampleDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D8F16E26EFFA09007F8B28 /* ExampleDestination.swift */; };
30+
96DBF37D26FA943300724B0B /* ComscoreDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF37C26FA943300724B0B /* ComscoreDestination.swift */; };
31+
96DBF38026FA984A00724B0B /* ComScore in Frameworks */ = {isa = PBXBuildFile; productRef = 96DBF37F26FA984A00724B0B /* ComScore */; };
3032
BA384C9826824F3700AFEA1B /* AppsFlyerLib in Frameworks */ = {isa = PBXBuildFile; productRef = BA384C9726824F3700AFEA1B /* AppsFlyerLib */; };
3133
BA384C9A2682973300AFEA1B /* AppsFlyerDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA384C992682973300AFEA1B /* AppsFlyerDestination.swift */; };
3234
/* End PBXBuildFile section */
@@ -50,6 +52,7 @@
5052
965DC1252671656C00DDF9C7 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
5153
9697C1F42679156C00B87EC1 /* Segment_Logo_Avatar_Grey-1024.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Segment_Logo_Avatar_Grey-1024.png"; sourceTree = "<group>"; };
5254
96D8F16E26EFFA09007F8B28 /* ExampleDestination.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExampleDestination.swift; sourceTree = "<group>"; };
55+
96DBF37C26FA943300724B0B /* ComscoreDestination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComscoreDestination.swift; sourceTree = "<group>"; };
5356
BA384C992682973300AFEA1B /* AppsFlyerDestination.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppsFlyerDestination.swift; sourceTree = "<group>"; };
5457
BA384C9D2686609000AFEA1B /* DestinationsExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DestinationsExample.entitlements; sourceTree = "<group>"; };
5558
/* End PBXFileReference section */
@@ -62,6 +65,7 @@
6265
BA384C9826824F3700AFEA1B /* AppsFlyerLib in Frameworks */,
6366
469EC8E0266828860068F9E3 /* FlurryAnalyticsSPM in Frameworks */,
6467
469EC8D0266066130068F9E3 /* SystemConfiguration.framework in Frameworks */,
68+
96DBF38026FA984A00724B0B /* ComScore in Frameworks */,
6569
965DC1212669942800DDF9C7 /* FirebaseAnalytics in Frameworks */,
6670
469F7B1D266011D70038E773 /* Segment in Frameworks */,
6771
965DC0FE2668079400DDF9C7 /* Mixpanel in Frameworks */,
@@ -121,6 +125,7 @@
121125
BA384C992682973300AFEA1B /* AppsFlyerDestination.swift */,
122126
469F7B24266013320038E773 /* AdjustDestination.swift */,
123127
965DC0F92668077400DDF9C7 /* AmplitudeSession.swift */,
128+
96DBF37C26FA943300724B0B /* ComscoreDestination.swift */,
124129
96D8F16E26EFFA09007F8B28 /* ExampleDestination.swift */,
125130
965DC1222669947F00DDF9C7 /* FirebaseDestination.swift */,
126131
469F7B1F266012CB0038E773 /* FlurryDestination.swift */,
@@ -162,6 +167,7 @@
162167
469EC8DF266828860068F9E3 /* FlurryAnalyticsSPM */,
163168
965DC1202669942800DDF9C7 /* FirebaseAnalytics */,
164169
BA384C9726824F3700AFEA1B /* AppsFlyerLib */,
170+
96DBF37F26FA984A00724B0B /* ComScore */,
165171
);
166172
productName = DestinationsExample;
167173
productReference = 469F7B04266011690038E773 /* DestinationsExample.app */;
@@ -196,6 +202,7 @@
196202
469EC8DE266828860068F9E3 /* XCRemoteSwiftPackageReference "FlurrySwiftPackage" */,
197203
965DC11F2669942800DDF9C7 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
198204
BA384C9626824F3700AFEA1B /* XCRemoteSwiftPackageReference "AppsFlyerFramework" */,
205+
96DBF37E26FA984900724B0B /* XCRemoteSwiftPackageReference "Comscore-Swift-Package-Manager" */,
199206
);
200207
productRefGroup = 469F7B05266011690038E773 /* Products */;
201208
projectDirPath = "";
@@ -231,6 +238,7 @@
231238
469F7B0C266011690038E773 /* ViewController.swift in Sources */,
232239
96D8F16F26EFFA09007F8B28 /* ExampleDestination.swift in Sources */,
233240
965DC0FA2668077400DDF9C7 /* MixpanelDestination.swift in Sources */,
241+
96DBF37D26FA943300724B0B /* ComscoreDestination.swift in Sources */,
234242
965DC0FB2668077400DDF9C7 /* AmplitudeSession.swift in Sources */,
235243
469F7B08266011690038E773 /* AppDelegate.swift in Sources */,
236244
469F7B25266013320038E773 /* AdjustDestination.swift in Sources */,
@@ -479,6 +487,14 @@
479487
version = 8.1.0;
480488
};
481489
};
490+
96DBF37E26FA984900724B0B /* XCRemoteSwiftPackageReference "Comscore-Swift-Package-Manager" */ = {
491+
isa = XCRemoteSwiftPackageReference;
492+
repositoryURL = "git@github.com:comScore/Comscore-Swift-Package-Manager.git";
493+
requirement = {
494+
kind = upToNextMajorVersion;
495+
minimumVersion = 6.0.0;
496+
};
497+
};
482498
BA384C9626824F3700AFEA1B /* XCRemoteSwiftPackageReference "AppsFlyerFramework" */ = {
483499
isa = XCRemoteSwiftPackageReference;
484500
repositoryURL = "https://github.com/AppsFlyerSDK/AppsFlyerFramework";
@@ -514,6 +530,11 @@
514530
package = 965DC11F2669942800DDF9C7 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
515531
productName = FirebaseAnalytics;
516532
};
533+
96DBF37F26FA984A00724B0B /* ComScore */ = {
534+
isa = XCSwiftPackageProductDependency;
535+
package = 96DBF37E26FA984900724B0B /* XCRemoteSwiftPackageReference "Comscore-Swift-Package-Manager" */;
536+
productName = ComScore;
537+
};
517538
BA384C9726824F3700AFEA1B /* AppsFlyerLib */ = {
518539
isa = XCSwiftPackageProductDependency;
519540
package = BA384C9626824F3700AFEA1B /* XCRemoteSwiftPackageReference "AppsFlyerFramework" */;

Examples/apps/DestinationsExample/DestinationsExample/AppDelegate.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3838
// Add the Firebase destination plugin
3939
analytics?.add(plugin: FirebaseDestination())
4040

41-
//Add the AppsFlyer destination plugin
41+
// Add the AppsFlyer destination plugin
4242
analytics?.add(plugin: AppsFlyerDestination())
4343

44+
// Add the Comscore destination plugin
45+
analytics?.add(plugin: ComscoreDestination())
46+
4447
return true
4548
}
4649

Examples/apps/DestinationsExample/DestinationsExample/ViewController.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,15 @@ extension ViewController {
129129
captureView.alpha = 0.0
130130

131131
let nextKeyField = UITextField()
132+
nextKeyField.autocorrectionType = .no
133+
nextKeyField.autocapitalizationType = .none
132134
nextKeyField.placeholder = "Key..."
133135
nextKeyField.borderStyle = .roundedRect
134136
keysFields.append(nextKeyField)
135137

136138
let nextField = UITextField()
139+
nextField.autocorrectionType = .no
140+
nextField.autocapitalizationType = .none
137141
nextField.placeholder = "Value..."
138142
nextField.borderStyle = .roundedRect
139143
propertiesFields.append(nextField)

Examples/destination_plugins/AmplitudeSession.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,12 @@ class AmplitudeSession: EventPlugin, iOSLifecycle {
118118
return returnEvent
119119
}
120120

121-
func applicationWillEnterForeground(application: UIApplication) {
121+
func applicationWillEnterForeground(application: UIApplication?) {
122122
startTimer()
123123
analytics?.log(message: "Amplitude Session ID: \(sessionID ?? -1)")
124124
}
125125

126-
func applicationWillResignActive(application: UIApplication) {
126+
func applicationWillResignActive(application: UIApplication?) {
127127
stopTimer()
128128
}
129129
}

0 commit comments

Comments
 (0)