Skip to content

Commit 702cbab

Browse files
authored
Merge pull request #2 from limadeveloper/feature/ci_improvements
Feature/ci improvements
2 parents f4d25bb + d52fd82 commit 702cbab

18 files changed

Lines changed: 528 additions & 21 deletions

File tree

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ xcuserdata/
2323
*.xcscmblueprint
2424
.DS_Store
2525
.DS_Store?
26+
coverage
2627

2728
## Obj-C/Swift specific
2829
*.hmap
@@ -61,7 +62,7 @@ Carthage/Build
6162
# screenshots whenever they are needed.
6263
# For more information about the recommended setup visit:
6364
# https://docs.fastlane.tools/best-practices/source-control/#source-control
64-
fastlane/report.xml
65-
fastlane/Preview.html
6665
fastlane/screenshots
67-
fastlane/test_output
66+
fastlane/README.md
67+
report.xml
68+
test_output

.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
language: objective-c
1+
language: swift
22
osx_image: xcode10.1
33
before_install:
44
- set -o pipefail
5-
- xcrun simctl boot "iPhone 7" || echo "(Pre)Launched the simulator."
5+
- xcrun simctl boot "iPhone XR" || echo "(Pre)Launched the simulator."
66
script:
7-
- travis_retry xcodebuild -project Framework/PickImageAlert.xcodeproj -scheme "PickImageAlert" -destination "platform=iOS Simulator,name=iPhone 7" -enableCodeCoverage YES ONLY_ACTIVE_ARCH=YES test | xcpretty -c
8-
- pod lib lint
7+
- cd Framework
8+
- bundle install
9+
- bundle exec pod repo update
10+
- bundle exec fastlane build
11+
- cd ..
12+
- pod lib lint
13+
- pod spec lint

Example/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ target 'Example' do
44
use_frameworks!
55

66
# Pods for Example
7-
pod 'PickImageAlert', :path => "../"
7+
pod 'PickImageAlert'
88

99
end

Example/Podfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
PODS:
2-
- PickImageAlert (1.0.0)
2+
- PickImageAlert (1.0.2)
33

44
DEPENDENCIES:
5-
- PickImageAlert (from `../`)
5+
- PickImageAlert
66

7-
EXTERNAL SOURCES:
8-
PickImageAlert:
9-
:path: "../"
7+
SPEC REPOS:
8+
https://github.com/cocoapods/specs.git:
9+
- PickImageAlert
1010

1111
SPEC CHECKSUMS:
12-
PickImageAlert: ba09ee4900bacc8291a61e6b7e2d5bc6459189a5
12+
PickImageAlert: 63e6f736dd4df50f10032eb283c95d7dc08af9e1
1313

14-
PODFILE CHECKSUM: a1cb9dbd8c1d3fec1b5588f798c10b402a841be8
14+
PODFILE CHECKSUM: ced5cb8fec90c803e7289b1eee89d5aad219e657
1515

1616
COCOAPODS: 1.5.3

Framework/.slather.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# .slather.yml
2+
3+
input_format: profdata
4+
coverage_service: html
5+
scheme: PickImageAlert
6+
workspace: PickImageAlert.xcworkspace
7+
xcodeproj: PickImageAlert.xcodeproj
8+
output_directory: coverage
9+
ignore:
10+
- "ThirdParty/*"

Framework/Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source 'https://rubygems.org'
2+
3+
gem "fastlane"
4+
gem "cocoapods"
5+
gem "slather"

Framework/Gemfile.lock

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (2.3.6)
5+
activesupport (4.2.10)
6+
i18n (~> 0.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
10+
addressable (2.5.2)
11+
public_suffix (>= 2.0.2, < 4.0)
12+
atomos (0.1.3)
13+
babosa (1.0.2)
14+
claide (1.0.2)
15+
clamp (0.6.5)
16+
cocoapods (1.5.3)
17+
activesupport (>= 4.0.2, < 5)
18+
claide (>= 1.0.2, < 2.0)
19+
cocoapods-core (= 1.5.3)
20+
cocoapods-deintegrate (>= 1.0.2, < 2.0)
21+
cocoapods-downloader (>= 1.2.0, < 2.0)
22+
cocoapods-plugins (>= 1.0.0, < 2.0)
23+
cocoapods-search (>= 1.0.0, < 2.0)
24+
cocoapods-stats (>= 1.0.0, < 2.0)
25+
cocoapods-trunk (>= 1.3.0, < 2.0)
26+
cocoapods-try (>= 1.1.0, < 2.0)
27+
colored2 (~> 3.1)
28+
escape (~> 0.0.4)
29+
fourflusher (~> 2.0.1)
30+
gh_inspector (~> 1.0)
31+
molinillo (~> 0.6.5)
32+
nap (~> 1.0)
33+
ruby-macho (~> 1.1)
34+
xcodeproj (>= 1.5.7, < 2.0)
35+
cocoapods-core (1.5.3)
36+
activesupport (>= 4.0.2, < 6)
37+
fuzzy_match (~> 2.0.4)
38+
nap (~> 1.0)
39+
cocoapods-deintegrate (1.0.2)
40+
cocoapods-downloader (1.2.2)
41+
cocoapods-plugins (1.0.0)
42+
nap
43+
cocoapods-search (1.0.0)
44+
cocoapods-stats (1.0.0)
45+
cocoapods-trunk (1.3.1)
46+
nap (>= 0.8, < 2.0)
47+
netrc (~> 0.11)
48+
cocoapods-try (1.1.0)
49+
colored (1.2)
50+
colored2 (3.1.2)
51+
commander-fastlane (4.4.6)
52+
highline (~> 1.7.2)
53+
concurrent-ruby (1.1.3)
54+
declarative (0.0.10)
55+
declarative-option (0.1.0)
56+
domain_name (0.5.20180417)
57+
unf (>= 0.0.5, < 1.0.0)
58+
dotenv (2.5.0)
59+
emoji_regex (0.1.1)
60+
escape (0.0.4)
61+
excon (0.62.0)
62+
faraday (0.15.4)
63+
multipart-post (>= 1.2, < 3)
64+
faraday-cookie_jar (0.0.6)
65+
faraday (>= 0.7.4)
66+
http-cookie (~> 1.0.0)
67+
faraday_middleware (0.12.2)
68+
faraday (>= 0.7.4, < 1.0)
69+
fastimage (2.1.5)
70+
fastlane (2.108.0)
71+
CFPropertyList (>= 2.3, < 4.0.0)
72+
addressable (>= 2.3, < 3.0.0)
73+
babosa (>= 1.0.2, < 2.0.0)
74+
bundler (>= 1.12.0, < 2.0.0)
75+
colored
76+
commander-fastlane (>= 4.4.6, < 5.0.0)
77+
dotenv (>= 2.1.1, < 3.0.0)
78+
emoji_regex (~> 0.1)
79+
excon (>= 0.45.0, < 1.0.0)
80+
faraday (~> 0.9)
81+
faraday-cookie_jar (~> 0.0.6)
82+
faraday_middleware (~> 0.9)
83+
fastimage (>= 2.1.0, < 3.0.0)
84+
gh_inspector (>= 1.1.2, < 2.0.0)
85+
google-api-client (>= 0.21.2, < 0.24.0)
86+
highline (>= 1.7.2, < 2.0.0)
87+
json (< 3.0.0)
88+
mini_magick (~> 4.5.1)
89+
multi_json
90+
multi_xml (~> 0.5)
91+
multipart-post (~> 2.0.0)
92+
plist (>= 3.1.0, < 4.0.0)
93+
public_suffix (~> 2.0.0)
94+
rubyzip (>= 1.2.2, < 2.0.0)
95+
security (= 0.1.3)
96+
simctl (~> 1.6.3)
97+
slack-notifier (>= 2.0.0, < 3.0.0)
98+
terminal-notifier (>= 1.6.2, < 2.0.0)
99+
terminal-table (>= 1.4.5, < 2.0.0)
100+
tty-screen (>= 0.6.3, < 1.0.0)
101+
tty-spinner (>= 0.8.0, < 1.0.0)
102+
word_wrap (~> 1.0.0)
103+
xcodeproj (>= 1.6.0, < 2.0.0)
104+
xcpretty (~> 0.3.0)
105+
xcpretty-travis-formatter (>= 0.0.3)
106+
fourflusher (2.0.1)
107+
fuzzy_match (2.0.4)
108+
gh_inspector (1.1.3)
109+
google-api-client (0.23.9)
110+
addressable (~> 2.5, >= 2.5.1)
111+
googleauth (>= 0.5, < 0.7.0)
112+
httpclient (>= 2.8.1, < 3.0)
113+
mime-types (~> 3.0)
114+
representable (~> 3.0)
115+
retriable (>= 2.0, < 4.0)
116+
signet (~> 0.9)
117+
googleauth (0.6.7)
118+
faraday (~> 0.12)
119+
jwt (>= 1.4, < 3.0)
120+
memoist (~> 0.16)
121+
multi_json (~> 1.11)
122+
os (>= 0.9, < 2.0)
123+
signet (~> 0.7)
124+
highline (1.7.10)
125+
http-cookie (1.0.3)
126+
domain_name (~> 0.5)
127+
httpclient (2.8.3)
128+
i18n (0.9.5)
129+
concurrent-ruby (~> 1.0)
130+
json (2.1.0)
131+
jwt (2.1.0)
132+
memoist (0.16.0)
133+
mime-types (3.2.2)
134+
mime-types-data (~> 3.2015)
135+
mime-types-data (3.2018.0812)
136+
mini_magick (4.5.1)
137+
mini_portile2 (2.3.0)
138+
minitest (5.11.3)
139+
molinillo (0.6.6)
140+
multi_json (1.13.1)
141+
multi_xml (0.6.0)
142+
multipart-post (2.0.0)
143+
nanaimo (0.2.6)
144+
nap (1.1.0)
145+
naturally (2.2.0)
146+
netrc (0.11.0)
147+
nokogiri (1.8.5)
148+
mini_portile2 (~> 2.3.0)
149+
os (1.0.0)
150+
plist (3.4.0)
151+
public_suffix (2.0.5)
152+
representable (3.0.4)
153+
declarative (< 0.1.0)
154+
declarative-option (< 0.2.0)
155+
uber (< 0.2.0)
156+
retriable (3.1.2)
157+
rouge (2.0.7)
158+
ruby-macho (1.2.0)
159+
rubyzip (1.2.2)
160+
security (0.1.3)
161+
signet (0.11.0)
162+
addressable (~> 2.3)
163+
faraday (~> 0.9)
164+
jwt (>= 1.5, < 3.0)
165+
multi_json (~> 1.10)
166+
simctl (1.6.5)
167+
CFPropertyList
168+
naturally
169+
slack-notifier (2.3.2)
170+
slather (2.4.6)
171+
CFPropertyList (~> 2.2)
172+
activesupport (>= 4.0.2)
173+
clamp (~> 0.6)
174+
nokogiri (~> 1.8.2)
175+
xcodeproj (~> 1.4)
176+
terminal-notifier (1.8.0)
177+
terminal-table (1.8.0)
178+
unicode-display_width (~> 1.1, >= 1.1.1)
179+
thread_safe (0.3.6)
180+
tty-cursor (0.6.0)
181+
tty-screen (0.6.5)
182+
tty-spinner (0.9.0)
183+
tty-cursor (~> 0.6.0)
184+
tzinfo (1.2.5)
185+
thread_safe (~> 0.1)
186+
uber (0.1.0)
187+
unf (0.1.4)
188+
unf_ext
189+
unf_ext (0.0.7.5)
190+
unicode-display_width (1.4.0)
191+
word_wrap (1.0.0)
192+
xcodeproj (1.7.0)
193+
CFPropertyList (>= 2.3.3, < 4.0)
194+
atomos (~> 0.1.3)
195+
claide (>= 1.0.2, < 2.0)
196+
colored2 (~> 3.1)
197+
nanaimo (~> 0.2.6)
198+
xcpretty (0.3.0)
199+
rouge (~> 2.0.7)
200+
xcpretty-travis-formatter (1.0.0)
201+
xcpretty (~> 0.2, >= 0.0.7)
202+
203+
PLATFORMS
204+
ruby
205+
206+
DEPENDENCIES
207+
cocoapods
208+
fastlane
209+
slather
210+
211+
BUNDLED WITH
212+
1.17.1

0 commit comments

Comments
 (0)