Skip to content

Commit

Permalink
Xcode 10.2 (#320)
Browse files Browse the repository at this point in the history
  • Loading branch information
ob authored Apr 15, 2019
1 parent 2d5e8c5 commit facded0
Show file tree
Hide file tree
Showing 20 changed files with 35 additions and 119 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
macos:
xcode: 10.1.0
xcode: 10.2.0
steps:
- checkout
- run: ./scripts/bluepill.sh build
Expand Down
10 changes: 6 additions & 4 deletions BPSampleApp/BPSampleApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@
BAB24F261DB5D45E00867756 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1000;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = LinkedIn;
TargetAttributes = {
BA4BCFC51DC47EC700592FA4 = {
Expand All @@ -412,7 +412,7 @@
BA9C2DD11DD7F182007CB967 = {
CreatedOnToolsVersion = 8.0;
DevelopmentTeam = 57Y47U492U;
LastSwiftMigration = 1010;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
TestTargetID = BAB24F2D1DB5D45E00867756;
};
Expand All @@ -429,7 +429,7 @@
BAB24F461DB5D45E00867756 = {
CreatedOnToolsVersion = 8.0;
DevelopmentTeam = 57Y47U492U;
LastSwiftMigration = 1010;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
TestTargetID = BAB24F2D1DB5D45E00867756;
};
Expand All @@ -449,7 +449,7 @@
};
buildConfigurationList = BAB24F291DB5D45E00867756 /* Build configuration list for PBXProject "BPSampleApp" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -733,6 +733,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -789,6 +790,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
#import "CDStructures.h"
//#import "DefaultDisplayDescriptorState.h"
#import "NSArray-SimArgv.h"
#import "NSCoding-Protocol.h"
#import "NSDictionary-SimEnvp.h"
#import "NSError-SimError.h"
//#import "NSKeyedArchiver-SimPasteboardItem.h"
//#import "NSKeyedUnarchiver-SimPasteboardItem.h"
#import "NSObject-Protocol.h"
#import "NSPasteboardItem-SimPasteboardItem.h"
#import "NSPasteboardItemDataProvider-Protocol.h"
#import "NSSecureCoding-Protocol.h"
#import "NSString-SIMCPUType.h"
#import "NSString-SIMPackedVersion.h"
//#import "NSString-SimServiceContextExtras.h"
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

@import Foundation;

#import "NSPasteboardItemDataProvider-Protocol.h"
@class NSArray, NSMapTable, NSMutableArray, NSMutableDictionary, NSPasteboardItem, NSString;

@interface SimPasteboardItem : NSObject <NSPasteboardItemDataProvider>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

@import Foundation;
#import "NSSecureCoding-Protocol.h"

@class NSData;

Expand Down
5 changes: 4 additions & 1 deletion Bluepill-cli/Bluepill-cli/Simulator/SimulatorHelper.m
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,11 @@ + (NSString *)testEnvironmentWithConfiguration:(BPConfiguration *)config {
xctConfig.automationFrameworkPath = [NSString stringWithFormat:@"%@/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks/XCTAutomationSupport.framework", config.xcodePath];
testHostPath = config.appBundlePath;

NSString *bundleID = [self bundleIdForPath:config.appBundlePath];
xctConfig.testApplicationDependencies = @{bundleID: config.appBundlePath};

if (config.testRunnerAppPath) {
xctConfig.targetApplicationBundleID = [self bundleIdForPath:config.appBundlePath];
xctConfig.targetApplicationBundleID = bundleID;
xctConfig.initializeForUITesting = YES;
xctConfig.disablePerformanceMetrics = NO;
xctConfig.reportActivities = YES;
Expand Down
11 changes: 2 additions & 9 deletions Bluepill-cli/bp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,9 @@
BA954F571D6D1AB3007D011D /* CDStructures.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CDStructures.h; sourceTree = "<group>"; };
BA954F581D6D1AB3007D011D /* CoreSimulator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreSimulator.h; sourceTree = "<group>"; };
BA954F5A1D6D1AB3007D011D /* NSArray-SimArgv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSArray-SimArgv.h"; sourceTree = "<group>"; };
BA954F5B1D6D1AB3007D011D /* NSCoding-Protocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSCoding-Protocol.h"; sourceTree = "<group>"; };
BA954F5C1D6D1AB3007D011D /* NSDictionary-SimEnvp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSDictionary-SimEnvp.h"; sourceTree = "<group>"; };
BA954F5D1D6D1AB3007D011D /* NSError-SimError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSError-SimError.h"; sourceTree = "<group>"; };
BA954F601D6D1AB3007D011D /* NSObject-Protocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject-Protocol.h"; sourceTree = "<group>"; };
BA954F611D6D1AB3007D011D /* NSPasteboardItem-SimPasteboardItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSPasteboardItem-SimPasteboardItem.h"; sourceTree = "<group>"; };
BA954F621D6D1AB3007D011D /* NSPasteboardItemDataProvider-Protocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSPasteboardItemDataProvider-Protocol.h"; sourceTree = "<group>"; };
BA954F631D6D1AB3007D011D /* NSSecureCoding-Protocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSSecureCoding-Protocol.h"; sourceTree = "<group>"; };
BA954F641D6D1AB3007D011D /* NSString-SIMCPUType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString-SIMCPUType.h"; sourceTree = "<group>"; };
BA954F651D6D1AB3007D011D /* NSString-SIMPackedVersion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString-SIMPackedVersion.h"; sourceTree = "<group>"; };
BA954F671D6D1AB3007D011D /* NSUserDefaults-SimDefaults.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSUserDefaults-SimDefaults.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -577,13 +573,9 @@
BA954F571D6D1AB3007D011D /* CDStructures.h */,
BA954F581D6D1AB3007D011D /* CoreSimulator.h */,
BA954F5A1D6D1AB3007D011D /* NSArray-SimArgv.h */,
BA954F5B1D6D1AB3007D011D /* NSCoding-Protocol.h */,
BA954F5C1D6D1AB3007D011D /* NSDictionary-SimEnvp.h */,
BA954F5D1D6D1AB3007D011D /* NSError-SimError.h */,
BA954F601D6D1AB3007D011D /* NSObject-Protocol.h */,
BA954F611D6D1AB3007D011D /* NSPasteboardItem-SimPasteboardItem.h */,
BA954F621D6D1AB3007D011D /* NSPasteboardItemDataProvider-Protocol.h */,
BA954F631D6D1AB3007D011D /* NSSecureCoding-Protocol.h */,
BA954F641D6D1AB3007D011D /* NSString-SIMCPUType.h */,
BA954F651D6D1AB3007D011D /* NSString-SIMPackedVersion.h */,
BA954F671D6D1AB3007D011D /* NSUserDefaults-SimDefaults.h */,
Expand Down Expand Up @@ -854,10 +846,11 @@
};
buildConfigurationList = 7A79017D1D5CB679004D4325 /* Build configuration list for PBXProject "bp" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 7A7901791D5CB679004D4325;
productRefGroup = 7A7901831D5CB679004D4325 /* Products */;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
3 changes: 2 additions & 1 deletion Bluepill-runner/bluepill.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,11 @@
};
buildConfigurationList = BAEF4B2F1DAC539400E68294 /* Build configuration list for PBXProject "bluepill" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = BAEF4B2B1DAC539400E68294;
productRefGroup = BAEF4B351DAC539400E68294 /* Products */;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ A full list supported options are listed here.

## Requirements

Bluepill only works with **Xcode 10.1**. If you're looking for old Xcode support, please check out the other branches:
Bluepill only works with **Xcode 10.2**. If you're looking for old Xcode support, please check out the other branches:

* [Xcode-8](https://github.com/linkedin/bluepill/tree/xcode8)
* [Xcode-9.0](https://github.com/linkedin/bluepill/tree/xcode-9.0)
Expand All @@ -104,6 +104,7 @@ Bluepill only works with **Xcode 10.1**. If you're looking for old Xcode support
* [Xcode-9.3](https://github.com/linkedin/bluepill/tree/xcode-9.3)
* [Xcode-9.4](https://github.com/linkedin/bluepill/tree/xcode-9.4)
* [Xcode-10.0](https://github.com/linkedin/bluepill/tree/xcode-10.0)
* [Xcode-10.1](https://github.com/linkedin/bluepill/tree/xcode-10.1)

## Acknowledgement

Expand Down
4 changes: 2 additions & 2 deletions Source/Shared/BPConstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

#import <Foundation/Foundation.h>

#define BP_DEFAULT_RUNTIME "iOS 12.1"
#define BP_DEFAULT_RUNTIME "iOS 12.2"
#define BP_DEFAULT_DEVICE_TYPE "iPhone 7"
#define BP_TM_PROTOCOL_VERSION 17
#define BP_DAEMON_PROTOCOL_VERSION 26
#define BP_DEFAULT_XCODE_VERSION "10.1"
#define BP_DEFAULT_XCODE_VERSION "10.2"
#define BP_MAX_PROCESSES_PERCENT 0.75


Expand Down
15 changes: 11 additions & 4 deletions Source/Shared/BPUtils.m
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ @implementation BPUtils

+ (void)enableDebugOutput:(BOOL)enable {
printDebugInfo = enable;
NSLog(@"Debug Enabled == %hhd", printDebugInfo);
}

+ (void)quietMode:(BOOL)enable {
Expand Down Expand Up @@ -94,12 +95,18 @@ + (void)printTo:(FILE*)fd kind:(BPKind)kind withString:(NSString *)txt {
tms = localtime(&now);
strftime(ts, 1<<6, "%Y%m%d.%H%M%S", tms);

const char * __nullable msg = [txt UTF8String];
char *nl = "\n";
if (msg && strlen(msg) > 1 && msg[strlen(msg)-1] == '\n') {
// don't add a new line if it already ends in new line
nl = "";
}

if (isatty(1) && !bp_testing) {
fprintf(fd, "{%d} %s %s[%s]%s %s%s\n",
getpid(), ts, message.color, message.text, ANSI_COLOR_RESET, [simNum UTF8String], [txt UTF8String]);
fprintf(fd, "{%d} %s %s[%s]%s %s%s%s",
getpid(), ts, message.color, message.text, ANSI_COLOR_RESET, [simNum UTF8String], [txt UTF8String], nl);
} else {

fprintf(fd, "{%d} %s [%s] %s%s\n", getpid(), ts, message.text, [simNum UTF8String], [txt UTF8String]);
fprintf(fd, "{%d} %s [%s] %s%s%s", getpid(), ts, message.text, [simNum UTF8String], [txt UTF8String], nl);
}
fflush(fd);
}
Expand Down

0 comments on commit facded0

Please sign in to comment.