⬆️ :: Update dev dependencies

This commit is contained in:
Felix Mau
2020-05-08 14:33:47 +02:00
parent 9724fa79a2
commit 89fce609bb
5 changed files with 90 additions and 59 deletions
+60 -31
View File
@@ -9,16 +9,32 @@ GEM
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.1)
algoliasearch (1.27.2)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
aws-eventstream (1.1.0)
aws-partitions (1.311.0)
aws-sdk-core (3.95.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.31.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.64.0)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.3)
aws-eventstream (~> 1.0, >= 1.0.2)
babosa (1.0.3)
claide (1.0.3)
cocoapods (1.8.4)
cocoapods (1.9.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.8.4)
cocoapods-core (= 1.9.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -33,37 +49,41 @@ GEM
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.11.1, < 2.0)
cocoapods-core (1.8.4)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.1)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.3.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.4.1)
cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
cocoapods-try (1.2.0)
colored (1.2)
colored2 (3.1.2)
commander-fastlane (4.4.6)
highline (~> 1.7.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
declarative (0.0.10)
declarative-option (0.1.0)
digest-crc (0.4.1)
digest-crc (0.5.1)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.5)
emoji_regex (1.0.1)
escape (0.0.4)
excon (0.72.0)
ethon (0.12.0)
ffi (>= 1.3.0)
excon (0.73.0)
faraday (0.17.3)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
@@ -72,9 +92,10 @@ GEM
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.7)
fastlane (2.141.0)
fastlane (2.146.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
@@ -109,41 +130,46 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-swiftformat (0.1.0)
ffi (1.12.2)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
google-api-client (0.32.1)
google-api-client (0.36.4)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.5, < 0.10.0)
googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.10)
google-cloud-core (1.3.2)
signet (~> 0.12)
google-cloud-core (1.5.0)
google-cloud-env (~> 1.0)
google-cloud-env (1.2.1)
faraday (~> 0.11)
google-cloud-storage (1.21.1)
google-cloud-errors (~> 1.0)
google-cloud-env (1.3.1)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.0.0)
google-cloud-storage (1.26.1)
addressable (~> 2.5)
digest-crc (~> 0.4)
google-api-client (~> 0.26)
google-api-client (~> 0.33)
google-cloud-core (~> 1.2)
googleauth (>= 0.6.2, < 0.10.0)
googleauth (~> 0.9)
mini_mime (~> 1.0)
googleauth (0.9.0)
faraday (~> 0.12)
googleauth (0.12.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
signet (~> 0.14)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jmespath (1.4.0)
json (2.3.0)
jwt (2.1.0)
memoist (0.16.2)
@@ -158,7 +184,7 @@ GEM
nap (1.1.0)
naturally (2.2.0)
netrc (0.11.0)
os (1.0.1)
os (1.1.0)
plist (3.5.0)
public_suffix (2.0.5)
representable (3.0.4)
@@ -170,9 +196,9 @@ GEM
ruby-macho (1.4.0)
rubyzip (1.3.0)
security (0.1.3)
signet (0.11.0)
signet (0.14.0)
addressable (~> 2.3)
faraday (~> 0.9)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.8)
@@ -187,15 +213,17 @@ GEM
tty-screen (0.7.1)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
tzinfo (1.2.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unicode-display_width (1.6.1)
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
word_wrap (1.0.0)
xcodeproj (1.15.0)
xcodeproj (1.16.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
@@ -212,6 +240,7 @@ PLATFORMS
DEPENDENCIES
cocoapods
fastlane
fastlane-plugin-swiftformat
BUNDLED WITH
2.0.2
2.1.4
+2 -2
View File
@@ -3,7 +3,7 @@ PODS:
- LightweightObservable (~> 2.1)
- LightweightObservable (2.1.1)
- SnapshotTesting (1.7.2)
- SwiftFormat/CLI (0.44.7)
- SwiftFormat/CLI (0.44.9)
- SwiftLint (0.39.2)
DEPENDENCIES:
@@ -27,7 +27,7 @@ SPEC CHECKSUMS:
GradientLoadingBar: 47e099d0c0b0ed00b358d07dafc399fad50506b7
LightweightObservable: 52abe2a01c8273921b1f66cd66526eb3328ca35a
SnapshotTesting: 8caa6661fea7c8019d5b46de77c16bab99c36c5c
SwiftFormat: fd97e27b8de5a46c9d1988bf1db1dc92e79f86a3
SwiftFormat: e415b539c50e7a956a44b023544c9846c0c037d7
SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447
PODFILE CHECKSUM: f56a08d884831d712155be32578b7364270d0af0
+2 -2
View File
@@ -3,7 +3,7 @@ PODS:
- LightweightObservable (~> 2.1)
- LightweightObservable (2.1.1)
- SnapshotTesting (1.7.2)
- SwiftFormat/CLI (0.44.7)
- SwiftFormat/CLI (0.44.9)
- SwiftLint (0.39.2)
DEPENDENCIES:
@@ -27,7 +27,7 @@ SPEC CHECKSUMS:
GradientLoadingBar: 47e099d0c0b0ed00b358d07dafc399fad50506b7
LightweightObservable: 52abe2a01c8273921b1f66cd66526eb3328ca35a
SnapshotTesting: 8caa6661fea7c8019d5b46de77c16bab99c36c5c
SwiftFormat: fd97e27b8de5a46c9d1988bf1db1dc92e79f86a3
SwiftFormat: e415b539c50e7a956a44b023544c9846c0c037d7
SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447
PODFILE CHECKSUM: f56a08d884831d712155be32578b7364270d0af0
Binary file not shown.
+26 -24
View File
@@ -36,7 +36,7 @@ Table of Contents
What is this?
----------------
SwiftFormat is a code library and command-line tool for reformatting swift code on macOS or Linux.
SwiftFormat is a code library and command-line tool for reformatting Swift code on macOS or Linux.
SwiftFormat goes above and beyond what you might expect from a code formatter. In addition to adjusting white space it can insert or remove implicit `self`, remove redundant parentheses, and correct many other deviations from the standard Swift idioms.
@@ -85,7 +85,7 @@ Alternatively, you can install the tool on macOS or Linux by using [Mint](https:
```bash
$ mint install nicklockwood/SwiftFormat
```
And then run it using:
```bash
@@ -121,7 +121,7 @@ If you followed the installation instructions above, you can now just type
```bash
$ swiftformat .
```
(that's a space and then a period after the command) in the terminal to format any Swift files in the current directory. In place of the `.`, you can instead type an absolute or relative path to the file or directory that you want to format.
**WARNING:** `swiftformat .` will overwrite any Swift files it finds in the current directory, and any subfolders therein. If you run it in your home directory, it will probably reformat every Swift file on your hard drive.
@@ -139,7 +139,7 @@ To use it safely, do the following:
4. In Terminal, type `swiftformat "/path/to/your/code/"`. The same rules apply as above with respect to paths, and multiple space-delimited paths are allowed.
If you used `--inferoptions` to generate a suggested set of options in step 3, you should copy and paste them into the command, either before or after the path(s) to your source files.
If you have created a [config file](#config-file), you can specify its path using `--config "/path/to/your/config-file/"`. Alternatively, if you name the file `.swiftformat` and place it inside the project you are formatting, it will be picked up automatically.
5. Press enter to begin formatting. Once the formatting is complete, use your source control system to check the changes, and verify that no undesirable changes have been introduced. If they have, revert the changes, tweak the options and try again.
@@ -155,7 +155,7 @@ If you prefer, you can use unix pipes to include SwiftFormat as part of a comman
```bash
$ cat /path/to/file.swift | swiftformat --output /path/to/file.swift
```
Omitting the `--output /path/to/file.swift` will print the formatted file to Standard Output (stdout). You can also use `>` to specify the output path as follows:
```bash
@@ -196,7 +196,7 @@ Alternatively, if you prefer not to use Homebrew, you'll find the latest version
Once you have launched the app and restarted Xcode, you'll find a SwiftFormat option under Xcode's Editor menu.
You can configure the formatting [rules](#rules) and [options](#options) using the SwiftFormat for Xcode host application. There is currently no way to override these per-project, however you can import and export different configurations using the File menu. You will need to do this again each time you switch projects.
You can configure the formatting [rules](#rules) and [options](#options) using the SwiftFormat for Xcode host application. There is currently no way to override these per-project, however, you can import and export different configurations using the File menu. You will need to do this again each time you switch projects.
The format of the configuration file is described in the [Config section](#config-file) below.
@@ -237,13 +237,14 @@ let package = Package(
1. Click on your project in the file list, choose your target under `TARGETS`, click the `Build Phases` tab
2. Add a `New Run Script Phase` by clicking the little plus icon in the top left
3. Drag the new `Run Script` phase **above** the `Compile Sources` phase, expand it and paste the following script:
```bash
cd BuildTools
SDKROOT=macosx
#swift package update #Uncomment this line temporarily to update the version used to the latest matching your BuildTools/Package.swift file
swift run -c release swiftformat "$SRCROOT"
```
3. Drag the new `Run Script` phase **above** the `Compile Sources` phase, expand it and paste the following script:
```bash
cd BuildTools
SDKROOT=macosx
#swift package update #Uncomment this line temporarily to update the version used to the latest matching your BuildTools/Package.swift file
swift run -c release swiftformat "$SRCROOT"
```
You can also use `swift run -c release --package-path BuildTools swiftformat "$SRCROOT"` if you need a more complex script and `cd BuildTools` breaks stuff.
@@ -265,7 +266,8 @@ You can also use `swift run -c release --package-path BuildTools swiftformat "$S
1. Click on your project in the file list, choose your target under `TARGETS`, click the `Build Phases` tab
2. Add a `New Run Script Phase` by clicking the little plus icon in the top left
3. Drag the new `Run Script` phase **above** the `Compile Sources` phase, expand it and paste the following script:
3. Drag the new `Run Script` phase **above** the `Compile Sources` phase, expand it and paste the following script:
```bash
"${PODS_ROOT}/SwiftFormat/CommandLineTool/swiftformat" "$SRCROOT"
```
@@ -346,7 +348,7 @@ To setup SwiftFormat to be used by your continuous integration system using [Dan
swiftformat.additional_args = "--indent tab --self insert" # optional
swiftformat.check_format(fail_on_error: true)
```
**NOTE:** It is recommended to add the `swiftformat` binary to your project directory to ensure the same version is used each time (see the [Xcode build phase](#xcode-build-phase) instructions above).
Configuration
@@ -471,7 +473,7 @@ This allows you to override certain rules or formatting options just for a parti
The `--exclude` option takes a comma-delimited list of file or directory paths to exclude from formatting. Excluded paths are relative to the config file containing the `--exclude` command. The excluded paths can include wildcards, specified using Unix "Glob" syntax, as [documented below](#globs).
Config files named ".swiftformat" will be processed automatically, however you can select an additional configuration file to use for formatting using the `--config "path/to/config/file"` command-line argument. A configuration file selected using `--config` does not need to be named ".swiftformat", and can be located outside of the project directory.
Config files named ".swiftformat" will be processed automatically, however, you can select an additional configuration file to use for formatting using the `--config "path/to/config/file"` command-line argument. A configuration file selected using `--config` does not need to be named ".swiftformat", and can be located outside of the project directory.
The config file format is designed to be edited by hand. You may include blank lines for readability, and can also add comments using a hash prefix (#), e.g.
@@ -512,18 +514,18 @@ SwiftFormat's glob syntax is based on Ruby's implementation, which varies slight
* `[a-z]` - Matches a single character in the specified range in the brackets.
* `{foo,bar}` - Matches any one of the comma-delimited strings inside the braces.
Examples:
* `foo.swift` - Matches the file "foo.swift" in the same directory as the config file.
* `*.swift` - Matches any swift file in the same directory as the config file.
* `*.swift` - Matches any Swift file in the same directory as the config file.
* `foo/bar.swift` - Matches the file "bar.swift" in the directory "foo".
* `**/foo.swift` - Matches any file named "foo.swift" in the project.
* `**/*.swift` - Matches any swift file in the project.
* `**/*.swift` - Matches any Swift file in the project.
* `**/Generated` - Matches any folder called `Generated` in the project.
@@ -543,7 +545,7 @@ In order to run SwiftFormat as a linter, you can use the `--lint` command-line o
$ swiftformat --lint path/to/project
```
This runs the same rules as format mode, and all the same configuration options apply, however no files will be modified. Instead, SwiftFormat will format each file in memory and then compare the result against the input and report the lines that required changes.
This runs the same rules as format mode, and all the same configuration options apply, however, no files will be modified. Instead, SwiftFormat will format each file in memory and then compare the result against the input and report the lines that required changes.
The `--lint` option is similar to `--dryrun`, but `--lint` returns warnings for every line that required changes, and will return a nonzero error code if any changes are detected, which is useful if you want it to fail a build step on your CI server.
@@ -664,7 +666,7 @@ Q. I don't want to be surprised by new rules added when I upgrade SwiftFormat. H
*Q. Why can't I set the indent width or choose between tabs/spaces in the [SwiftFormat for Xcode](#xcode-source-editor-extension) options?*
> Indent width and tabs/spaces can be configured in Xcode on a per project-basis. You'll find the option under "Text Settings" in the right-hand sidebar.
> Indent width and tabs/spaces can be configured in Xcode on a per project-basis. You'll find the option under "Text Settings" in the Files inspector of the right-hand sidebar.
*Q. After applying SwiftFormat, my code won't compile. Is that a bug?*
@@ -689,7 +691,7 @@ Known issues
* When using the `--self remove` option, the `redundantSelf` rule will remove references to `self` in autoclosure arguments, which may change the meaning of the code, or cause it not to compile. To work around this issue, use the `--selfrequired` option to provide a comma-delimited list of methods to be excluded from the rule. The `expect()` function from the popular [Nimble](https://github.com/Quick/Nimble) unit testing framework is already excluded by default. If you are using the `--self insert` option then this is not an issue.
* If you assign `SomeClass.self` to a variable and then instantiate an instance of the class using that variable, Swift requires that you use an explicit `.init()`, however the `redundantInit` rule is not currently capable of detecting this situation and will remove the `.init`. To work around this issue, use the `// swiftformat:disable:next redundantInit` comment directive to disable the rule for any affected lines of code (or just disable the `redundantInit` rule completely).
* If you assign `SomeClass.self` to a variable and then instantiate an instance of the class using that variable, Swift requires that you use an explicit `.init()`, however, the `redundantInit` rule is not currently capable of detecting this situation and will remove the `.init`. To work around this issue, use the `// swiftformat:disable:next redundantInit` comment directive to disable the rule for any affected lines of code (or just disable the `redundantInit` rule completely).
* The `--self insert` option can only recognize locally declared member variables, not ones inherited from superclasses or extensions in other files, so it cannot insert missing `self` references for those. Note that the reverse is not true: `--self remove` should remove *all* redundant `self` references.
@@ -698,11 +700,11 @@ Known issues
* The `isEmpty` rule will convert `count == 0` to `isEmpty` even for types that do not have an `isEmpty` method, such as `NSArray`/`NSDictionary`/etc. Use of Foundation collections in Swift code is pretty rare, but just in case, the rule is disabled by default.
* If a file begins with a comment, the `stripHeaders` rule will remove it if it is followed by a blank line. To avoid this, make sure that the first comment is directly followed by a line of code.
* The formatted file cache is based on a hash of the file contents, so it's possible (though unlikely) that an edited file will have the exact same hash as the previously formatted version, causing SwiftFormat to incorrectly identify it as not having changed, and fail to update it.
To fix this, you can use the command-line option `--cache ignore` to force SwiftFormat to ignore the cache for this run, or just type an extra space in the file (which SwiftFormat will then remove again when it applies the correct formatting).
* When running on Linux, the `--symlinks` option has no effect, and some of the `fileHeader` placeholders are not supported.