Skip to content

Commit 958b392

Browse files
authored
Merge pull request #272 from mattrubin/tool-updates
Update tool configurations
2 parents 68b4176 + aadb7b0 commit 958b392

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

.swiftlint.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ opt_in_rules:
1313
- discouraged_object_literal
1414
- discouraged_optional_boolean
1515
- empty_count
16+
- empty_string
1617
- explicit_enum_raw_value
1718
- explicit_init
1819
- extension_access_modifier
@@ -25,6 +26,7 @@ opt_in_rules:
2526
- joined_default_parameter
2627
- let_var_whitespace
2728
- literal_expression_end_indentation
29+
- lower_acl_than_parent
2830
- operator_usage_whitespace
2931
- overridden_super_call
3032
- override_in_extension
@@ -36,6 +38,7 @@ opt_in_rules:
3638
- single_test_class
3739
- sorted_first_last
3840
- switch_case_on_newline
41+
- untyped_error_in_catch
3942
- vertical_parameter_alignment_on_call
4043
- yoda_condition
4144
disabled_rules:

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ language: objective-c
55
xcode_workspace: Authenticator.xcworkspace
66
xcode_scheme: Authenticator
77

8-
osx_image: xcode9.3beta
8+
osx_image: xcode9.3
99

1010
env:
1111
- RUNTIME="iOS 9.0" DEVICE="iPhone 4s"

Authenticator/Source/RootViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ private func compose<A, B, C>(_ transform: @escaping (A) -> B, _ handler: @escap
194194
}
195195

196196
extension RootViewController: UINavigationControllerDelegate {
197-
public func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
197+
func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
198198
if case .info(_, .some) = currentViewModel.modal,
199199
viewController is InfoListViewController {
200200
// If the view model modal state has an Info.ViewModel and the just-shown view controller is an info list,

Gemfile.lock

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,28 @@ GEM
1313
highline (~> 1.7.2)
1414
declarative (0.0.10)
1515
declarative-option (0.1.0)
16-
domain_name (0.5.20170404)
16+
domain_name (0.5.20180417)
1717
unf (>= 0.0.5, < 1.0.0)
18-
dotenv (2.2.1)
18+
dotenv (2.3.0)
19+
emoji_regex (0.1.1)
1920
excon (0.62.0)
20-
faraday (0.14.0)
21+
faraday (0.15.0)
2122
multipart-post (>= 1.2, < 3)
2223
faraday-cookie_jar (0.0.6)
2324
faraday (>= 0.7.4)
2425
http-cookie (~> 1.0.0)
2526
faraday_middleware (0.12.2)
2627
faraday (>= 0.7.4, < 1.0)
2728
fastimage (2.1.1)
28-
fastlane (2.89.0)
29+
fastlane (2.93.0)
2930
CFPropertyList (>= 2.3, < 4.0.0)
3031
addressable (>= 2.3, < 3.0.0)
3132
babosa (>= 1.0.2, < 2.0.0)
3233
bundler (>= 1.12.0, < 2.0.0)
3334
colored
3435
commander-fastlane (>= 4.4.6, < 5.0.0)
3536
dotenv (>= 2.1.1, < 3.0.0)
37+
emoji_regex (~> 0.1)
3638
excon (>= 0.45.0, < 1.0.0)
3739
faraday (~> 0.9)
3840
faraday-cookie_jar (~> 0.0.6)
@@ -112,7 +114,7 @@ GEM
112114
faraday (~> 0.9)
113115
jwt (>= 1.5, < 3.0)
114116
multi_json (~> 1.10)
115-
simctl (1.6.3)
117+
simctl (1.6.4)
116118
CFPropertyList
117119
naturally
118120
slack-notifier (2.3.2)
@@ -127,7 +129,7 @@ GEM
127129
unf (0.1.4)
128130
unf_ext
129131
unf_ext (0.0.7.5)
130-
unicode-display_width (1.3.0)
132+
unicode-display_width (1.3.2)
131133
word_wrap (1.0.0)
132134
xcodeproj (1.5.7)
133135
CFPropertyList (>= 2.3.3, < 4.0)

0 commit comments

Comments
 (0)