Skip to content

Commit

Permalink
Bump version, podspec, CHANGELOG
Browse files Browse the repository at this point in the history
  • Loading branch information
frankus committed Sep 7, 2017
1 parent 8883a09 commit 232e66a
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 15 deletions.
24 changes: 10 additions & 14 deletions Apptentive/Apptentive/Apptentive.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FOUNDATION_EXPORT double ApptentiveVersionNumber;
FOUNDATION_EXPORT const unsigned char ApptentiveVersionString[];

/** The version number of the Apptentive SDK. */
#define kApptentiveVersionString @"4.0.4"
#define kApptentiveVersionString @"4.0.5"

/** The platform that the SDK is built for. */
#define kApptentivePlatformString @"iOS"
Expand Down Expand Up @@ -224,8 +224,11 @@ typedef NS_ENUM(NSUInteger, ApptentiveLogLevel) {

/** An object conforming to the `ApptentiveDelegate` protocol.
If a `nil` value is passed for the view controller into methods such as `-engage:fromViewController`,
the SDK will request a view controller from the delegate from which to present an interaction. */
@property (weak, nonatomic) id<ApptentiveDelegate> delegate;
the SDK will request a view controller from the delegate from which to present an interaction.
Deprecation Note: when a suitable view controller is not available for presenting interactions,
the system will now use a new window to present Apptentive UI. */
@property (weak, nonatomic) id<ApptentiveDelegate> delegate DEPRECATED_ATTRIBUTE;

///--------------------
/// @name Engage Events
Expand Down Expand Up @@ -683,15 +686,6 @@ typedef NS_ENUM(NSUInteger, ApptentiveLogLevel) {

@end

/**
The `ApptentiveDelegate` protocol allows your app to override the default behavior when an
interaction is presented without a view controller having been specified. In most cases the
default behavior (which walks the view controller stack from the main window's root view
controller) will work, but if your app features custom container view controllers, it may
behave unexpectedly. In that case an object in your app should implement the
`ApptentiveDelegate` protocol's `-viewControllerForInteractionsWithConnection:` method
and return the view controller from which to present the Message Center interaction.
*/
@protocol ApptentiveDelegate <NSObject>
@optional

Expand All @@ -701,8 +695,10 @@ typedef NS_ENUM(NSUInteger, ApptentiveLogLevel) {
@param connection The `Apptentive` object that is requesting a view controller to present from.
@return The view controller your app would like the interaction to be presented from.
*/
- (UIViewController *)viewControllerForInteractionsWithConnection:(Apptentive *)connection NS_SWIFT_NAME(viewControllerForInteractions(with:));
Deprecation Note: when a suitable view controller is not available for presenting interactions,
the system will now use a new window to present Apptentive UI. */
- (UIViewController *)viewControllerForInteractionsWithConnection:(Apptentive *)connection NS_SWIFT_NAME(viewControllerForInteractions(with:)) DEPRECATED_ATTRIBUTE;

@end

Expand Down
3 changes: 3 additions & 0 deletions Apptentive/Apptentive/Apptentive.m
Original file line number Diff line number Diff line change
Expand Up @@ -739,11 +739,14 @@ - (void)userDidTapBanner:(ApptentiveBannerViewController *)banner {
}

- (UIViewController *)viewControllerForInteractions {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if (self.delegate && [self.delegate respondsToSelector:@selector(viewControllerForInteractionsWithConnection:)]) {
return [self.delegate viewControllerForInteractionsWithConnection:self];
} else {
return [ApptentiveUtilities topViewController];
}
#pragma clang diagnostic pop
}

- (void)dismissAllInteractions:(BOOL)animated {
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2017-09-06 frankus, weeebox v4.0.5
----------------------------------
Version 4.0.5 fixes an error where a background task expiration handler was not called correctly, which could result in a crash. It also adds an experimental feature where passing `nil` for the view controller parameter of the `engage` method will present interactions in a new window.

2017-08-28 frankus, weeebox v4.0.4
----------------------------------
Version 4.0.4 fixes a potential crash when exiting the app. It also fixes saving person name and email when they are supplied in message center, and improves accessibility for surveys.
Expand Down
2 changes: 1 addition & 1 deletion apptentive-ios.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = 'apptentive-ios'
s.module_name = 'Apptentive'
s.version = '4.0.4'
s.version = '4.0.5'
s.license = 'BSD'
s.summary = 'Apptentive Customer Communications SDK.'
s.homepage = 'https://www.apptentive.com/'
Expand Down
4 changes: 4 additions & 0 deletions docs/APIChanges.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
This document tracks changes to the API between versions.

#4.0.5

* Passing `nil` for the view controller parameter of the `engage` method will now open interactions in a new window. The `delegate` property of the `Apptentive` singleton will no longer be asked for a view controller to present interactions from.

#4.0.0

* Adds a new `ApptentiveConfiguration` class.
Expand Down

0 comments on commit 232e66a

Please sign in to comment.