Skip to content

Commit a81eae9

Browse files
committed
Merge branch 'release/1.1.0'
2 parents 861e5f8 + 95126b1 commit a81eae9

File tree

115 files changed

+3402
-1649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+3402
-1649
lines changed

.codecov.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
coverage:
2+
status:
3+
project: off
4+
patch: off
5+
changes: off
6+
comment:
7+
layout: "files"
8+
ignore:
9+
- "*Tests/**/*"
10+
- "Pods/**/*"

.github/workflows/pull_request.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: iOS review
2+
3+
on: pull_request
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Apply Ruby
11+
uses: actions/setup-ruby@v1
12+
with:
13+
ruby-version: '2.x'
14+
- uses: actions/cache@v1
15+
with:
16+
path: vendor/bundle
17+
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
18+
restore-keys: |
19+
${{ runner.os }}-gems-
20+
- name: Bundle install
21+
run: |
22+
bundle config path vendor/bundle
23+
bundle install --jobs 4 --retry 3
24+
- name: Run Danger
25+
run: bundle exec danger
26+
env:
27+
DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28+
- name: Fetch base ref
29+
run: git fetch --no-tags --prune --depth=1 origin ${{ github.base_ref }}
30+
- name: Run SwiftLint
31+
uses: norio-nomura/[email protected]
32+
with:
33+
args: --force-exclude
34+
env:
35+
DIFF_BASE: origin/${{ github.base_ref }}

.github/workflows/push.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: iOS build
2+
3+
on: push
4+
5+
jobs:
6+
build:
7+
runs-on: macos-latest
8+
steps:
9+
- uses: actions/checkout@v1
10+
- name: Apply Ruby
11+
uses: actions/setup-ruby@v1
12+
with:
13+
ruby-version: '2.x'
14+
- uses: actions/cache@v1
15+
with:
16+
path: vendor/bundle
17+
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
18+
restore-keys: |
19+
${{ runner.os }}-gems-
20+
- uses: actions/cache@v1
21+
with:
22+
path: Pods
23+
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
24+
restore-keys: |
25+
${{ runner.os }}-pods-
26+
- name: Install and setup
27+
run: |
28+
bundle config path vendor/bundle
29+
make bootstrap
30+
- name: Run Fastlane Build
31+
run: bundle exec fastlane scan
32+
- name: Send coverage to Codecov
33+
run: bundle exec fastlane run codecov_reporter

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ xcuserdata
2222
*.moved-aside
2323
*.xcuserstate
2424
*.xcscmblueprint
25+
*.generated.swift
2526
test_output
2627

2728
## Obj-C/Swift specific
@@ -36,5 +37,6 @@ Carthage/
3637

3738
## Production
3839
icook-tv-top-shelf-image.png
40+
iCookTV/GoogleService-Info.plist
3941
keys/
40-
fabric.*
42+
gc_keys.json

.hound.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
swiftlint:
2+
enabled: true
3+
config_file: .swiftlint.yml

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.5
1+
2.4.2

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.2

.swiftlint.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
disabled_rules:
2+
- force_try
3+
- line_length
4+
- nesting
5+
- variable_name
6+
- vertical_whitespace
7+
type_name:
8+
excluded:
9+
- iCookTVKeys
10+
- iCookTVTests
11+
variable_name:
12+
excluded:
13+
- id
14+
- URL
15+
included:
16+
- iCookTV
17+
- iCookTVTests
18+
excluded:
19+
- Carthage
20+
- Pods
21+
- iCookTV/R.generated.swift
22+
- vendor

.travis.yml

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

Brewfile

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

0 commit comments

Comments
 (0)