Skip to content

Commit 3a5e3b7

Browse files
frankusfrankus
authored
Merge pull request #289 from apptentive/branch_5.3.0
Release 5.3.0
2 parents aa8ef05 + f9a6314 commit 3a5e3b7

40 files changed

+1160
-1158
lines changed

‎Apptentive/Apptentive.xcodeproj/project.pbxproj

+19-11
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
01201AD31FC637BE00EB3593 /* CodePointAndInteractionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 01201AD21FC637BD00EB3593 /* CodePointAndInteractionTests.m */; };
2121
01216C501EBBB53E0062BD0D /* RequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01216C4F1EBBB53E0062BD0D /* RequestTests.swift */; };
2222
0123005F20531698000EC3C3 /* ClauseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0123005E20531698000EC3C3 /* ClauseTests.m */; };
23+
012B96C325118349008A56CC /* Apptentive.h in Headers */ = {isa = PBXBuildFile; fileRef = 012B96C22511832D008A56CC /* Apptentive.h */; };
2324
012ED9292072F33F003D87F3 /* ApptentiveRetryPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 012ED9272072F33F003D87F3 /* ApptentiveRetryPolicy.h */; };
2425
012ED92A2072F33F003D87F3 /* ApptentiveRetryPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 012ED9282072F33F003D87F3 /* ApptentiveRetryPolicy.m */; };
2526
012ED92C2072FABE003D87F3 /* RetryPolicyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012ED92B2072FABE003D87F3 /* RetryPolicyTests.swift */; };
@@ -97,7 +98,7 @@
9798
018FAFF01FC4B21A007C52FE /* ApptentiveComparisonClause.m in Sources */ = {isa = PBXBuildFile; fileRef = 018FAFEE1FC4B21A007C52FE /* ApptentiveComparisonClause.m */; };
9899
01917D451E5E0B7400B37D82 /* ConversationManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01917D441E5E0B7400B37D82 /* ConversationManagerTests.swift */; };
99100
01A2CF9B1E49062800C2103A /* Apptentive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01A2CF911E49062700C2103A /* Apptentive.framework */; };
100-
01A2CFA21E49062800C2103A /* Apptentive.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A2CF941E49062700C2103A /* Apptentive.h */; settings = {ATTRIBUTES = (Public, ); }; };
101+
01A2CFA21E49062800C2103A /* ApptentiveMain.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A2CF941E49062700C2103A /* ApptentiveMain.h */; settings = {ATTRIBUTES = (Public, ); }; };
101102
01A2D0F81E490A9700C2103A /* Apptentive_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A2CFAB1E490A9600C2103A /* Apptentive_Private.h */; };
102103
01A2D0F91E490A9700C2103A /* Apptentive.m in Sources */ = {isa = PBXBuildFile; fileRef = 01A2CFAC1E490A9700C2103A /* Apptentive.m */; };
103104
01A2D0FA1E490A9700C2103A /* Apptentive.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 01A2CFAD1E490A9700C2103A /* Apptentive.storyboard */; };
@@ -462,6 +463,7 @@
462463
01201AD21FC637BD00EB3593 /* CodePointAndInteractionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CodePointAndInteractionTests.m; sourceTree = "<group>"; };
463464
01216C4F1EBBB53E0062BD0D /* RequestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestTests.swift; sourceTree = "<group>"; };
464465
0123005E20531698000EC3C3 /* ClauseTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ClauseTests.m; sourceTree = "<group>"; };
466+
012B96C22511832D008A56CC /* Apptentive.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Apptentive.h; sourceTree = "<group>"; };
465467
012ED9272072F33F003D87F3 /* ApptentiveRetryPolicy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApptentiveRetryPolicy.h; sourceTree = "<group>"; };
466468
012ED9282072F33F003D87F3 /* ApptentiveRetryPolicy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ApptentiveRetryPolicy.m; sourceTree = "<group>"; };
467469
012ED92B2072FABE003D87F3 /* RetryPolicyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RetryPolicyTests.swift; sourceTree = "<group>"; };
@@ -540,7 +542,7 @@
540542
01917D431E5E0B7400B37D82 /* ApptentiveTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ApptentiveTests-Bridging-Header.h"; sourceTree = "<group>"; };
541543
01917D441E5E0B7400B37D82 /* ConversationManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConversationManagerTests.swift; sourceTree = "<group>"; };
542544
01A2CF911E49062700C2103A /* Apptentive.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Apptentive.framework; sourceTree = BUILT_PRODUCTS_DIR; };
543-
01A2CF941E49062700C2103A /* Apptentive.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Apptentive.h; sourceTree = "<group>"; };
545+
01A2CF941E49062700C2103A /* ApptentiveMain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApptentiveMain.h; sourceTree = "<group>"; };
544546
01A2CF951E49062700C2103A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
545547
01A2CF9A1E49062800C2103A /* ApptentiveTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ApptentiveTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
546548
01A2CFA11E49062800C2103A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1002,6 +1004,7 @@
10021004
01A2CF921E49062700C2103A /* Products */,
10031005
);
10041006
sourceTree = "<group>";
1007+
usesTabs = 1;
10051008
};
10061009
01A2CF921E49062700C2103A /* Products */ = {
10071010
isa = PBXGroup;
@@ -1015,6 +1018,7 @@
10151018
01A2CF931E49062700C2103A /* Apptentive */ = {
10161019
isa = PBXGroup;
10171020
children = (
1021+
012B96C22511832D008A56CC /* Apptentive.h */,
10181022
0168B1AC24AAAFD1006EEF65 /* DebugLogging.cer */,
10191023
EF3FE88720A226EE00A3C9C5 /* Apptimize */,
10201024
01A2CFB01E490A9700C2103A /* Custom Views */,
@@ -1028,7 +1032,7 @@
10281032
01A2D0CD1E490A9700C2103A /* Reachability */,
10291033
01A2D0D01E490A9700C2103A /* Surveys */,
10301034
01A2D0441E490A9700C2103A /* localization */,
1031-
01A2CF941E49062700C2103A /* Apptentive.h */,
1035+
01A2CF941E49062700C2103A /* ApptentiveMain.h */,
10321036
01A2CFAC1E490A9700C2103A /* Apptentive.m */,
10331037
01A2CFAD1E490A9700C2103A /* Apptentive.storyboard */,
10341038
01A2CFAE1E490A9700C2103A /* ApptentiveStyleSheet.h */,
@@ -1806,7 +1810,7 @@
18061810
EF3063A91F2A8353004B4EB9 /* ApptentivePayloadDebug.h in Headers */,
18071811
01F1DFFC1E5BBFCB009AB3D2 /* ApptentiveConversationMetadataItem.h in Headers */,
18081812
01A2D1FA1E490A9700C2103A /* ApptentiveSurveyQuestionView.h in Headers */,
1809-
01A2CFA21E49062800C2103A /* Apptentive.h in Headers */,
1813+
01A2CFA21E49062800C2103A /* ApptentiveMain.h in Headers */,
18101814
01A2D18E1E490A9700C2103A /* ApptentiveMessageCenterContextMessageCell.h in Headers */,
18111815
01A2D1B41E490A9700C2103A /* ApptentiveLegacySurveyResponse.h in Headers */,
18121816
4D4B36241F01892A005C7EC0 /* ApptentiveEngagementBackend.h in Headers */,
@@ -1833,6 +1837,7 @@
18331837
01A2D1D01E490A9700C2103A /* ApptentiveSerialRequest.h in Headers */,
18341838
01A2D1D61E490A9700C2103A /* ApptentiveBackend.h in Headers */,
18351839
01A2D1411E490A9700C2103A /* ApptentiveVersion.h in Headers */,
1840+
012B96C325118349008A56CC /* Apptentive.h in Headers */,
18361841
EF49AC941EF2C50B00E2187F /* NSMutableData+Types.h in Headers */,
18371842
01A2D1271E490A9700C2103A /* ApptentiveEngagement.h in Headers */,
18381843
014508B11EAE5F71003326E7 /* ApptentiveClient.h in Headers */,
@@ -1973,7 +1978,8 @@
19731978
01A2CF881E49062700C2103A /* Project object */ = {
19741979
isa = PBXProject;
19751980
attributes = {
1976-
LastUpgradeCheck = 0930;
1981+
LastSwiftUpdateCheck = 1200;
1982+
LastUpgradeCheck = 1200;
19771983
ORGANIZATIONNAME = "Apptentive, Inc.";
19781984
TargetAttributes = {
19791985
01A2CF901E49062700C2103A = {
@@ -2402,14 +2408,15 @@
24022408
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
24032409
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
24042410
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
2411+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
24052412
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
24062413
CLANG_WARN_STRICT_PROTOTYPES = YES;
24072414
CLANG_WARN_SUSPICIOUS_MOVE = YES;
24082415
CLANG_WARN_UNREACHABLE_CODE = YES;
24092416
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
24102417
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
24112418
COPY_PHASE_STRIP = NO;
2412-
CURRENT_PROJECT_VERSION = 43;
2419+
CURRENT_PROJECT_VERSION = 45;
24132420
DEBUG_INFORMATION_FORMAT = dwarf;
24142421
ENABLE_STRICT_OBJC_MSGSEND = YES;
24152422
ENABLE_TESTABILITY = YES;
@@ -2423,7 +2430,7 @@
24232430
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
24242431
GCC_WARN_UNUSED_FUNCTION = YES;
24252432
GCC_WARN_UNUSED_VARIABLE = YES;
2426-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
2433+
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
24272434
MTL_ENABLE_DEBUG_INFO = YES;
24282435
ONLY_ACTIVE_ARCH = YES;
24292436
OTHER_LDFLAGS = "-ObjC";
@@ -2460,14 +2467,15 @@
24602467
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
24612468
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
24622469
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
2470+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
24632471
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
24642472
CLANG_WARN_STRICT_PROTOTYPES = YES;
24652473
CLANG_WARN_SUSPICIOUS_MOVE = YES;
24662474
CLANG_WARN_UNREACHABLE_CODE = YES;
24672475
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
24682476
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
24692477
COPY_PHASE_STRIP = NO;
2470-
CURRENT_PROJECT_VERSION = 43;
2478+
CURRENT_PROJECT_VERSION = 45;
24712479
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
24722480
ENABLE_NS_ASSERTIONS = NO;
24732481
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2479,7 +2487,7 @@
24792487
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
24802488
GCC_WARN_UNUSED_FUNCTION = YES;
24812489
GCC_WARN_UNUSED_VARIABLE = YES;
2482-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
2490+
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
24832491
MTL_ENABLE_DEBUG_INFO = NO;
24842492
OTHER_LDFLAGS = "-ObjC";
24852493
SDKROOT = iphoneos;
@@ -2499,7 +2507,7 @@
24992507
DEFINES_MODULE = YES;
25002508
DEVELOPMENT_TEAM = 86WML2UN43;
25012509
DYLIB_COMPATIBILITY_VERSION = 1;
2502-
DYLIB_CURRENT_VERSION = 43;
2510+
DYLIB_CURRENT_VERSION = 45;
25032511
DYLIB_INSTALL_NAME_BASE = "@rpath";
25042512
GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
25052513
GCC_PREPROCESSOR_DEFINITIONS = "APPTENTIVE_DEBUG=1";
@@ -2519,7 +2527,7 @@
25192527
DEFINES_MODULE = YES;
25202528
DEVELOPMENT_TEAM = 86WML2UN43;
25212529
DYLIB_COMPATIBILITY_VERSION = 1;
2522-
DYLIB_CURRENT_VERSION = 43;
2530+
DYLIB_CURRENT_VERSION = 45;
25232531
DYLIB_INSTALL_NAME_BASE = "@rpath";
25242532
GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
25252533
INFOPLIST_FILE = Apptentive/Info.plist;

‎Apptentive/Apptentive.xcodeproj/xcshareddata/xcschemes/Apptentive.xcscheme

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1030"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -29,15 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES"
3030
disableMainThreadChecker = "YES"
3131
codeCoverageEnabled = "YES">
32-
<MacroExpansion>
33-
<BuildableReference
34-
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "01A2CF901E49062700C2103A"
36-
BuildableName = "Apptentive.framework"
37-
BlueprintName = "Apptentive"
38-
ReferencedContainer = "container:Apptentive.xcodeproj">
39-
</BuildableReference>
40-
</MacroExpansion>
4132
<Testables>
4233
<TestableReference
4334
skipped = "NO">

‎Apptentive/Apptentive.xcodeproj/xcshareddata/xcschemes/ApptentiveDebugging.xcscheme

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1030"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
32-
<AdditionalOptions>
33-
</AdditionalOptions>
3432
</TestAction>
3533
<LaunchAction
3634
buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
5149
ReferencedContainer = "container:Apptentive.xcodeproj">
5250
</BuildableReference>
5351
</MacroExpansion>
54-
<AdditionalOptions>
55-
</AdditionalOptions>
5652
</LaunchAction>
5753
<ProfileAction
5854
buildConfiguration = "Release"

0 commit comments

Comments
 (0)