Merge pull request #81 from wordpress-mobile/develop

Bringing master current for 0.1.19 release
wordpress-mobile · Aug 30, 2016 · 3675c96 · 3675c96
2 parents 571693d + 143e4ce
commit 3675c96
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 31 deletions.
diff --git a/Podfile b/Podfile
@@ -2,8 +2,9 @@ inhibit_all_warnings!
 
 platform :ios, '7.0'
 
-target "WordPressCom-Analytics-iOSTests", :exclusive => true do
+target 'WordPressCom-Analytics-iOSTests' do
   pod 'Specta', '~> 0.2.1'
   pod 'Expecta'
   pod 'OCMock'
 end
+
diff --git a/Podfile.lock b/Podfile.lock
@@ -13,4 +13,6 @@ SPEC CHECKSUMS:
   OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92
   Specta: 15a276a6343867b426d5ed135d5aa4d04123a573
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: a4c7de5e7134c73b42ab23f160a2764806537fab
+
+COCOAPODS: 1.0.1
diff --git a/WordPressCom-Analytics-iOS.podspec b/WordPressCom-Analytics-iOS.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "WordPressCom-Analytics-iOS"
-  s.version      = "0.1.11"
+  s.version      = "0.1.19"
   s.summary      = "Library for handling Analytics tracking in WPiOS"
   s.homepage     = "http://apps.wordpress.org"
   s.license      = { :type => "GPLv2" }

diff --git a/WordPressCom-Analytics-iOS.xcodeproj/project.pbxproj b/WordPressCom-Analytics-iOS.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		232DF3CABE8D90483E8CF38B /* libPods-WordPressCom-Analytics-iOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C6C8E87B0B8E081E9913D0C /* libPods-WordPressCom-Analytics-iOSTests.a */; };
 		85902C6E19833055004A95F2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 85902C6D19833055004A95F2 /* Foundation.framework */; };
 		85902C7C19833055004A95F2 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 85902C7B19833055004A95F2 /* XCTest.framework */; };
 		85902C7D19833055004A95F2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 85902C6D19833055004A95F2 /* Foundation.framework */; };
@@ -16,7 +17,6 @@
 		85902C9519833080004A95F2 /* WPAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 85902C9419833080004A95F2 /* WPAnalytics.m */; };
 		85902C9819833107004A95F2 /* WPAnalyticsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 85902C9719833107004A95F2 /* WPAnalyticsTests.m */; };
 		85902C9B198334F7004A95F2 /* TestAnalyticsTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 85902C9A198334F7004A95F2 /* TestAnalyticsTracker.m */; };
-		9ABCDC7407BC432881DD0C7F /* libPods-WordPressCom-Analytics-iOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F04897E1B945F5A38783B1 /* libPods-WordPressCom-Analytics-iOSTests.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -42,8 +42,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		17F04897E1B945F5A38783B1 /* libPods-WordPressCom-Analytics-iOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-WordPressCom-Analytics-iOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		1D9CC05819E92765E3515D65 /* Pods-WordPressCom-Analytics-iOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressCom-Analytics-iOSTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressCom-Analytics-iOSTests/Pods-WordPressCom-Analytics-iOSTests.debug.xcconfig"; sourceTree = "<group>"; };
+		524FB2245716594AC918ACB3 /* Pods-WordPressCom-Analytics-iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressCom-Analytics-iOSTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressCom-Analytics-iOSTests/Pods-WordPressCom-Analytics-iOSTests.release.xcconfig"; sourceTree = "<group>"; };
+		5C6C8E87B0B8E081E9913D0C /* libPods-WordPressCom-Analytics-iOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-WordPressCom-Analytics-iOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		85902C6A19833055004A95F2 /* libWordPressCom-Analytics-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libWordPressCom-Analytics-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		85902C6D19833055004A95F2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		85902C7119833055004A95F2 /* WordPressCom-Analytics-iOS-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WordPressCom-Analytics-iOS-Prefix.pch"; sourceTree = "<group>"; };
@@ -57,7 +57,7 @@
 		85902C9719833107004A95F2 /* WPAnalyticsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WPAnalyticsTests.m; sourceTree = "<group>"; };
 		85902C99198334F7004A95F2 /* TestAnalyticsTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestAnalyticsTracker.h; sourceTree = "<group>"; };
 		85902C9A198334F7004A95F2 /* TestAnalyticsTracker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestAnalyticsTracker.m; sourceTree = "<group>"; };
-		F2B76B1CC19DF4E0A31EE633 /* Pods-WordPressCom-Analytics-iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressCom-Analytics-iOSTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressCom-Analytics-iOSTests/Pods-WordPressCom-Analytics-iOSTests.release.xcconfig"; sourceTree = "<group>"; };
+		C372E5EB6B5A1C5052433BA7 /* Pods-WordPressCom-Analytics-iOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressCom-Analytics-iOSTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressCom-Analytics-iOSTests/Pods-WordPressCom-Analytics-iOSTests.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -77,30 +77,21 @@
 				85902C7F19833055004A95F2 /* UIKit.framework in Frameworks */,
 				85902C8219833055004A95F2 /* libWordPressCom-Analytics-iOS.a in Frameworks */,
 				85902C7D19833055004A95F2 /* Foundation.framework in Frameworks */,
-				9ABCDC7407BC432881DD0C7F /* libPods-WordPressCom-Analytics-iOSTests.a in Frameworks */,
+				232DF3CABE8D90483E8CF38B /* libPods-WordPressCom-Analytics-iOSTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		3B0263D8B9E46D740078E3DC /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				1D9CC05819E92765E3515D65 /* Pods-WordPressCom-Analytics-iOSTests.debug.xcconfig */,
-				F2B76B1CC19DF4E0A31EE633 /* Pods-WordPressCom-Analytics-iOSTests.release.xcconfig */,
-			);
-			name = Pods;
-			sourceTree = "<group>";
-		};
 		85902C6119833055004A95F2 = {
 			isa = PBXGroup;
 			children = (
 				85902C6F19833055004A95F2 /* WordPressCom-Analytics-iOS */,
 				85902C8319833055004A95F2 /* WordPressCom-Analytics-iOSTests */,
 				85902C6C19833055004A95F2 /* Frameworks */,
 				85902C6B19833055004A95F2 /* Products */,
-				3B0263D8B9E46D740078E3DC /* Pods */,
+				D9CDC37D1EE53390D966EA0C /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -119,7 +110,7 @@
 				85902C6D19833055004A95F2 /* Foundation.framework */,
 				85902C7B19833055004A95F2 /* XCTest.framework */,
 				85902C7E19833055004A95F2 /* UIKit.framework */,
-				17F04897E1B945F5A38783B1 /* libPods-WordPressCom-Analytics-iOSTests.a */,
+				5C6C8E87B0B8E081E9913D0C /* libPods-WordPressCom-Analytics-iOSTests.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -162,6 +153,15 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		D9CDC37D1EE53390D966EA0C /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				C372E5EB6B5A1C5052433BA7 /* Pods-WordPressCom-Analytics-iOSTests.debug.xcconfig */,
+				524FB2245716594AC918ACB3 /* Pods-WordPressCom-Analytics-iOSTests.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -186,12 +186,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 85902C9019833055004A95F2 /* Build configuration list for PBXNativeTarget "WordPressCom-Analytics-iOSTests" */;
 			buildPhases = (
-				63613B62E8E840F09E0D8F5F /* Check Pods Manifest.lock */,
+				177C355384E735A6CB952482 /* [CP] Check Pods Manifest.lock */,
 				85902C7619833055004A95F2 /* Sources */,
 				85902C7719833055004A95F2 /* Frameworks */,
 				85902C7819833055004A95F2 /* Resources */,
-				D2F44A950A1845FFB45216F4 /* Copy Pods Resources */,
-				6BF3932407745CBC3092DD31 /* Embed Pods Frameworks */,
+				BF29EF8372C4431498B3B29D /* [CP] Embed Pods Frameworks */,
+				FB85E379D9F865ED59C85B11 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -242,44 +242,44 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		63613B62E8E840F09E0D8F5F /* Check Pods Manifest.lock */ = {
+		177C355384E735A6CB952482 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		6BF3932407745CBC3092DD31 /* Embed Pods Frameworks */ = {
+		BF29EF8372C4431498B3B29D /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Embed Pods Frameworks";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WordPressCom-Analytics-iOSTests/Pods-WordPressCom-Analytics-iOSTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D2F44A950A1845FFB45216F4 /* Copy Pods Resources */ = {
+		FB85E379D9F865ED59C85B11 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Copy Pods Resources";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -423,7 +423,7 @@
 		};
 		85902C9119833055004A95F2 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1D9CC05819E92765E3515D65 /* Pods-WordPressCom-Analytics-iOSTests.debug.xcconfig */;
+			baseConfigurationReference = C372E5EB6B5A1C5052433BA7 /* Pods-WordPressCom-Analytics-iOSTests.debug.xcconfig */;
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
@@ -444,7 +444,7 @@
 		};
 		85902C9219833055004A95F2 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = F2B76B1CC19DF4E0A31EE633 /* Pods-WordPressCom-Analytics-iOSTests.release.xcconfig */;
+			baseConfigurationReference = 524FB2245716594AC918ACB3 /* Pods-WordPressCom-Analytics-iOSTests.release.xcconfig */;
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",

diff --git a/WordPressCom-Analytics-iOS/WPAnalytics.h b/WordPressCom-Analytics-iOS/WPAnalytics.h
@@ -18,6 +18,7 @@ typedef NS_ENUM(NSUInteger, WPAnalyticsStat) {
     WPAnalyticsStatApplicationClosed,
     WPAnalyticsStatApplicationOpened,
     WPAnalyticsStatCreatedAccount,
+    WPAnalyticsStatCreatedSite,
     WPAnalyticsStatDefaultAccountChanged,
     WPAnalyticsStatEditorAddedPhotoViaLocalLibrary,
     WPAnalyticsStatEditorAddedVideoViaLocalLibrary,
@@ -63,6 +64,18 @@ typedef NS_ENUM(NSUInteger, WPAnalyticsStat) {
     WPAnalyticsStatLoginMagicLinkSucceeded,
     WPAnalyticsStatLogout,
     WPAnalyticsStatLowMemoryWarning,
+    WPAnalyticsStatMenusAccessed,
+    WPAnalyticsStatMenusCreatedItem,
+    WPAnalyticsStatMenusCreatedMenu,
+    WPAnalyticsStatMenusDeletedMenu,
+    WPAnalyticsStatMenusDeletedItem,
+    WPAnalyticsStatMenusDiscardedChanges,
+    WPAnalyticsStatMenusEditedItem,
+    WPAnalyticsStatMenusOpenedItemEditor,
+    WPAnalyticsStatMenusOrderedItems,
+    WPAnalyticsStatMenusSavedMenu,
+    WPAnalyticsStatMeTabAccessed,
+    WPAnalyticsStatMySitesTabAccessed,
     WPAnalyticsStatNotificationsCommentApproved,
     WPAnalyticsStatNotificationsCommentFlaggedAsSpam,
     WPAnalyticsStatNotificationsCommentLiked,
@@ -88,6 +101,8 @@ typedef NS_ENUM(NSUInteger, WPAnalyticsStat) {
     WPAnalyticsStatOpenedNotificationSettingStreams,
     WPAnalyticsStatOpenedNotificationSettingDetails,
     WPAnalyticsStatOpenedPages,
+    WPAnalyticsStatOpenedPlans,
+    WPAnalyticsStatOpenedPlansComparison,
     WPAnalyticsStatOpenedPeople,
     WPAnalyticsStatOpenedPerson,
     WPAnalyticsStatOpenedPosts,
@@ -133,6 +148,9 @@ typedef NS_ENUM(NSUInteger, WPAnalyticsStat) {
     WPAnalyticsStatReaderListLoaded,
     WPAnalyticsStatReaderListPreviewed,
     WPAnalyticsStatReaderListUnfollowed,
+    WPAnalyticsStatReaderSearchLoaded,
+    WPAnalyticsStatReaderSearchPerformed,
+    WPAnalyticsStatReaderSearchResultTapped,
     WPAnalyticsStatReaderSiteBlocked,
     WPAnalyticsStatReaderSiteFollowed,
     WPAnalyticsStatReaderSitePreviewed,
@@ -188,7 +206,6 @@ typedef NS_ENUM(NSUInteger, WPAnalyticsStat) {
     WPAnalyticsStatStatsPeriodWeeksAccessed,
     WPAnalyticsStatStatsPeriodMonthsAccessed,
     WPAnalyticsStatStatsPeriodYearsAccessed,
-    WPAnalyticsStatStatsOpenedWebVersion,
     WPAnalyticsStatStatsScrolledToBottom,
     WPAnalyticsStatStatsSinglePostAccessed,
     WPAnalyticsStatStatsTappedBarChart,
@@ -206,6 +223,8 @@ typedef NS_ENUM(NSUInteger, WPAnalyticsStat) {
     WPAnalyticsStatThemesDetailsAccessed,
     WPAnalyticsStatThemesPreviewedSite,
     WPAnalyticsStatThemesSupportAccessed,
+    WPAnalyticsStatTrainTracksRender,
+    WPAnalyticsStatTrainTracksInteract,
     WPAnalyticsStatTwoFactorCodeRequested,
     WPAnalyticsStatTwoFactorSentSMS,
     WPAnalyticsStatMaxValue