Skip to content

Commit 1189273

Browse files
jeffhjeffh
committed
Update to support Xcode 7
Also: - Updated cedar version for xcode 7 support - Set min version to iOS 8 (for cedar testing framework requirement) - Update to swift 2.0
1 parent c5740a0 commit 1189273

File tree

5 files changed

+22
-12
lines changed

5 files changed

+22
-12
lines changed

‎Externals/cedar

Submodule cedar updated from 9ddef03 to 4a065d6

‎Fox.xcodeproj/project.pbxproj

+16-6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
1F210D491BF05B850068FEE5 /* Cedar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F210D481BF05B850068FEE5 /* Cedar.framework */; };
11+
1F210D4B1BF05B980068FEE5 /* Cedar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F210D4A1BF05B980068FEE5 /* Cedar.framework */; };
1012
1F2C101C1A3784B900BF6AEC /* FOXDecimalNumberSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F2C101B1A3784B900BF6AEC /* FOXDecimalNumberSpec.mm */; };
1113
1F2C101D1A3784B900BF6AEC /* FOXDecimalNumberSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F2C101B1A3784B900BF6AEC /* FOXDecimalNumberSpec.mm */; };
1214
1F38B61B1A2ACCA80078FF90 /* FOXBlockGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F35BC39198F7C9A00BEA6E1 /* FOXBlockGenerator.h */; };
@@ -228,8 +230,6 @@
228230
1F38B6FB1A2ACF910078FF90 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FF6737D1A2AC7E200F98D20 /* UIKit.framework */; };
229231
1F41BE9B1A2ACB9C00F25A65 /* Fox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F41BE901A2ACB9C00F25A65 /* Fox.framework */; };
230232
1F41BEB91A2ACBA300F25A65 /* Fox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F41BEAE1A2ACBA300F25A65 /* Fox.framework */; };
231-
1F4CA2CD1A2D747300989740 /* Cedar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F4CA2CC1A2D747300989740 /* Cedar.framework */; };
232-
1F4CA2CF1A2D747700989740 /* libCedar-StaticLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F4CA2CE1A2D747700989740 /* libCedar-StaticLib.a */; };
233233
1F6A7DDA1A35241700EA3482 /* FOXDoubleSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F6A7DD91A35241700EA3482 /* FOXDoubleSpec.mm */; };
234234
1F6A7DDB1A35241700EA3482 /* FOXDoubleSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F6A7DD91A35241700EA3482 /* FOXDoubleSpec.mm */; };
235235
1F71D4E91A3105050017E81A /* FOXEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F71D4E71A3105050017E81A /* FOXEnvironment.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -284,6 +284,8 @@
284284
/* End PBXContainerItemProxy section */
285285

286286
/* Begin PBXFileReference section */
287+
1F210D481BF05B850068FEE5 /* Cedar.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cedar.framework; path = Externals/cedar/build/Debug/Cedar.framework; sourceTree = "<group>"; };
288+
1F210D4A1BF05B980068FEE5 /* Cedar.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cedar.framework; path = "Externals/cedar/build/Debug-appletvos/Cedar.framework"; sourceTree = "<group>"; };
287289
1F2A94F41997383300471B24 /* FOXTransition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FOXTransition.h; sourceTree = "<group>"; };
288290
1F2A94F51997383300471B24 /* FOXTransition.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FOXTransition.m; sourceTree = "<group>"; };
289291
1F2C101B1A3784B900BF6AEC /* FOXDecimalNumberSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = FOXDecimalNumberSpec.mm; path = FoxSpecs/Public/Generators/FOXDecimalNumberSpec.mm; sourceTree = SOURCE_ROOT; };
@@ -442,7 +444,7 @@
442444
isa = PBXFrameworksBuildPhase;
443445
buildActionMask = 2147483647;
444446
files = (
445-
1F4CA2CD1A2D747300989740 /* Cedar.framework in Frameworks */,
447+
1F210D491BF05B850068FEE5 /* Cedar.framework in Frameworks */,
446448
1F41BE9B1A2ACB9C00F25A65 /* Fox.framework in Frameworks */,
447449
);
448450
runOnlyForDeploymentPostprocessing = 0;
@@ -458,7 +460,7 @@
458460
isa = PBXFrameworksBuildPhase;
459461
buildActionMask = 2147483647;
460462
files = (
461-
1F4CA2CF1A2D747700989740 /* libCedar-StaticLib.a in Frameworks */,
463+
1F210D4B1BF05B980068FEE5 /* Cedar.framework in Frameworks */,
462464
1F38B6FB1A2ACF910078FF90 /* UIKit.framework in Frameworks */,
463465
1F41BEB91A2ACBA300F25A65 /* Fox.framework in Frameworks */,
464466
);
@@ -566,6 +568,8 @@
566568
1F60160E1919DCE0003D8484 /* Frameworks */ = {
567569
isa = PBXGroup;
568570
children = (
571+
1F210D4A1BF05B980068FEE5 /* Cedar.framework */,
572+
1F210D481BF05B850068FEE5 /* Cedar.framework */,
569573
1F4CA2CE1A2D747700989740 /* libCedar-StaticLib.a */,
570574
1F4CA2CC1A2D747300989740 /* Cedar.framework */,
571575
1FF6737D1A2AC7E200F98D20 /* UIKit.framework */,
@@ -960,6 +964,8 @@
960964
isa = PBXProject;
961965
attributes = {
962966
CLASSPREFIX = FOX;
967+
LastSwiftMigration = 0710;
968+
LastSwiftUpdateCheck = 0710;
963969
LastTestingUpgradeCheck = 0600;
964970
LastUpgradeCheck = 0510;
965971
ORGANIZATIONNAME = "Jeff Hui";
@@ -1305,6 +1311,7 @@
13051311
FRAMEWORK_SEARCH_PATHS = (
13061312
"$(DEVELOPER_FRAMEWORKS_DIR)",
13071313
"$(inherited)",
1314+
"$(PROJECT_DIR)/Externals/cedar/build/Debug",
13081315
);
13091316
GCC_PREPROCESSOR_DEFINITIONS = (
13101317
"DEBUG=1",
@@ -1334,6 +1341,7 @@
13341341
FRAMEWORK_SEARCH_PATHS = (
13351342
"$(DEVELOPER_FRAMEWORKS_DIR)",
13361343
"$(inherited)",
1344+
"$(PROJECT_DIR)/Externals/cedar/build/Debug",
13371345
);
13381346
HEADER_SEARCH_PATHS = (
13391347
"$(inherited)",
@@ -1373,7 +1381,7 @@
13731381
);
13741382
INFOPLIST_FILE = Fox/Info.plist;
13751383
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1376-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
1384+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
13771385
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13781386
MTL_ENABLE_DEBUG_INFO = YES;
13791387
PRODUCT_NAME = Fox;
@@ -1405,7 +1413,7 @@
14051413
);
14061414
INFOPLIST_FILE = Fox/Info.plist;
14071415
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1408-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
1416+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
14091417
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
14101418
MTL_ENABLE_DEBUG_INFO = NO;
14111419
PRODUCT_NAME = Fox;
@@ -1425,6 +1433,7 @@
14251433
FRAMEWORK_SEARCH_PATHS = (
14261434
"$(SDKROOT)/Developer/Library/Frameworks",
14271435
"$(inherited)",
1436+
"$(PROJECT_DIR)/Externals/cedar/build/Debug-appletvos",
14281437
);
14291438
GCC_PREPROCESSOR_DEFINITIONS = (
14301439
"DEBUG=1",
@@ -1457,6 +1466,7 @@
14571466
FRAMEWORK_SEARCH_PATHS = (
14581467
"$(SDKROOT)/Developer/Library/Frameworks",
14591468
"$(inherited)",
1469+
"$(PROJECT_DIR)/Externals/cedar/build/Debug-appletvos",
14601470
);
14611471
HEADER_SEARCH_PATHS = (
14621472
"$(inherited)",

‎Fox/Public/DSL.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public func Assert(
1313
let numTests = (numberOfTests != nil) ? numberOfTests! : FOXGetNumberOfTests()
1414
let maxSize = (maximumSize != nil) ? maximumSize! : FOXGetMaximumSize()
1515

16-
var runner = FOXRunner.assertInstance()
17-
var result = runner.resultForNumberOfTests(numTests,
16+
let runner = FOXRunner.assertInstance()
17+
let result = runner.resultForNumberOfTests(numTests,
1818
property: property,
1919
seed: theSeed,
2020
maxSize: maxSize)

‎Fox/Public/Generators/FOXCoreGenerators.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
}
5858

5959
FOX_EXPORT id<FOXGenerator> FOXSuchThat(id<FOXGenerator> generator, BOOL(^predicate)(id)) {
60-
return FOXSuchThatWithMaxTries(generator, predicate, 10);
60+
return FOXSuchThatWithMaxTries(generator, predicate, 100);
6161
}
6262

6363
FOX_EXPORT id<FOXGenerator> FOXSuchThatWithMaxTries(id<FOXGenerator> generator, BOOL(^predicate)(id), NSUInteger maxTries) {

‎Fox/Public/Generators/SwiftGenerators.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public func resize(generator: FOXGenerator, minimumSize: UInt, maximumSize: UInt
9292
// MARK: Dictionary Generators
9393

9494
public func dictionary(template: NSDictionary) -> FOXGenerator {
95-
return FOXDictionary(template as! [NSObject : AnyObject])
95+
return FOXDictionary(template as [NSObject : AnyObject])
9696
}
9797

9898
// MARK: Numeric Generators
@@ -160,7 +160,7 @@ public func executeCommands(stateMachine: FOXStateMachine, subjectFactory: () ->
160160
}
161161

162162
public func executedSuccessfully(commands: NSArray) -> Bool {
163-
return FOXExecutedSuccessfully(commands as! [AnyObject])
163+
return FOXExecutedSuccessfully(commands as [AnyObject])
164164
}
165165

166166
// MARK: String Generators

0 commit comments

Comments
 (0)