Skip to content

Commit 6243fc5

Browse files
mdiepmdiep
authored
Merge pull request #150 from sharplet/swift-2.3
Add support for Xcode 8 and Swift 2.3
2 parents c5aa44a + bfcb48d commit 6243fc5

File tree

5 files changed

+99
-38
lines changed

5 files changed

+99
-38
lines changed

‎.travis.yml‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,25 @@ language: objective-c
22
matrix:
33
include:
44
- osx_image: xcode7.3
5+
env: PLATFORM=Mac
6+
- osx_image: xcode7.3
7+
env: PLATFORM=iOS
8+
- osx_image: xcode7.3
9+
env: PLATFORM=tvOS
10+
- osx_image: xcode7.3
11+
env: PLATFORM=watchOS
12+
- osx_image: xcode7.3
13+
env: PLATFORM=CocoaPods
14+
- osx_image: xcode8
15+
env: PLATFORM=Mac TEST_ACTION="build-for-testing test-without-building"
16+
- osx_image: xcode8
17+
env: PLATFORM=iOS TEST_ACTION="build-for-testing test-without-building"
18+
- osx_image: xcode8
19+
env: PLATFORM=tvOS TEST_ACTION="build-for-testing test-without-building"
20+
- osx_image: xcode8
21+
env: PLATFORM=watchOS TEST_ACTION="build-for-testing test-without-building"
22+
- osx_image: xcode8
23+
env: PLATFORM=CocoaPods
524

625
env:
726
global:
@@ -10,14 +29,7 @@ env:
1029
git:
1130
submodules: false
1231

13-
script:
14-
- set -o pipefail
15-
- carthage bootstrap
16-
- xcodebuild test -scheme Rex-Mac | xcpretty -c
17-
- xcodebuild test -scheme Rex-iOS -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6s" | xcpretty -c
18-
- xcodebuild test -scheme Rex-tvOS -sdk appletvsimulator -destination "platform=tvOS Simulator,name=Apple TV 1080p" | xcpretty -c
19-
- xcodebuild build -scheme Rex-watchOS -sdk watchsimulator -destination "platform=watchOS Simulator,name=Apple Watch - 38mm" | xcpretty -c
20-
- pod lib lint
32+
script: script/ci "$PLATFORM"
2133

2234
notifications:
2335
email: false

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.1
1+
github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.2

‎Cartfile.resolved‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "antitypical/Result" "2.1.1"
2-
github "ReactiveCocoa/ReactiveCocoa" "v4.2.1"
1+
github "antitypical/Result" "2.1.3"
2+
github "ReactiveCocoa/ReactiveCocoa" "v4.2.2"

‎Rex.xcodeproj/project.pbxproj‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
CC02C18B1CCA704F0025CC04 /* ActionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC02C1881CCA704C0025CC04 /* ActionTests.swift */; };
5757
CC02C18C1CCA704F0025CC04 /* ActionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC02C1881CCA704C0025CC04 /* ActionTests.swift */; };
5858
D8003E941AFEC3D400D7D3C5 /* Rex.h in Headers */ = {isa = PBXBuildFile; fileRef = D8003E931AFEC3D400D7D3C5 /* Rex.h */; settings = {ATTRIBUTES = (Public, ); }; };
59-
D8003EB41AFEC6B000D7D3C5 /* ReactiveCocoa.framework in (null) */ = {isa = PBXBuildFile; fileRef = D8003EAD1AFEC68A00D7D3C5 /* ReactiveCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
60-
D8003EB51AFEC6B000D7D3C5 /* Result.framework in (null) */ = {isa = PBXBuildFile; fileRef = D8003EAE1AFEC68A00D7D3C5 /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
59+
D8003EB41AFEC6B000D7D3C5 /* ReactiveCocoa.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D8003EAD1AFEC68A00D7D3C5 /* ReactiveCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
60+
D8003EB51AFEC6B000D7D3C5 /* Result.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D8003EAE1AFEC68A00D7D3C5 /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6161
D8003EB91AFEC7A900D7D3C5 /* SignalProducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8003EB81AFEC7A900D7D3C5 /* SignalProducer.swift */; };
6262
D8003EBD1AFED01000D7D3C5 /* Signal.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8003EBC1AFED01000D7D3C5 /* Signal.swift */; };
6363
D8003EC21AFED30F00D7D3C5 /* SignalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8003EBE1AFED2F800D7D3C5 /* SignalTests.swift */; };
@@ -71,8 +71,8 @@
7171
D83457331AFEE4930070616A /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8003EAE1AFEC68A00D7D3C5 /* Result.framework */; };
7272
D83457351AFEE4B20070616A /* ReactiveCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8003EC91AFEE3ED00D7D3C5 /* ReactiveCocoa.framework */; };
7373
D83457361AFEE4B20070616A /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8003ECA1AFEE3ED00D7D3C5 /* Result.framework */; };
74-
D83457391AFEE4BE0070616A /* ReactiveCocoa.framework in (null) */ = {isa = PBXBuildFile; fileRef = D8003EC91AFEE3ED00D7D3C5 /* ReactiveCocoa.framework */; };
75-
D834573A1AFEE4BE0070616A /* Result.framework in (null) */ = {isa = PBXBuildFile; fileRef = D8003ECA1AFEE3ED00D7D3C5 /* Result.framework */; };
74+
D83457391AFEE4BE0070616A /* ReactiveCocoa.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D8003EC91AFEE3ED00D7D3C5 /* ReactiveCocoa.framework */; };
75+
D834573A1AFEE4BE0070616A /* Result.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D8003ECA1AFEE3ED00D7D3C5 /* Result.framework */; };
7676
D834573C1AFEE57E0070616A /* ReactiveCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8003EC91AFEE3ED00D7D3C5 /* ReactiveCocoa.framework */; };
7777
D834573D1AFEE57E0070616A /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8003ECA1AFEE3ED00D7D3C5 /* Result.framework */; };
7878
D83457411AFEE6050070616A /* SignalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8003EBE1AFED2F800D7D3C5 /* SignalTests.swift */; };
@@ -125,8 +125,8 @@
125125
D8715DE51C211643005F4191 /* UIViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8289A2E61BD7F7730097FB60 /* UIViewTests.swift */; };
126126
D8715DE61C21170C005F4191 /* ReactiveCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8715DC21C211310005F4191 /* ReactiveCocoa.framework */; };
127127
D8715DE71C21170C005F4191 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8715DC31C211310005F4191 /* Result.framework */; };
128-
D8715DE91C211739005F4191 /* ReactiveCocoa.framework in (null) */ = {isa = PBXBuildFile; fileRef = D8715DC21C211310005F4191 /* ReactiveCocoa.framework */; };
129-
D8715DEA1C211739005F4191 /* Result.framework in (null) */ = {isa = PBXBuildFile; fileRef = D8715DC31C211310005F4191 /* Result.framework */; };
128+
D8715DE91C211739005F4191 /* ReactiveCocoa.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D8715DC21C211310005F4191 /* ReactiveCocoa.framework */; };
129+
D8715DEA1C211739005F4191 /* Result.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = D8715DC31C211310005F4191 /* Result.framework */; };
130130
D8A454061BD26A1A00C9E790 /* Property.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8A454051BD26A1A00C9E790 /* Property.swift */; };
131131
D8A454071BD26A1A00C9E790 /* Property.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8A454051BD26A1A00C9E790 /* Property.swift */; };
132132
D8A454091BD2772700C9E790 /* PropertyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8A454081BD2772700C9E790 /* PropertyTests.swift */; };
@@ -140,12 +140,12 @@
140140
D8F0973F1B17F31E002E15BA /* NSData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F0973A1B17F2F7002E15BA /* NSData.swift */; };
141141
D8F097441B17F3C8002E15BA /* NSObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F097431B17F3C8002E15BA /* NSObject.swift */; };
142142
D8F097451B17F3C8002E15BA /* NSObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F097431B17F3C8002E15BA /* NSObject.swift */; };
143+
D8F0974A1B17F5E1002E15BA /* NSObjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F097471B17F5DD002E15BA /* NSObjectTests.swift */; };
144+
D8F0974B1B17F5E2002E15BA /* NSObjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F097471B17F5DD002E15BA /* NSObjectTests.swift */; };
143145
E6933BEA1CD9C335006F7CE7 /* UIProgressViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6933BE81CD9C1F1006F7CE7 /* UIProgressViewTests.swift */; };
144146
E6933BEB1CD9C363006F7CE7 /* UIProgressViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6933BE81CD9C1F1006F7CE7 /* UIProgressViewTests.swift */; };
145147
E6933BEC1CD9C37D006F7CE7 /* UIProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6933BE61CD9C0B2006F7CE7 /* UIProgressView.swift */; };
146148
E6933BED1CD9C37D006F7CE7 /* UIProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6933BE61CD9C0B2006F7CE7 /* UIProgressView.swift */; };
147-
D8F0974A1B17F5E1002E15BA /* NSObjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F097471B17F5DD002E15BA /* NSObjectTests.swift */; };
148-
D8F0974B1B17F5E2002E15BA /* NSObjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F097471B17F5DD002E15BA /* NSObjectTests.swift */; };
149149
/* End PBXBuildFile section */
150150

151151
/* Begin PBXContainerItemProxy section */
@@ -173,49 +173,49 @@
173173
/* End PBXContainerItemProxy section */
174174

175175
/* Begin PBXCopyFilesBuildPhase section */
176-
D8003EB21AFEC6A800D7D3C5 /* (null) */ = {
176+
D8003EB21AFEC6A800D7D3C5 /* CopyFiles */ = {
177177
isa = PBXCopyFilesBuildPhase;
178178
buildActionMask = 2147483647;
179179
dstPath = "";
180180
dstSubfolderSpec = 16;
181181
files = (
182-
D8003EB41AFEC6B000D7D3C5 /* ReactiveCocoa.framework in (null) */,
183-
D8003EB51AFEC6B000D7D3C5 /* Result.framework in (null) */,
182+
D8003EB41AFEC6B000D7D3C5 /* ReactiveCocoa.framework in CopyFiles */,
183+
D8003EB51AFEC6B000D7D3C5 /* Result.framework in CopyFiles */,
184184
);
185185
runOnlyForDeploymentPostprocessing = 0;
186186
};
187-
D83457371AFEE4B80070616A /* (null) */ = {
187+
D83457371AFEE4B80070616A /* CopyFiles */ = {
188188
isa = PBXCopyFilesBuildPhase;
189189
buildActionMask = 2147483647;
190190
dstPath = "";
191191
dstSubfolderSpec = 16;
192192
files = (
193-
D83457391AFEE4BE0070616A /* ReactiveCocoa.framework in (null) */,
194-
D834573A1AFEE4BE0070616A /* Result.framework in (null) */,
193+
D83457391AFEE4BE0070616A /* ReactiveCocoa.framework in CopyFiles */,
194+
D834573A1AFEE4BE0070616A /* Result.framework in CopyFiles */,
195195
);
196196
runOnlyForDeploymentPostprocessing = 0;
197197
};
198-
D8715DE81C21172A005F4191 /* (null) */ = {
198+
D8715DE81C21172A005F4191 /* CopyFiles */ = {
199199
isa = PBXCopyFilesBuildPhase;
200200
buildActionMask = 2147483647;
201201
dstPath = "";
202202
dstSubfolderSpec = 16;
203203
files = (
204-
D8715DE91C211739005F4191 /* ReactiveCocoa.framework in (null) */,
205-
D8715DEA1C211739005F4191 /* Result.framework in (null) */,
204+
D8715DE91C211739005F4191 /* ReactiveCocoa.framework in CopyFiles */,
205+
D8715DEA1C211739005F4191 /* Result.framework in CopyFiles */,
206206
);
207207
runOnlyForDeploymentPostprocessing = 0;
208208
};
209209
/* End PBXCopyFilesBuildPhase section */
210210

211211
/* Begin PBXFileReference section */
212+
4238D5951B4D5950008534C0 /* NSTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; name = NSTextField.swift; path = AppKit/NSTextField.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
212213
45CED46B1D27BB8700788BDC /* UIActivityIndicatorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIActivityIndicatorView.swift; sourceTree = "<group>"; };
213214
45CED46D1D27C1D400788BDC /* UIActivityIndicatorViewTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIActivityIndicatorViewTests.swift; sourceTree = "<group>"; };
214-
4238D5951B4D5950008534C0 /* NSTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; name = NSTextField.swift; path = AppKit/NSTextField.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
215-
5B1C882D1D0715CE000B888F /* UISegmentedControl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UISegmentedControl.swift; sourceTree = "<group>"; };
216-
5B1C882F1D071639000B888F /* UISegmentedControlTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UISegmentedControlTests.swift; sourceTree = "<group>"; };
217215
5173EBC51B625A2600C9B48E /* UIBarItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = UIBarItem.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
218216
5173EBC71B625A6800C9B48E /* UIBarButtonItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = UIBarButtonItem.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
217+
5B1C882D1D0715CE000B888F /* UISegmentedControl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UISegmentedControl.swift; sourceTree = "<group>"; };
218+
5B1C882F1D071639000B888F /* UISegmentedControlTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UISegmentedControlTests.swift; sourceTree = "<group>"; };
219219
7D0DABA91CCC381F00B6CD2B /* UIControl+EnableSendActionsForControlEvents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIControl+EnableSendActionsForControlEvents.swift"; sourceTree = "<group>"; };
220220
7D2AA99A1CB6EFEB008AB5C9 /* UISwitch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = UISwitch.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
221221
7D2AA99C1CB6F275008AB5C9 /* UISwitchTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = UISwitchTests.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@@ -274,11 +274,11 @@
274274
D8A454081BD2772700C9E790 /* PropertyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = PropertyTests.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
275275
D8F073141B861B3A0047D546 /* UILabelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = UILabelTests.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
276276
D8F0973A1B17F2F7002E15BA /* NSData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = NSData.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
277-
E6933BE61CD9C0B2006F7CE7 /* UIProgressView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIProgressView.swift; sourceTree = "<group>"; };
278-
E6933BE81CD9C1F1006F7CE7 /* UIProgressViewTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIProgressViewTests.swift; sourceTree = "<group>"; };
279277
D8F0973C1B17F30D002E15BA /* NSUserDefaults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = NSUserDefaults.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
280278
D8F097431B17F3C8002E15BA /* NSObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = NSObject.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
281279
D8F097471B17F5DD002E15BA /* NSObjectTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = NSObjectTests.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
280+
E6933BE61CD9C0B2006F7CE7 /* UIProgressView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIProgressView.swift; sourceTree = "<group>"; };
281+
E6933BE81CD9C1F1006F7CE7 /* UIProgressViewTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIProgressViewTests.swift; sourceTree = "<group>"; };
282282
/* End PBXFileReference section */
283283

284284
/* Begin PBXFrameworksBuildPhase section */
@@ -608,7 +608,7 @@
608608
D8003E951AFEC3D400D7D3C5 /* Sources */,
609609
D8003E961AFEC3D400D7D3C5 /* Frameworks */,
610610
D8003E971AFEC3D400D7D3C5 /* Resources */,
611-
D8003EB21AFEC6A800D7D3C5 /* (null) */,
611+
D8003EB21AFEC6A800D7D3C5 /* CopyFiles */,
612612
);
613613
buildRules = (
614614
);
@@ -645,7 +645,7 @@
645645
D834571A1AFEE44E0070616A /* Sources */,
646646
D834571B1AFEE44E0070616A /* Frameworks */,
647647
D834571C1AFEE44E0070616A /* Resources */,
648-
D83457371AFEE4B80070616A /* (null) */,
648+
D83457371AFEE4B80070616A /* CopyFiles */,
649649
);
650650
buildRules = (
651651
);
@@ -700,7 +700,7 @@
700700
D8715DCD1C21160A005F4191 /* Sources */,
701701
D8715DCE1C21160A005F4191 /* Frameworks */,
702702
D8715DCF1C21160A005F4191 /* Resources */,
703-
D8715DE81C21172A005F4191 /* (null) */,
703+
D8715DE81C21172A005F4191 /* CopyFiles */,
704704
);
705705
buildRules = (
706706
);
@@ -724,28 +724,35 @@
724724
TargetAttributes = {
725725
D8003E8D1AFEC3D400D7D3C5 = {
726726
CreatedOnToolsVersion = 6.3;
727+
LastSwiftMigration = 0800;
727728
};
728729
D8003E981AFEC3D400D7D3C5 = {
729730
CreatedOnToolsVersion = 6.3;
731+
LastSwiftMigration = 0800;
730732
};
731733
D83457131AFEE44E0070616A = {
732734
CreatedOnToolsVersion = 6.3;
735+
LastSwiftMigration = 0800;
733736
};
734737
D834571D1AFEE44E0070616A = {
735738
CreatedOnToolsVersion = 6.3;
739+
LastSwiftMigration = 0800;
736740
};
737741
D8715D931C210F97005F4191 = {
738742
CreatedOnToolsVersion = 7.2;
743+
LastSwiftMigration = 0800;
739744
};
740745
D8715DAF1C21123E005F4191 = {
741746
CreatedOnToolsVersion = 7.2;
747+
LastSwiftMigration = 0800;
742748
};
743749
D8715DD01C21160A005F4191 = {
744750
CreatedOnToolsVersion = 7.2;
751+
LastSwiftMigration = 0800;
745752
};
746753
};
747754
};
748-
buildConfigurationList = D8003E881AFEC3D400D7D3C5 /* Build configuration list for PBXProject "Rex-Mac" */;
755+
buildConfigurationList = D8003E881AFEC3D400D7D3C5 /* Build configuration list for PBXProject "Rex" */;
749756
compatibilityVersion = "Xcode 3.2";
750757
developmentRegion = English;
751758
hasScannedForEncodings = 0;
@@ -1048,6 +1055,7 @@
10481055
ONLY_ACTIVE_ARCH = YES;
10491056
SDKROOT = macosx;
10501057
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1058+
SWIFT_VERSION = 2.3;
10511059
VERSIONING_SYSTEM = "apple-generic";
10521060
VERSION_INFO_PREFIX = "";
10531061
};
@@ -1086,6 +1094,7 @@
10861094
MACOSX_DEPLOYMENT_TARGET = 10.10;
10871095
MTL_ENABLE_DEBUG_INFO = NO;
10881096
SDKROOT = macosx;
1097+
SWIFT_VERSION = 2.3;
10891098
VERSIONING_SYSTEM = "apple-generic";
10901099
VERSION_INFO_PREFIX = "";
10911100
};
@@ -1412,7 +1421,7 @@
14121421
/* End XCBuildConfiguration section */
14131422

14141423
/* Begin XCConfigurationList section */
1415-
D8003E881AFEC3D400D7D3C5 /* Build configuration list for PBXProject "Rex-Mac" */ = {
1424+
D8003E881AFEC3D400D7D3C5 /* Build configuration list for PBXProject "Rex" */ = {
14161425
isa = XCConfigurationList;
14171426
buildConfigurations = (
14181427
D8003EA21AFEC3D400D7D3C5 /* Debug */,

‎script/ci‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/bin/sh
2+
3+
set -e -o pipefail
4+
5+
bootstrap() {
6+
case "$1" in
7+
CocoaPods)
8+
;;
9+
*)
10+
carthage bootstrap --no-use-binaries --platform "$1"
11+
;;
12+
esac
13+
}
14+
15+
build() {
16+
case "$1" in
17+
Mac)
18+
xcodebuild ${TEST_ACTION:-test} -scheme Rex-Mac | xcpretty -c
19+
;;
20+
iOS)
21+
xcodebuild ${TEST_ACTION:-test} -scheme Rex-iOS -destination "platform=iOS Simulator,name=iPhone 6s" | xcpretty -c
22+
;;
23+
tvOS)
24+
xcodebuild ${TEST_ACTION:-test} -scheme Rex-tvOS -destination "platform=tvOS Simulator,name=Apple TV 1080p" | xcpretty -c
25+
;;
26+
watchOS)
27+
xcodebuild build -scheme Rex-watchOS -destination "platform=watchOS Simulator,name=Apple Watch - 42mm" | xcpretty -c
28+
;;
29+
CocoaPods)
30+
pod lib lint --quick --allow-warnings
31+
;;
32+
*)
33+
echo 2>&1 "Usage: $0 <Mac|iOS|tvOS|watchOS|CocoaPods>"
34+
exit 1
35+
;;
36+
esac
37+
}
38+
39+
bootstrap "$@"
40+
build "$@"

0 commit comments

Comments
 (0)