Skip to content

Commit aab18f1

Browse files
frankusfrankus
authored
Merge pull request #550 from apptentive/v4.1.1-rc
V4.1.1 rc
2 parents 6f57de9 + 2aab61f commit aab18f1

File tree

7 files changed

+118
-8
lines changed

7 files changed

+118
-8
lines changed

‎Apptentive/Apptentive/Apptentive.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FOUNDATION_EXPORT double ApptentiveVersionNumber;
2020
FOUNDATION_EXPORT const unsigned char ApptentiveVersionString[];
2121

2222
/** The version number of the Apptentive SDK. */
23-
#define kApptentiveVersionString @"4.1.0"
23+
#define kApptentiveVersionString @"4.1.1"
2424

2525
/** The version number of the Apptentive API platform. */
2626
#define kApptentiveAPIVersionString @"9"

‎Apptentive/Apptentive/Misc/ApptentiveLogMonitor.m

+10
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,12 @@ + (NSDictionary *)loadJsonFromURL:(NSURL *)URL body:(NSData *)body headers:(NSDi
306306

307307
NSURLResponse *response;
308308
NSError *requestError;
309+
310+
#pragma clang diagnostic push
311+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
309312
NSData *data = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&requestError];
313+
#pragma clang diagnostic pop
314+
310315
if (requestError != nil) {
311316
ApptentiveLogError(@"Unable to load json from URL: %@", requestError);
312317
return nil;
@@ -372,8 +377,13 @@ + (nullable ApptentiveLogMonitorConfigration *)readConfigurationFromToken:(NSStr
372377

373378
- (void)sendReportWithAttachedFiles:(NSArray<NSString *> *)files {
374379
if (![MFMailComposeViewController canSendMail]) {
380+
381+
#pragma clang diagnostic push
382+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
375383
UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"Apptentive Log Monitor" message:@"Unable to send email" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil];
376384
[alertView show];
385+
#pragma clang diagnostic pop
386+
377387
return;
378388
}
379389

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2017-11-13 frankus, weeebox v4.1.1
2+
----------------------------------
3+
###Bugs Fixed
4+
5+
- Fix rare crash in ApptentivePayloadSender when a request is cancelled
6+
- Fix About Apptentive and Upgrade Message layout on iPhone X
7+
18
2017-11-06 frankus, weeebox v4.1.0
29
----------------------------------
310
###Improvements

‎Example/Example.xcodeproj/xcshareddata/xcschemes/iOSExample.xcscheme

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0910"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "014E03391B7401A50059A3C6"
18+
BuildableName = "iOSExample.app"
19+
BlueprintName = "iOSExample"
20+
ReferencedContainer = "container:Example.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
30+
shouldUseLaunchSchemeArgsEnv = "YES">
31+
<Testables>
32+
</Testables>
33+
<MacroExpansion>
34+
<BuildableReference
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "014E03391B7401A50059A3C6"
37+
BuildableName = "iOSExample.app"
38+
BlueprintName = "iOSExample"
39+
ReferencedContainer = "container:Example.xcodeproj">
40+
</BuildableReference>
41+
</MacroExpansion>
42+
<AdditionalOptions>
43+
</AdditionalOptions>
44+
</TestAction>
45+
<LaunchAction
46+
buildConfiguration = "Debug"
47+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
48+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
language = ""
50+
launchStyle = "0"
51+
useCustomWorkingDirectory = "NO"
52+
ignoresPersistentStateOnLaunch = "NO"
53+
debugDocumentVersioning = "YES"
54+
debugServiceExtension = "internal"
55+
allowLocationSimulation = "YES">
56+
<BuildableProductRunnable
57+
runnableDebuggingMode = "0">
58+
<BuildableReference
59+
BuildableIdentifier = "primary"
60+
BlueprintIdentifier = "014E03391B7401A50059A3C6"
61+
BuildableName = "iOSExample.app"
62+
BlueprintName = "iOSExample"
63+
ReferencedContainer = "container:Example.xcodeproj">
64+
</BuildableReference>
65+
</BuildableProductRunnable>
66+
<AdditionalOptions>
67+
</AdditionalOptions>
68+
</LaunchAction>
69+
<ProfileAction
70+
buildConfiguration = "Release"
71+
shouldUseLaunchSchemeArgsEnv = "YES"
72+
savedToolIdentifier = ""
73+
useCustomWorkingDirectory = "NO"
74+
debugDocumentVersioning = "YES">
75+
<BuildableProductRunnable
76+
runnableDebuggingMode = "0">
77+
<BuildableReference
78+
BuildableIdentifier = "primary"
79+
BlueprintIdentifier = "014E03391B7401A50059A3C6"
80+
BuildableName = "iOSExample.app"
81+
BlueprintName = "iOSExample"
82+
ReferencedContainer = "container:Example.xcodeproj">
83+
</BuildableReference>
84+
</BuildableProductRunnable>
85+
</ProfileAction>
86+
<AnalyzeAction
87+
buildConfiguration = "Debug">
88+
</AnalyzeAction>
89+
<ArchiveAction
90+
buildConfiguration = "Release"
91+
revealArchiveInOrganizer = "YES">
92+
</ArchiveAction>
93+
</Scheme>

‎Example/Podfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- apptentive-ios (4.0.0)
2+
- apptentive-ios (4.1.1)
33

44
DEPENDENCIES:
55
- apptentive-ios (from `..`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
99
:path: ..
1010

1111
SPEC CHECKSUMS:
12-
apptentive-ios: 23ee8c1cf5fddc33f471922f152ef5e75d8f8199
12+
apptentive-ios: 6d5f7108a509e5ce904694d4d778de1ccb8c7f95
1313

14-
PODFILE CHECKSUM: d9f8c76e781b9e490f735f6b0369a9f3d1c4fd0e
14+
PODFILE CHECKSUM: fb7822acbd17e9b6c60d2db75808647cc370b6a0
1515

16-
COCOAPODS: 1.3.0.beta.2
16+
COCOAPODS: 1.3.1

‎Example/podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :ios, '8.0'
1+
platform :ios, '9.0'
22
use_frameworks!
33

44
target 'iOSExample' do

‎apptentive-ios.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Pod::Spec.new do |s|
22
s.name = 'apptentive-ios'
33
s.module_name = 'Apptentive'
4-
s.version = '4.1.0'
4+
s.version = '4.1.1'
55
s.license = 'BSD'
66
s.summary = 'Apptentive Customer Communications SDK.'
77
s.homepage = 'https://www.apptentive.com/'
88
s.authors = { 'Apptentive SDK Team' => '[email protected]' }
99
s.source = { :git => 'https://github.com/apptentive/apptentive-ios.git', :tag => "v#{s.version}" }
10-
s.platform = :ios, '8.0'
10+
s.platform = :ios, '9.0'
1111
s.source_files = 'Apptentive/Apptentive/**/*.{h,m}'
1212
s.requires_arc = true
1313
s.frameworks = 'AVFoundation', 'CoreData', 'CoreGraphics', 'Foundation', 'ImageIO', 'MobileCoreServices', 'QuartzCore', 'QuickLook', 'SystemConfiguration', 'UIKit'

0 commit comments

Comments
 (0)