Fix travis build

* Add generated Signal-Swift.h to test search header path. You must do
  this when testing an ObjC clas with swift dependencies (PushManager. in this case)
* Word on the street is that XCode8.2 is less flaky for running simulator tests

// FREEBIE
This commit is contained in:
Michael Kirk 2016-12-21 14:11:36 -06:00
parent ba4569f5bd
commit 90daf60c56
3 changed files with 5 additions and 3 deletions

View File

@ -1,7 +1,7 @@
language: objective-c
cache: cocoapods # pod install somtimes takes >20 minutes, so lets cache this
osx_image: xcode8
osx_image: xcode8.2
env:
-EARLY_START_SIMULATOR=1 # early starting simulator reduces false negatives due to test timeouts

View File

@ -3593,6 +3593,7 @@
"\"$(SRCROOT)/libtomcrypt/headers\"",
"\"$(SRCROOT)/spandsp/spandsp/spandsp\"",
"\"$(SRCROOT)/Libraries\"/**",
"\"$(TARGET_TEMP_DIR)/../$(PROJECT_NAME).build/DerivedSources\"",
);
INFOPLIST_FILE = "Signal/test/Supporting Files/SignalTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@ -3650,6 +3651,7 @@
"\"$(SRCROOT)/libtomcrypt/headers\"",
"\"$(SRCROOT)/spandsp/spandsp/spandsp\"",
"\"$(SRCROOT)/Libraries\"/**",
"\"$(TARGET_TEMP_DIR)/../$(PROJECT_NAME).build/DerivedSources\"",
);
INFOPLIST_FILE = "Signal/test/Supporting Files/SignalTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;

View File

@ -3,9 +3,7 @@
//
#import <Foundation/Foundation.h>
#import "Cryptography.h"
#import "Environment.h"
#import "NSData+Base64.h"
#import "OWSContactAvatarBuilder.h"
#import "OWSContactsManager.h"
#import "OWSLogger.h"
@ -17,6 +15,8 @@
#import "UIFont+OWS.h"
#import "UIUtil.h"
#import <SignalServiceKit/Contact.h>
#import <SignalServiceKit/Cryptography.h>
#import <SignalServiceKit/NSData+Base64.h>
#import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
#import <SignalServiceKit/OWSAcknowledgeMessageDeliveryRequest.h>
#import <SignalServiceKit/OWSEndSessionMessage.h>