Skip to content

Commit

Permalink
Merge pull request #67 from ra1028/v1.1.2
Browse files Browse the repository at this point in the history
Version 1.1.2
  • Loading branch information
ra1028 committed May 7, 2019
2 parents ca5a624 + 470d0e1 commit 1fad2be
Show file tree
Hide file tree
Showing 98 changed files with 5,751 additions and 2,634 deletions.
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*.perspectivev3
!default.perspectivev3
xcuserdata
xcbaselines
profile
*.moved-aside
DerivedData
Expand All @@ -24,7 +25,10 @@ docs/undocumented.json

## Gems
.bundle
vendor/bundle
vendor

## CocoaPods
Pods

## Swift Package build
.build
.build
8 changes: 7 additions & 1 deletion .hound.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
swiftlint:
config_file: .swiftlint.yml
config_file: .swiftlint.yml

ruby:
enabled: false

javascript:
enabled: false
20 changes: 19 additions & 1 deletion .jazzy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,29 @@ module: DifferenceKit
readme: README.md
exclude: Sources/Extensions/AppKitExtension.swift
output: docs
theme: apple
theme: fullwidth
clean: true
skip_undocumented: true
xcodebuild_arguments:
- -sdk
- iphonesimulator
- -scheme
- DifferenceKit
custom_categories:
- name: Diffing
children:
- ContentEquatable
- Differentiable
- DifferentiableSection
- AnyDifferentiable
- ArraySection
- ElementPath
- Optional
- name: Changeset
children:
- StagedChangeset
- Changeset
- name: UI Extensions
children:
- UITableView
- UICollectionView
1 change: 1 addition & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

excluded:
- Tests/XCTestManifests.swift
- Benchmark

disabled_rules:
- type_name
Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ matrix:
include:
- <<: *testing_xcode
osx_image: xcode10.1
install: gem install bundler -v 2.0.1

- <<: *testing_xcode
osx_image: xcode10.2
Expand All @@ -48,4 +49,4 @@ matrix:
env: SWIFT_VERSION=5.0

notifications:
email: false
email: false
Loading

0 comments on commit 1fad2be

Please sign in to comment.