Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cocoapods 1.6.0.rc.1 and SwiftLint 0.30.1 #114

Merged
merged 4 commits into from
Jan 27, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
swiftlint_version: 0.29.3
swiftlint_version: 0.30.1

opt_in_rules:
- anyobject_protocol
Expand All @@ -12,6 +12,7 @@ opt_in_rules:
- convenience_type
- discouraged_optional_boolean
- discouraged_optional_collection
- duplicate_imports
- empty_count
- empty_string
- fallthrough
Expand All @@ -36,6 +37,7 @@ opt_in_rules:
- multiline_literal_brackets
- multiline_parameters
- multiline_parameters_brackets
- nslocalizedstring_key
- number_separator
- object_literal
- operator_usage_whitespace
Expand All @@ -49,11 +51,13 @@ opt_in_rules:
- sorted_first_last
- sorted_imports
- static_operator
- strong_iboutlet
- toggle_bool
- trailing_closure
- unavailable_function
- unneeded_parentheses_in_closure_argument
- unused_control_flow_label
- unused_setter_value
- vertical_parameter_alignment_on_call
- vertical_whitespace_closing_braces
- vertical_whitespace_opening_braces
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ _None_

### Internal Changes

* Update to SwiftLint 0.29.3 and enable some extra SwiftLint rules.
* Update to SwiftLint 0.30.1 and enable some extra SwiftLint rules.
[David Jennes](https://github.com/djbe)
[#112](https://github.com/SwiftGen/StencilSwiftKit/pull/112)
[#114](https://github.com/SwiftGen/StencilSwiftKit/pull/114)

## 2.7.1

Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ end

# In addition to :build, for contributing
group :development do
gem 'cocoapods', '~> 1.6.0.beta.2'
gem 'rubocop', '~> 0.62'
gem 'cocoapods', '~> 1.6.0.rc.1'
gem 'rubocop', '~> 0.63'
end

# For releasing to GitHub
Expand Down
28 changes: 14 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ GEM
ast (2.4.0)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.6.0.beta.2)
cocoapods (1.6.0.rc.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.6.0.beta.2)
cocoapods-core (= 1.6.0.rc.1)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -25,13 +25,13 @@ GEM
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
fourflusher (~> 2.1.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.3, >= 1.3.1)
xcodeproj (>= 1.7.0, < 2.0)
cocoapods-core (1.6.0.beta.2)
xcodeproj (>= 1.8.0, < 2.0)
cocoapods-core (1.6.0.rc.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
Expand All @@ -40,7 +40,7 @@ GEM
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
Expand All @@ -50,12 +50,12 @@ GEM
escape (0.0.4)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
fourflusher (2.0.1)
fourflusher (2.1.0)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.1)
jaro_winkler (1.5.2)
minitest (5.11.3)
molinillo (0.6.6)
multipart-post (2.0.0)
Expand All @@ -64,15 +64,15 @@ GEM
netrc (0.11.0)
octokit (4.13.0)
sawyer (~> 0.8.0, >= 0.5.3)
parallel (1.12.1)
parser (2.5.3.0)
parallel (1.13.0)
parser (2.6.0.0)
ast (~> 2.4.0)
powerpack (0.1.2)
public_suffix (3.0.3)
rainbow (3.0.0)
rake (12.3.2)
rouge (2.0.7)
rubocop (0.62.0)
rubocop (0.63.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
Expand All @@ -89,7 +89,7 @@ GEM
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.4.1)
xcodeproj (1.7.0)
xcodeproj (1.8.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -102,10 +102,10 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.6.0.beta.2)
cocoapods (~> 1.6.0.rc.1)
octokit (~> 4.13)
rake (~> 12.3)
rubocop (~> 0.62)
rubocop (~> 0.63)
xcpretty

BUNDLED WITH
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ raise 'Please use bundle exec to run the pod command' unless defined?(Bundler)

target 'Tests' do
pod 'StencilSwiftKit', path: '.'
pod 'SwiftLint', '~> 0.29'
pod 'SwiftLint', '~> 0.30'
end
10 changes: 5 additions & 5 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ PODS:
- PathKit (~> 0.9.0)
- StencilSwiftKit (2.7.1):
- Stencil (~> 0.13.1)
- SwiftLint (0.29.3)
- SwiftLint (0.30.1)

DEPENDENCIES:
- StencilSwiftKit (from `.`)
- SwiftLint (~> 0.29)
- SwiftLint (~> 0.30)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
Expand All @@ -24,8 +24,8 @@ SPEC CHECKSUMS:
PathKit: 273f59a38e3218eb95abd9f6a61730a8bcfd2f06
Stencil: b5128a0a43ece9225db5cbd94d6569fe6fba609b
StencilSwiftKit: e16b4580ae8cec0af6deea1924200ae733042162
SwiftLint: bfa7ca7b4d170cfaf0d236ca3ffd969e88a2f002
SwiftLint: a54bf1fe12b55c68560eb2a7689dfc81458508f7

PODFILE CHECKSUM: dc07e3bb2d5b477586d93c79a4bbd9e79a49960f
PODFILE CHECKSUM: 3b7a88190f628a5b558919e2cdb79ba9e9a27c2f

COCOAPODS: 1.6.0.beta.2
COCOAPODS: 1.6.0.rc.1
10 changes: 5 additions & 5 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading