Skip to content
This repository was archived by the owner on May 26, 2020. It is now read-only.

Commit f538e98

Browse files
dmcrodriguesandersio
authored andcommitted
Restructure infrastructure (#16)
* (Re-)include tests * Use carthage to install dependencies for iOS, macOS, tvOS and watchOS * Carthage checkouts should not be kept in the repo * Remove submodules * Use `xcconfigs` last release * Remove playground validation * Carthage's jobs also need to install dependencies * Build using a single iOS device and upgrade iOS to 10.2 * Use iOS 10.1 to test Travis has duplicate simulators for iOS 10.2 which creates an ambiguity: travis-ci/travis-ci#7031 * Restore test of 32-bit builds
1 parent 28e59f8 commit f538e98

File tree

14 files changed

+45
-64
lines changed

14 files changed

+45
-64
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ playground.xcworkspace
4747
# you should judge for yourself, the pros and cons are mentioned at:
4848
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
4949
#
50-
# Pods/
50+
Pods/
5151

5252
# Carthage
5353
#
5454
# Add this line if you want to avoid checking in source code from Carthage dependencies.
55-
# Carthage/Checkouts
55+
Carthage/Checkouts
5656

5757
Carthage/Build
5858

.gitmodules

Lines changed: 0 additions & 15 deletions
This file was deleted.

.travis.yml

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,88 @@
11
language: objective-c
22
osx_image: xcode8.2
3-
before_install: true
4-
install: true
5-
git:
6-
submodules: false
73
branches:
84
only:
95
- master
10-
before_script:
11-
- git submodule update --init --recursive
126
script:
137
- script/build
14-
xcode_workspace: ReactiveCollections.xcworkspace
8+
xcode_project: ReactiveCollections.xcodeproj
159
matrix:
1610
include:
1711
- xcode_scheme: ReactiveCollections-macOS
1812
env:
1913
- XCODE_SDK=macosx
2014
- XCODE_ACTION="build test"
2115
- XCODE_DESTINATION="arch=x86_64"
22-
- XCODE_PLAYGROUND_TARGET="x86_64-apple-macosx10.10"
16+
before_install:
17+
- brew update
18+
- brew outdated carthage || brew upgrade carthage
19+
install:
20+
- carthage bootstrap --no-use-binaries --platform macOS
2321
- xcode_scheme: ReactiveCollections-iOS
2422
env:
2523
- XCODE_SDK=iphonesimulator
2624
- XCODE_ACTION="build-for-testing test-without-building"
27-
- XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 6s,OS=10.1"
25+
- XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 7,OS=10.1"
26+
before_install:
27+
- brew update
28+
- brew outdated carthage || brew upgrade carthage
29+
install:
30+
- carthage bootstrap --no-use-binaries --platform iOS
2831
- xcode_scheme: ReactiveCollections-iOS
2932
env:
3033
- XCODE_SDK=iphonesimulator
3134
- XCODE_ACTION="build-for-testing test-without-building"
3235
- XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 5,OS=10.1"
36+
before_install:
37+
- brew update
38+
- brew outdated carthage || brew upgrade carthage
39+
install:
40+
- carthage bootstrap --no-use-binaries --platform iOS
3341
- xcode_scheme: ReactiveCollections-tvOS
3442
env:
3543
- XCODE_SDK=appletvsimulator
3644
- XCODE_ACTION="build-for-testing test-without-building"
3745
- XCODE_DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p"
46+
before_install:
47+
- brew update
48+
- brew outdated carthage || brew upgrade carthage
49+
install:
50+
- carthage bootstrap --no-use-binaries --platform tvOS
3851
- xcode_scheme: ReactiveCollections-watchOS
3952
env:
4053
- XCODE_SDK=watchsimulator
4154
- XCODE_ACTION=build
4255
- XCODE_DESTINATION="platform=watchOS Simulator,name=Apple Watch - 38mm"
56+
before_install:
57+
- brew update
58+
- brew outdated carthage || brew upgrade carthage
59+
install:
60+
- carthage bootstrap --no-use-binaries --platform watchOS
4361
- script:
4462
- brew update
4563
- brew outdated carthage || brew upgrade carthage
46-
- carthage build --no-skip-current --platform mac
64+
- carthage bootstrap --no-use-binaries --platform macOS
65+
- carthage build --no-skip-current --platform macOS
4766
env:
4867
- JOB=CARTHAGE-macOS
4968
- script:
5069
- brew update
5170
- brew outdated carthage || brew upgrade carthage
71+
- carthage bootstrap --no-use-binaries --platform iOS
5272
- carthage build --no-skip-current --platform iOS
5373
env:
5474
- JOB=CARTHAGE-iOS
5575
- script:
5676
- brew update
5777
- brew outdated carthage || brew upgrade carthage
78+
- carthage bootstrap --no-use-binaries --platform tvOS
5879
- carthage build --no-skip-current --platform tvOS
5980
env:
6081
- JOB=CARTHAGE-tvOS
6182
- script:
6283
- brew update
6384
- brew outdated carthage || brew upgrade carthage
85+
- carthage bootstrap --no-use-binaries --platform watchOS
6486
- carthage build --no-skip-current --platform watchOS
6587
env:
6688
- JOB=CARTHAGE-watchOS

Cartfile.private

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "jspahrsummers/xcconfigs" "3d9d996"
1+
github "jspahrsummers/xcconfigs" ~> 0.10
22
github "Quick/Quick" ~> 1.0
33
github "Quick/Nimble" ~> 5.1

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
github "Quick/Nimble" "v5.1.1"
22
github "Quick/Quick" "v1.0.0"
33
github "antitypical/Result" "3.1.0"
4-
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
4+
github "jspahrsummers/xcconfigs" "0.10"
55
github "ReactiveCocoa/ReactiveSwift" "1.0.0-rc.2"

Carthage/Checkouts/Nimble

Lines changed: 0 additions & 1 deletion
This file was deleted.

Carthage/Checkouts/Quick

Lines changed: 0 additions & 1 deletion
This file was deleted.

Carthage/Checkouts/ReactiveSwift

Lines changed: 0 additions & 1 deletion
This file was deleted.

Carthage/Checkouts/Result

Lines changed: 0 additions & 1 deletion
This file was deleted.

Carthage/Checkouts/xcconfigs

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)