Skip to content
This repository was archived by the owner on Oct 2, 2025. It is now read-only.

Commit a30b38e

Browse files
bckrbckr
authored
Merge pull request #32 from trivago/swift-2.3
Update to Xcode 8.0 / Swift 2.3
2 parents da55aaf + 3d99fab commit a30b38e

File tree

8 files changed

+49
-30
lines changed

8 files changed

+49
-30
lines changed

‎Cartfile.private‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "jspahrsummers/xcconfigs" ~> 0.9
22
github "Quick/Quick" ~> 0.9
3-
github "Quick/Nimble" ~> 3.0
3+
github "Quick/Nimble" ~> 4.1

‎Cartfile.resolved‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v3.2.0"
2-
github "Quick/Quick" "v0.9.1"
1+
github "Quick/Nimble" "v4.1.0"
2+
github "Quick/Quick" "v0.9.3"
33
github "jspahrsummers/xcconfigs" "0.9"

‎Carthage/Checkouts/Nimble‎

Submodule Nimble updated 68 files

‎Carthage/Checkouts/Quick‎

Submodule Quick updated 74 files

‎Dobby.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
containerPortal = DC7F6AEF1AD8291800CCBF6D /* Project object */;
5050
proxyType = 1;
5151
remoteGlobalIDString = DC8452171ADBF5CC006AC5D4;
52-
remoteInfo = "Dobby-Mac";
52+
remoteInfo = "Dobby-macOS";
5353
};
5454
/* End PBXContainerItemProxy section */
5555

@@ -372,9 +372,9 @@
372372
productReference = DC7F6B031AD8291800CCBF6D /* DobbyTests.xctest */;
373373
productType = "com.apple.product-type.bundle.unit-test";
374374
};
375-
DC8452171ADBF5CC006AC5D4 /* Dobby-Mac */ = {
375+
DC8452171ADBF5CC006AC5D4 /* Dobby-macOS */ = {
376376
isa = PBXNativeTarget;
377-
buildConfigurationList = DC84522B1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-Mac" */;
377+
buildConfigurationList = DC84522B1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-macOS" */;
378378
buildPhases = (
379379
DC8452131ADBF5CC006AC5D4 /* Sources */,
380380
DC8452141ADBF5CC006AC5D4 /* Frameworks */,
@@ -385,14 +385,14 @@
385385
);
386386
dependencies = (
387387
);
388-
name = "Dobby-Mac";
389-
productName = "Dobby-Mac";
388+
name = "Dobby-macOS";
389+
productName = "Dobby-macOS";
390390
productReference = DC8452181ADBF5CC006AC5D4 /* Dobby.framework */;
391391
productType = "com.apple.product-type.framework";
392392
};
393-
DC8452211ADBF5CC006AC5D4 /* Dobby-MacTests */ = {
393+
DC8452211ADBF5CC006AC5D4 /* Dobby-macOSTests */ = {
394394
isa = PBXNativeTarget;
395-
buildConfigurationList = DC84522E1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-MacTests" */;
395+
buildConfigurationList = DC84522E1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-macOSTests" */;
396396
buildPhases = (
397397
DC84521E1ADBF5CC006AC5D4 /* Sources */,
398398
DC84521F1ADBF5CC006AC5D4 /* Frameworks */,
@@ -403,8 +403,8 @@
403403
dependencies = (
404404
DC8452251ADBF5CC006AC5D4 /* PBXTargetDependency */,
405405
);
406-
name = "Dobby-MacTests";
407-
productName = "Dobby-MacTests";
406+
name = "Dobby-macOSTests";
407+
productName = "Dobby-macOSTests";
408408
productReference = DC8452221ADBF5CC006AC5D4 /* DobbyTests.xctest */;
409409
productType = "com.apple.product-type.bundle.unit-test";
410410
};
@@ -420,15 +420,19 @@
420420
TargetAttributes = {
421421
DC7F6AF71AD8291800CCBF6D = {
422422
CreatedOnToolsVersion = 6.3;
423+
LastSwiftMigration = 0800;
423424
};
424425
DC7F6B021AD8291800CCBF6D = {
425426
CreatedOnToolsVersion = 6.3;
427+
LastSwiftMigration = 0800;
426428
};
427429
DC8452171ADBF5CC006AC5D4 = {
428430
CreatedOnToolsVersion = 6.3;
431+
LastSwiftMigration = 0800;
429432
};
430433
DC8452211ADBF5CC006AC5D4 = {
431434
CreatedOnToolsVersion = 6.3;
435+
LastSwiftMigration = 0800;
432436
};
433437
};
434438
};
@@ -444,8 +448,8 @@
444448
projectDirPath = "";
445449
projectRoot = "";
446450
targets = (
447-
DC8452171ADBF5CC006AC5D4 /* Dobby-Mac */,
448-
DC8452211ADBF5CC006AC5D4 /* Dobby-MacTests */,
451+
DC8452171ADBF5CC006AC5D4 /* Dobby-macOS */,
452+
DC8452211ADBF5CC006AC5D4 /* Dobby-macOSTests */,
449453
DC7F6AF71AD8291800CCBF6D /* Dobby-iOS */,
450454
DC7F6B021AD8291800CCBF6D /* Dobby-iOSTests */,
451455
);
@@ -538,7 +542,7 @@
538542
};
539543
DC8452251ADBF5CC006AC5D4 /* PBXTargetDependency */ = {
540544
isa = PBXTargetDependency;
541-
target = DC8452171ADBF5CC006AC5D4 /* Dobby-Mac */;
545+
target = DC8452171ADBF5CC006AC5D4 /* Dobby-macOS */;
542546
targetProxy = DC8452241ADBF5CC006AC5D4 /* PBXContainerItemProxy */;
543547
};
544548
/* End PBXTargetDependency section */
@@ -589,6 +593,7 @@
589593
);
590594
INFOPLIST_FILE = Dobby/Info.plist;
591595
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
596+
SWIFT_VERSION = 2.3;
592597
};
593598
name = Debug;
594599
};
@@ -606,6 +611,7 @@
606611
);
607612
INFOPLIST_FILE = Dobby/Info.plist;
608613
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
614+
SWIFT_VERSION = 2.3;
609615
};
610616
name = Release;
611617
};
@@ -620,6 +626,7 @@
620626
INFOPLIST_FILE = DobbyTests/Info.plist;
621627
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
622628
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
629+
SWIFT_VERSION = 2.3;
623630
};
624631
name = Debug;
625632
};
@@ -634,6 +641,7 @@
634641
INFOPLIST_FILE = DobbyTests/Info.plist;
635642
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
636643
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
644+
SWIFT_VERSION = 2.3;
637645
};
638646
name = Release;
639647
};
@@ -650,6 +658,7 @@
650658
FRAMEWORK_VERSION = A;
651659
INFOPLIST_FILE = Dobby/Info.plist;
652660
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
661+
SWIFT_VERSION = 2.3;
653662
};
654663
name = Debug;
655664
};
@@ -666,6 +675,7 @@
666675
FRAMEWORK_VERSION = A;
667676
INFOPLIST_FILE = Dobby/Info.plist;
668677
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
678+
SWIFT_VERSION = 2.3;
669679
};
670680
name = Release;
671681
};
@@ -680,6 +690,7 @@
680690
INFOPLIST_FILE = DobbyTests/Info.plist;
681691
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
682692
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
693+
SWIFT_VERSION = 2.3;
683694
};
684695
name = Debug;
685696
};
@@ -694,6 +705,7 @@
694705
INFOPLIST_FILE = DobbyTests/Info.plist;
695706
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
696707
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
708+
SWIFT_VERSION = 2.3;
697709
};
698710
name = Release;
699711
};
@@ -727,7 +739,7 @@
727739
defaultConfigurationIsVisible = 0;
728740
defaultConfigurationName = Release;
729741
};
730-
DC84522B1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-Mac" */ = {
742+
DC84522B1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-macOS" */ = {
731743
isa = XCConfigurationList;
732744
buildConfigurations = (
733745
DC84522C1ADBF5CC006AC5D4 /* Debug */,
@@ -736,7 +748,7 @@
736748
defaultConfigurationIsVisible = 0;
737749
defaultConfigurationName = Release;
738750
};
739-
DC84522E1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-MacTests" */ = {
751+
DC84522E1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-macOSTests" */ = {
740752
isa = XCConfigurationList;
741753
buildConfigurations = (
742754
DC84522F1ADBF5CC006AC5D4 /* Debug */,

‎Dobby.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dobby.xcodeproj/xcshareddata/xcschemes/Dobby-Mac.xcscheme renamed to Dobby.xcodeproj/xcshareddata/xcschemes/Dobby-macOS.xcscheme

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "DC8452171ADBF5CC006AC5D4"
1818
BuildableName = "Dobby.framework"
19-
BlueprintName = "Dobby-Mac"
19+
BlueprintName = "Dobby-macOS"
2020
ReferencedContainer = "container:Dobby.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -58,7 +58,7 @@
5858
BuildableIdentifier = "primary"
5959
BlueprintIdentifier = "DC8452211ADBF5CC006AC5D4"
6060
BuildableName = "DobbyTests.xctest"
61-
BlueprintName = "Dobby-MacTests"
61+
BlueprintName = "Dobby-macOSTests"
6262
ReferencedContainer = "container:Dobby.xcodeproj">
6363
</BuildableReference>
6464
</BuildActionEntry>
@@ -77,7 +77,7 @@
7777
BuildableIdentifier = "primary"
7878
BlueprintIdentifier = "DC8452211ADBF5CC006AC5D4"
7979
BuildableName = "DobbyTests.xctest"
80-
BlueprintName = "Dobby-MacTests"
80+
BlueprintName = "Dobby-macOSTests"
8181
ReferencedContainer = "container:Dobby.xcodeproj">
8282
</BuildableReference>
8383
</TestableReference>
@@ -87,7 +87,7 @@
8787
BuildableIdentifier = "primary"
8888
BlueprintIdentifier = "DC8452171ADBF5CC006AC5D4"
8989
BuildableName = "Dobby.framework"
90-
BlueprintName = "Dobby-Mac"
90+
BlueprintName = "Dobby-macOS"
9191
ReferencedContainer = "container:Dobby.xcodeproj">
9292
</BuildableReference>
9393
</MacroExpansion>
@@ -109,7 +109,7 @@
109109
BuildableIdentifier = "primary"
110110
BlueprintIdentifier = "DC8452171ADBF5CC006AC5D4"
111111
BuildableName = "Dobby.framework"
112-
BlueprintName = "Dobby-Mac"
112+
BlueprintName = "Dobby-macOS"
113113
ReferencedContainer = "container:Dobby.xcodeproj">
114114
</BuildableReference>
115115
</MacroExpansion>
@@ -127,7 +127,7 @@
127127
BuildableIdentifier = "primary"
128128
BlueprintIdentifier = "DC8452171ADBF5CC006AC5D4"
129129
BuildableName = "Dobby.framework"
130-
BlueprintName = "Dobby-Mac"
130+
BlueprintName = "Dobby-macOS"
131131
ReferencedContainer = "container:Dobby.xcodeproj">
132132
</BuildableReference>
133133
</MacroExpansion>

‎circle.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
machine:
22
xcode:
3-
version: 7.3
3+
version: 8.0
44

55
dependencies:
66
override:
@@ -12,17 +12,17 @@ test:
1212
xcodebuild
1313
-sdk macosx
1414
-workspace Dobby.xcworkspace
15-
-scheme Dobby-Mac
15+
-scheme Dobby-macOS
1616
clean build test |
17-
tee $CIRCLE_ARTIFACTS/xcode_raw_mac.log |
18-
xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/xcode/results-mac.xml
17+
tee $CIRCLE_ARTIFACTS/xcode_raw_macos.log |
18+
xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/xcode/results-macos.xml
1919
- set -o pipefail &&
2020
xcodebuild
2121
CODE_SIGNING_REQUIRED=NO
2222
CODE_SIGN_IDENTITY=
2323
PROVISIONING_PROFILE=
2424
-sdk iphonesimulator
25-
-destination 'platform=iOS Simulator,OS=9.3,name=iPhone 6s'
25+
-destination 'platform=iOS Simulator,OS=10.0,name=iPhone 6s'
2626
-workspace Dobby.xcworkspace
2727
-scheme Dobby-iOS
2828
clean build test |

0 commit comments

Comments
 (0)