Skip to content

Commit

Permalink
Merge pull request #289 from apptentive/branch_5.3.0
Browse files Browse the repository at this point in the history 
Release 5.3.0
  • Loading branch information
@frankus
frankus authored Sep 16, 2020
2 parents aa8ef05 + f9a6314 commit 3a5e3b7
Show file tree
Hide file tree
Showing 40 changed files with 1,160 additions and 1,158 deletions.
30 changes: 19 additions & 11 deletions Apptentive/Apptentive.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
01201AD31FC637BE00EB3593 /* CodePointAndInteractionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 01201AD21FC637BD00EB3593 /* CodePointAndInteractionTests.m */; };
01216C501EBBB53E0062BD0D /* RequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01216C4F1EBBB53E0062BD0D /* RequestTests.swift */; };
0123005F20531698000EC3C3 /* ClauseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0123005E20531698000EC3C3 /* ClauseTests.m */; };
012B96C325118349008A56CC /* Apptentive.h in Headers */ = {isa = PBXBuildFile; fileRef = 012B96C22511832D008A56CC /* Apptentive.h */; };
012ED9292072F33F003D87F3 /* ApptentiveRetryPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 012ED9272072F33F003D87F3 /* ApptentiveRetryPolicy.h */; };
012ED92A2072F33F003D87F3 /* ApptentiveRetryPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 012ED9282072F33F003D87F3 /* ApptentiveRetryPolicy.m */; };
012ED92C2072FABE003D87F3 /* RetryPolicyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012ED92B2072FABE003D87F3 /* RetryPolicyTests.swift */; };
Expand Down Expand Up @@ -97,7 +98,7 @@
018FAFF01FC4B21A007C52FE /* ApptentiveComparisonClause.m in Sources */ = {isa = PBXBuildFile; fileRef = 018FAFEE1FC4B21A007C52FE /* ApptentiveComparisonClause.m */; };
01917D451E5E0B7400B37D82 /* ConversationManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01917D441E5E0B7400B37D82 /* ConversationManagerTests.swift */; };
01A2CF9B1E49062800C2103A /* Apptentive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01A2CF911E49062700C2103A /* Apptentive.framework */; };
01A2CFA21E49062800C2103A /* Apptentive.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A2CF941E49062700C2103A /* Apptentive.h */; settings = {ATTRIBUTES = (Public, ); }; };
01A2CFA21E49062800C2103A /* ApptentiveMain.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A2CF941E49062700C2103A /* ApptentiveMain.h */; settings = {ATTRIBUTES = (Public, ); }; };
01A2D0F81E490A9700C2103A /* Apptentive_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A2CFAB1E490A9600C2103A /* Apptentive_Private.h */; };
01A2D0F91E490A9700C2103A /* Apptentive.m in Sources */ = {isa = PBXBuildFile; fileRef = 01A2CFAC1E490A9700C2103A /* Apptentive.m */; };
01A2D0FA1E490A9700C2103A /* Apptentive.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 01A2CFAD1E490A9700C2103A /* Apptentive.storyboard */; };
Expand Down Expand Up @@ -462,6 +463,7 @@
01201AD21FC637BD00EB3593 /* CodePointAndInteractionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CodePointAndInteractionTests.m; sourceTree = "<group>"; };
01216C4F1EBBB53E0062BD0D /* RequestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestTests.swift; sourceTree = "<group>"; };
0123005E20531698000EC3C3 /* ClauseTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ClauseTests.m; sourceTree = "<group>"; };
012B96C22511832D008A56CC /* Apptentive.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Apptentive.h; sourceTree = "<group>"; };
012ED9272072F33F003D87F3 /* ApptentiveRetryPolicy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApptentiveRetryPolicy.h; sourceTree = "<group>"; };
012ED9282072F33F003D87F3 /* ApptentiveRetryPolicy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ApptentiveRetryPolicy.m; sourceTree = "<group>"; };
012ED92B2072FABE003D87F3 /* RetryPolicyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RetryPolicyTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -540,7 +542,7 @@
01917D431E5E0B7400B37D82 /* ApptentiveTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ApptentiveTests-Bridging-Header.h"; sourceTree = "<group>"; };
01917D441E5E0B7400B37D82 /* ConversationManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConversationManagerTests.swift; sourceTree = "<group>"; };
01A2CF911E49062700C2103A /* Apptentive.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Apptentive.framework; sourceTree = BUILT_PRODUCTS_DIR; };
01A2CF941E49062700C2103A /* Apptentive.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Apptentive.h; sourceTree = "<group>"; };
01A2CF941E49062700C2103A /* ApptentiveMain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApptentiveMain.h; sourceTree = "<group>"; };
01A2CF951E49062700C2103A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
01A2CF9A1E49062800C2103A /* ApptentiveTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ApptentiveTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
01A2CFA11E49062800C2103A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1002,6 +1004,7 @@
01A2CF921E49062700C2103A /* Products */,
);
sourceTree = "<group>";
usesTabs = 1;
};
01A2CF921E49062700C2103A /* Products */ = {
isa = PBXGroup;
Expand All @@ -1015,6 +1018,7 @@
01A2CF931E49062700C2103A /* Apptentive */ = {
isa = PBXGroup;
children = (
012B96C22511832D008A56CC /* Apptentive.h */,
0168B1AC24AAAFD1006EEF65 /* DebugLogging.cer */,
EF3FE88720A226EE00A3C9C5 /* Apptimize */,
01A2CFB01E490A9700C2103A /* Custom Views */,
Expand All @@ -1028,7 +1032,7 @@
01A2D0CD1E490A9700C2103A /* Reachability */,
01A2D0D01E490A9700C2103A /* Surveys */,
01A2D0441E490A9700C2103A /* localization */,
01A2CF941E49062700C2103A /* Apptentive.h */,
01A2CF941E49062700C2103A /* ApptentiveMain.h */,
01A2CFAC1E490A9700C2103A /* Apptentive.m */,
01A2CFAD1E490A9700C2103A /* Apptentive.storyboard */,
01A2CFAE1E490A9700C2103A /* ApptentiveStyleSheet.h */,
Expand Down Expand Up @@ -1806,7 +1810,7 @@
EF3063A91F2A8353004B4EB9 /* ApptentivePayloadDebug.h in Headers */,
01F1DFFC1E5BBFCB009AB3D2 /* ApptentiveConversationMetadataItem.h in Headers */,
01A2D1FA1E490A9700C2103A /* ApptentiveSurveyQuestionView.h in Headers */,
01A2CFA21E49062800C2103A /* Apptentive.h in Headers */,
01A2CFA21E49062800C2103A /* ApptentiveMain.h in Headers */,
01A2D18E1E490A9700C2103A /* ApptentiveMessageCenterContextMessageCell.h in Headers */,
01A2D1B41E490A9700C2103A /* ApptentiveLegacySurveyResponse.h in Headers */,
4D4B36241F01892A005C7EC0 /* ApptentiveEngagementBackend.h in Headers */,
Expand All @@ -1833,6 +1837,7 @@
01A2D1D01E490A9700C2103A /* ApptentiveSerialRequest.h in Headers */,
01A2D1D61E490A9700C2103A /* ApptentiveBackend.h in Headers */,
01A2D1411E490A9700C2103A /* ApptentiveVersion.h in Headers */,
012B96C325118349008A56CC /* Apptentive.h in Headers */,
EF49AC941EF2C50B00E2187F /* NSMutableData+Types.h in Headers */,
01A2D1271E490A9700C2103A /* ApptentiveEngagement.h in Headers */,
014508B11EAE5F71003326E7 /* ApptentiveClient.h in Headers */,
Expand Down Expand Up @@ -1973,7 +1978,8 @@
01A2CF881E49062700C2103A /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0930;
LastSwiftUpdateCheck = 1200;
LastUpgradeCheck = 1200;
ORGANIZATIONNAME = "Apptentive, Inc.";
TargetAttributes = {
01A2CF901E49062700C2103A = {
Expand Down Expand Up @@ -2402,14 +2408,15 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 43;
CURRENT_PROJECT_VERSION = 45;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand All @@ -2423,7 +2430,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
Expand Down Expand Up @@ -2460,14 +2467,15 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 43;
CURRENT_PROJECT_VERSION = 45;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -2479,7 +2487,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
Expand All @@ -2499,7 +2507,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 86WML2UN43;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 43;
DYLIB_CURRENT_VERSION = 45;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "APPTENTIVE_DEBUG=1";
Expand All @@ -2519,7 +2527,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 86WML2UN43;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 43;
DYLIB_CURRENT_VERSION = 45;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
INFOPLIST_FILE = Apptentive/Info.plist;
Expand Down
11 changes: 1 addition & 10 deletions Apptentive/Apptentive.xcodeproj/xcshareddata/xcschemes/Apptentive.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1030"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -29,15 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES"
disableMainThreadChecker = "YES"
codeCoverageEnabled = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "01A2CF901E49062700C2103A"
BuildableName = "Apptentive.framework"
BlueprintName = "Apptentive"
ReferencedContainer = "container:Apptentive.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand Down
6 changes: 1 addition & 5 deletions Apptentive/Apptentive.xcodeproj/xcshareddata/xcschemes/ApptentiveDebugging.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1030"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -51,8 +49,6 @@
ReferencedContainer = "container:Apptentive.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Loading

0 comments on commit 3a5e3b7

Please sign in to comment.