Skip to content

Commit 23e9332

Browse files
authored
Merge pull request #296 from mattrubin/tools
Update Tools
2 parents 6b007fe + 09d6dd8 commit 23e9332

File tree

7 files changed

+62
-19
lines changed

7 files changed

+62
-19
lines changed

.gitignore

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
#
33
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
44

5+
# Installed Ruby gems
6+
/.bundle
7+
58
## Build generated
69
build/
710
DerivedData/
@@ -19,7 +22,7 @@ xcuserdata/
1922

2023
## Other
2124
*.moved-aside
22-
*.xcuserstate
25+
*.xccheckout
2326
*.xcscmblueprint
2427

2528
## Obj-C/Swift specific
@@ -36,6 +39,8 @@ playground.xcworkspace
3639
#
3740
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
3841
# Packages/
42+
# Package.pins
43+
# Package.resolved
3944
.build/
4045

4146
# CocoaPods
@@ -45,6 +50,9 @@ playground.xcworkspace
4550
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
4651
#
4752
# Pods/
53+
#
54+
# Add this line if you want to avoid checking in source code from the Xcode workspace
55+
# *.xcworkspace
4856

4957
# Carthage
5058
#
@@ -58,10 +66,16 @@ Carthage/Build
5866
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
5967
# screenshots whenever they are needed.
6068
# For more information about the recommended setup visit:
61-
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
69+
# https://docs.fastlane.tools/best-practices/source-control/#source-control
6270

6371
fastlane/report.xml
6472
fastlane/Preview.html
65-
# fastlane/screenshots
6673
fastlane/screenshots/screenshots.html
6774
fastlane/test_output
75+
76+
# Code Injection
77+
#
78+
# After new code Injection tools there's a generated folder /iOSInjectionProject
79+
# https://github.com/johnno1962/injectionforxcode
80+
81+
iOSInjectionProject/

.swiftlint.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
# Configuration for SwiftLint (https://github.com/realm/SwiftLint)
22

33
excluded:
4+
- .bundle
45
- Carthage
56
- fastlane
7+
68
opt_in_rules:
79
- array_init
810
- attributes
911
- closure_end_indentation
1012
- closure_spacing
13+
- collection_alignment
1114
- conditional_returns_on_newline
1215
- contains_over_first_not_nil
1316
- convenience_type
@@ -27,11 +30,13 @@ opt_in_rules:
2730
- implicit_return
2831
- implicitly_unwrapped_optional
2932
- joined_default_parameter
33+
- legacy_random
3034
- let_var_whitespace
3135
- literal_expression_end_indentation
3236
- lower_acl_than_parent
3337
- modifier_order
3438
- multiline_function_chains
39+
- multiline_literal_brackets
3540
- operator_usage_whitespace
3641
- overridden_super_call
3742
- override_in_extension
@@ -43,11 +48,16 @@ opt_in_rules:
4348
- redundant_type_annotation
4449
- single_test_class
4550
- sorted_first_last
51+
- static_operator
4652
- switch_case_on_newline
53+
- toggle_bool
4754
- unavailable_function
4855
- untyped_error_in_catch
56+
- unused_import
57+
- unused_private_declaration
4958
- vertical_parameter_alignment_on_call
5059
- yoda_condition
60+
5161
disabled_rules:
5262
- identifier_name
5363
- line_length
@@ -59,6 +69,14 @@ cyclomatic_complexity:
5969
function_body_length:
6070
warning: 50
6171

72+
line_length:
73+
ignores_function_declarations: true
74+
ignores_interpolated_strings: true
75+
76+
nesting:
77+
type_level:
78+
warning: 2
79+
6280
trailing_comma:
6381
mandatory_comma: true
6482

Cartfile.private

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Configuration for Carthage (https://github.com/Carthage/Carthage)
22

33
github "jspahrsummers/xcconfigs"
4-
github "shinydevelopment/SimulatorStatusMagic" "head"
4+
github "shinydevelopment/SimulatorStatusMagic"

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ github "SVProgressHUD/SVProgressHUD" "2.2.5"
22
github "jspahrsummers/xcconfigs" "0.12"
33
github "mattrubin/Base32" "xcode9"
44
github "mattrubin/OneTimePassword" "3.1.4"
5-
github "shinydevelopment/SimulatorStatusMagic" "84099c5fbdb340d744d467b955642ebd9f2b41da"
5+
github "shinydevelopment/SimulatorStatusMagic" "2.3.2"

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source "https://rubygems.org"
22

3-
gem "fastlane", "~> 2.105"
3+
gem "fastlane", "~> 2.112"

Gemfile.lock

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,21 @@ GEM
1313
highline (~> 1.7.2)
1414
declarative (0.0.10)
1515
declarative-option (0.1.0)
16+
digest-crc (0.4.1)
1617
domain_name (0.5.20180417)
1718
unf (>= 0.0.5, < 1.0.0)
1819
dotenv (2.5.0)
1920
emoji_regex (0.1.1)
2021
excon (0.62.0)
21-
faraday (0.15.3)
22+
faraday (0.15.4)
2223
multipart-post (>= 1.2, < 3)
2324
faraday-cookie_jar (0.0.6)
2425
faraday (>= 0.7.4)
2526
http-cookie (~> 1.0.0)
2627
faraday_middleware (0.12.2)
2728
faraday (>= 0.7.4, < 1.0)
28-
fastimage (2.1.4)
29-
fastlane (2.105.2)
29+
fastimage (2.1.5)
30+
fastlane (2.112.0)
3031
CFPropertyList (>= 2.3, < 4.0.0)
3132
addressable (>= 2.3, < 3.0.0)
3233
babosa (>= 1.0.2, < 2.0.0)
@@ -42,6 +43,7 @@ GEM
4243
fastimage (>= 2.1.0, < 3.0.0)
4344
gh_inspector (>= 1.1.2, < 2.0.0)
4445
google-api-client (>= 0.21.2, < 0.24.0)
46+
google-cloud-storage (>= 1.15.0, < 2.0.0)
4547
highline (>= 1.7.2, < 2.0.0)
4648
json (< 3.0.0)
4749
mini_magick (~> 4.5.1)
@@ -71,10 +73,19 @@ GEM
7173
representable (~> 3.0)
7274
retriable (>= 2.0, < 4.0)
7375
signet (~> 0.9)
74-
googleauth (0.6.6)
76+
google-cloud-core (1.2.7)
77+
google-cloud-env (~> 1.0)
78+
google-cloud-env (1.0.5)
79+
faraday (~> 0.11)
80+
google-cloud-storage (1.15.0)
81+
digest-crc (~> 0.4)
82+
google-api-client (~> 0.23)
83+
google-cloud-core (~> 1.2)
84+
googleauth (~> 0.6.2)
85+
googleauth (0.6.7)
7586
faraday (~> 0.12)
7687
jwt (>= 1.4, < 3.0)
77-
memoist (~> 0.12)
88+
memoist (~> 0.16)
7889
multi_json (~> 1.11)
7990
os (>= 0.9, < 2.0)
8091
signet (~> 0.7)
@@ -95,7 +106,7 @@ GEM
95106
nanaimo (0.2.6)
96107
naturally (2.2.0)
97108
os (1.0.0)
98-
plist (3.4.0)
109+
plist (3.5.0)
99110
public_suffix (2.0.5)
100111
representable (3.0.4)
101112
declarative (< 0.1.0)
@@ -105,7 +116,7 @@ GEM
105116
rouge (2.0.7)
106117
rubyzip (1.2.2)
107118
security (0.1.3)
108-
signet (0.10.0)
119+
signet (0.11.0)
109120
addressable (~> 2.3)
110121
faraday (~> 0.9)
111122
jwt (>= 1.5, < 3.0)
@@ -119,15 +130,15 @@ GEM
119130
unicode-display_width (~> 1.1, >= 1.1.1)
120131
tty-cursor (0.6.0)
121132
tty-screen (0.6.5)
122-
tty-spinner (0.8.0)
123-
tty-cursor (>= 0.5.0)
133+
tty-spinner (0.9.0)
134+
tty-cursor (~> 0.6.0)
124135
uber (0.1.0)
125136
unf (0.1.4)
126137
unf_ext
127138
unf_ext (0.0.7.5)
128-
unicode-display_width (1.4.0)
139+
unicode-display_width (1.4.1)
129140
word_wrap (1.0.0)
130-
xcodeproj (1.6.0)
141+
xcodeproj (1.7.0)
131142
CFPropertyList (>= 2.3.3, < 4.0)
132143
atomos (~> 0.1.3)
133144
claide (>= 1.0.2, < 2.0)
@@ -142,7 +153,7 @@ PLATFORMS
142153
ruby
143154

144155
DEPENDENCIES
145-
fastlane (~> 2.105)
156+
fastlane (~> 2.112)
146157

147158
BUNDLED WITH
148159
1.16.4

0 commit comments

Comments
 (0)