Skip to content

Commit 31f0f08

Browse files
travisjefferytravisjeffery
committed
Merge branch 'master' of github.com:segmentio/analytics-ios
* 'master' of github.com:segmentio/analytics-ios: Enable Monitoring web views for Crittercism Update Crittercism Integration Update optimizely SDK bump podfile
2 parents 7bc35cb + 29e456a commit 31f0f08

File tree

4 files changed

+14
-148
lines changed

4 files changed

+14
-148
lines changed

‎Analytics.xcodeproj/project.pbxproj

Lines changed: 2 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -1851,75 +1851,7 @@
18511851
"$(PROJECT_DIR)/Pods/build/Debug-iphoneos",
18521852
);
18531853
ONLY_ACTIVE_ARCH = YES;
1854-
OTHER_LDFLAGS = (
1855-
"-ObjC",
1856-
"-l\"AdIdAccess\"",
1857-
"-l\"AppsFlyerLib\"",
1858-
"-l\"Crittercism_v5_0_5\"",
1859-
"-l\"Flurry_4.4.0\"",
1860-
"-l\"GoogleAnalyticsServices\"",
1861-
"-l\"Kahuna\"",
1862-
"-l\"Localytics\"",
1863-
"-l\"MPCategoryHelpers\"",
1864-
"-l\"Pods-Analytics-Amplitude-iOS\"",
1865-
"-l\"Pods-Analytics-AppsFlyer-SDK\"",
1866-
"-l\"Pods-Analytics-Bugsnag\"",
1867-
"-l\"Pods-Analytics-Countly\"",
1868-
"-l\"Pods-Analytics-CrittercismSDK\"",
1869-
"-l\"Pods-Analytics-FlurrySDK\"",
1870-
"-l\"Pods-Analytics-GoogleAnalytics-iOS-SDK\"",
1871-
"-l\"Pods-Analytics-KahunaSDK\"",
1872-
"-l\"Pods-Analytics-Localytics\"",
1873-
"-l\"Pods-Analytics-Mixpanel\"",
1874-
"-l\"Pods-Analytics-Optimizely-iOS-SDK\"",
1875-
"-l\"Pods-Analytics-Quantcast-Measure\"",
1876-
"-l\"Pods-Analytics-TRVSDictionaryWithCaseInsensitivity\"",
1877-
"-l\"Pods-Analytics-Taplytics\"",
1878-
"-l\"Pods-Analytics-Apptimize\"",
1879-
"-l\"Pods-Analytics-Tapstream\"",
1880-
"-framework",
1881-
"\"Accelerate\"",
1882-
"-framework",
1883-
"\"AdSupport\"",
1884-
"-framework",
1885-
"\"AudioToolbox\"",
1886-
"-framework",
1887-
"\"CFNetwork\"",
1888-
"-framework",
1889-
"\"CoreBluetooth\"",
1890-
"-framework",
1891-
"\"CoreData\"",
1892-
"-framework",
1893-
"\"CoreGraphics\"",
1894-
"-framework",
1895-
"\"CoreLocation\"",
1896-
"-framework",
1897-
"\"CoreTelephony\"",
1898-
"-framework",
1899-
"\"Foundation\"",
1900-
"-framework",
1901-
"\"JavaScriptCore\"",
1902-
"-framework",
1903-
"\"MobileCoreServices\"",
1904-
"-framework",
1905-
"\"Optimizely\"",
1906-
"-framework",
1907-
"\"QuartzCore\"",
1908-
"-framework",
1909-
"\"Security\"",
1910-
"-framework",
1911-
"\"SystemConfiguration\"",
1912-
"-framework",
1913-
"\"Taplytics\"",
1914-
"-framework",
1915-
"\"UIKit\"",
1916-
"-framework",
1917-
"\"iAd\"",
1918-
"-weak_framework",
1919-
"\"AdSupport\"",
1920-
"-weak_framework",
1921-
"\"CoreTelephony\"",
1922-
);
1854+
OTHER_LDFLAGS = "";
19231855
PRIVATE_HEADERS_FOLDER_PATH = "$(PROJECT_NAME)Headers/Private";
19241856
PRODUCT_NAME = "$(TARGET_NAME)";
19251857
PUBLIC_HEADERS_FOLDER_PATH = "$(PROJECT_NAME)Headers";
@@ -1949,75 +1881,7 @@
19491881
"$(PROJECT_DIR)/Pods/CrittercismSDK/CrittercismSDK",
19501882
"$(PROJECT_DIR)/Pods/build/Debug-iphoneos",
19511883
);
1952-
OTHER_LDFLAGS = (
1953-
"-ObjC",
1954-
"-l\"AdIdAccess\"",
1955-
"-l\"AppsFlyerLib\"",
1956-
"-l\"Crittercism_v5_0_5\"",
1957-
"-l\"Flurry_4.4.0\"",
1958-
"-l\"GoogleAnalyticsServices\"",
1959-
"-l\"Kahuna\"",
1960-
"-l\"Localytics\"",
1961-
"-l\"MPCategoryHelpers\"",
1962-
"-l\"Pods-Analytics-Amplitude-iOS\"",
1963-
"-l\"Pods-Analytics-AppsFlyer-SDK\"",
1964-
"-l\"Pods-Analytics-Bugsnag\"",
1965-
"-l\"Pods-Analytics-Countly\"",
1966-
"-l\"Pods-Analytics-CrittercismSDK\"",
1967-
"-l\"Pods-Analytics-FlurrySDK\"",
1968-
"-l\"Pods-Analytics-GoogleAnalytics-iOS-SDK\"",
1969-
"-l\"Pods-Analytics-KahunaSDK\"",
1970-
"-l\"Pods-Analytics-Localytics\"",
1971-
"-l\"Pods-Analytics-Mixpanel\"",
1972-
"-l\"Pods-Analytics-Optimizely-iOS-SDK\"",
1973-
"-l\"Pods-Analytics-Quantcast-Measure\"",
1974-
"-l\"Pods-Analytics-TRVSDictionaryWithCaseInsensitivity\"",
1975-
"-l\"Pods-Analytics-Taplytics\"",
1976-
"-l\"Pods-Analytics-Apptimize\"",
1977-
"-l\"Pods-Analytics-Tapstream\"",
1978-
"-framework",
1979-
"\"Accelerate\"",
1980-
"-framework",
1981-
"\"AdSupport\"",
1982-
"-framework",
1983-
"\"AudioToolbox\"",
1984-
"-framework",
1985-
"\"CFNetwork\"",
1986-
"-framework",
1987-
"\"CoreBluetooth\"",
1988-
"-framework",
1989-
"\"CoreData\"",
1990-
"-framework",
1991-
"\"CoreGraphics\"",
1992-
"-framework",
1993-
"\"CoreLocation\"",
1994-
"-framework",
1995-
"\"CoreTelephony\"",
1996-
"-framework",
1997-
"\"Foundation\"",
1998-
"-framework",
1999-
"\"JavaScriptCore\"",
2000-
"-framework",
2001-
"\"MobileCoreServices\"",
2002-
"-framework",
2003-
"\"Optimizely\"",
2004-
"-framework",
2005-
"\"QuartzCore\"",
2006-
"-framework",
2007-
"\"Security\"",
2008-
"-framework",
2009-
"\"SystemConfiguration\"",
2010-
"-framework",
2011-
"\"Taplytics\"",
2012-
"-framework",
2013-
"\"UIKit\"",
2014-
"-framework",
2015-
"\"iAd\"",
2016-
"-weak_framework",
2017-
"\"AdSupport\"",
2018-
"-weak_framework",
2019-
"\"CoreTelephony\"",
2020-
);
1884+
OTHER_LDFLAGS = "";
20211885
PRIVATE_HEADERS_FOLDER_PATH = "$(PROJECT_NAME)Headers/Private";
20221886
PRODUCT_NAME = "$(TARGET_NAME)";
20231887
PUBLIC_HEADERS_FOLDER_PATH = "$(PROJECT_NAME)Headers";

‎Analytics/Integrations/Crittercism/SEGCrittercismIntegration.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ - (id)init {
2626
- (void)start
2727
{
2828
NSString *appId = [self.settings objectForKey:@"appId"];
29-
[Crittercism enableWithAppID:appId];
29+
CrittercismConfig* config = [CrittercismConfig defaultConfig];
30+
[config setMonitorUIWebView:[(NSNumber *)[self.settings objectForKey:@"monitorWebView"] boolValue]];
31+
[Crittercism enableWithAppID:appId andConfig:config];
3032
SEGLog(@"CrittercismIntegration initialized.");
3133
}
3234

‎Podfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PODS:
66
- Bugsnag/no-arc (= 4.0.3)
77
- Bugsnag/no-arc (4.0.3)
88
- Countly (1.0.0)
9-
- CrittercismSDK (5.0.5)
9+
- CrittercismSDK (5.2.0)
1010
- Expecta (0.3.2)
1111
- FlurrySDK (4.4.0):
1212
- FlurrySDK/FlurrySDK (= 4.4.0)
@@ -22,7 +22,7 @@ PODS:
2222
- Mixpanel/MPCategoryHelpers (= 2.6.0)
2323
- Mixpanel/MPCategoryHelpers (2.6.0)
2424
- OCMock (2.2.4)
25-
- Optimizely-iOS-SDK (1.0.75)
25+
- Optimizely-iOS-SDK (1.0.81)
2626
- Quantcast-Measure (1.4.6):
2727
- Quantcast-Measure/Core (= 1.4.6)
2828
- Quantcast-Measure/Core (1.4.6)
@@ -38,7 +38,7 @@ DEPENDENCIES:
3838
- Apptimize (= 2.10.0.1)
3939
- Bugsnag (= 4.0.3)
4040
- Countly (= 1.0.0)
41-
- CrittercismSDK (= 5.0.5)
41+
- CrittercismSDK (= 5.2.0)
4242
- Expecta (~> 0.3.0)
4343
- FlurrySDK (= 4.4.0)
4444
- GoogleAnalytics-iOS-SDK (= 3.10)
@@ -47,7 +47,7 @@ DEPENDENCIES:
4747
- Localytics (= 3.1.0)
4848
- Mixpanel (= 2.6.0)
4949
- OCMock (~> 2.2.4)
50-
- Optimizely-iOS-SDK (= 1.0.75)
50+
- Optimizely-iOS-SDK (= 1.0.81)
5151
- Quantcast-Measure (= 1.4.6)
5252
- Taplytics (= 2.1.86)
5353
- Tapstream (= 2.8.3)
@@ -60,19 +60,19 @@ SPEC CHECKSUMS:
6060
Apptimize: c180b9833f3a83498475cda9e52d67282280b0e5
6161
Bugsnag: 7267951d92ac48ff264b605cf65b42208dfde905
6262
Countly: 61e8a4518699221846db98f09a5d6f2b38267a25
63-
CrittercismSDK: 807a7ae007fc0f5e14973926ac846351650e3bce
63+
CrittercismSDK: a8f09d8f1d9fea3bc0714a954a079062c5c9d914
6464
Expecta: 8c507baf13211207b1e9d0a741480600e6b4ed15
6565
FlurrySDK: 68f1952f3d04a82cfcfbf00ed3435e81317c2946
6666
GoogleAnalytics-iOS-SDK: 4f98a376c1d61e6ac4ca47951655820314856eef
6767
KahunaSDK: ea15fdf9757c4d9bf639bf190888e20b688a30ed
6868
Localytics: 87268a820c285f6f5ed3fa505a176c049ed07462
6969
Mixpanel: 488567f7138408f360377dd46e1d189655f8b435
7070
OCMock: a6a7dc0e3997fb9f35d99f72528698ebf60d64f2
71-
Optimizely-iOS-SDK: 857b640aebe3bbe1770ba7b1715666e224a066bd
71+
Optimizely-iOS-SDK: 33b0580735808a876f0b91a53ab25c7501bad082
7272
Quantcast-Measure: 415d204ee4010b27493369e131cec09de1b5acf5
7373
Taplytics: b9ff3d3f778d807868b3b9f2d01016632b834c03
7474
Tapstream: 37f7339a7d8aa8cc92b045edbacc91ef7f4090c5
7575
TRVSDictionaryWithCaseInsensitivity: 51d2ccf52c6d645d27b63467a98fa02c556e01b0
7676
TRVSKit: cbc09d442ce631c6b0f9e4ee4fb666a96146e4b3
7777

78-
COCOAPODS: 0.36.3
78+
COCOAPODS: 0.37.1

‎scripts/integrations.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"name": "Crittercism",
3333
"dependencies": [{
3434
"name": "CrittercismSDK",
35-
"version": "5.0.5"
35+
"version": "5.2.0"
3636
}]
3737
},
3838
{
@@ -77,7 +77,7 @@
7777
"name": "Optimizely",
7878
"dependencies": [{
7979
"name": "Optimizely-iOS-SDK",
80-
"version": "1.0.75"
80+
"version": "1.0.81"
8181
}]
8282
},
8383
{

0 commit comments

Comments
 (0)