diff --git a/.swift-version b/.swift-version index 389f7740..8012ebbb 100755 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 \ No newline at end of file +4.2 \ No newline at end of file diff --git a/.swiftformat b/.swiftformat index fcfadc78..e96e258e 100644 --- a/.swiftformat +++ b/.swiftformat @@ -22,6 +22,7 @@ --indentcase false --importgrouping testable-bottom --linebreaks lf +--maxwidth none --octalgrouping 4,8 --operatorfunc spaced --patternlet hoist diff --git a/.travis.yml b/.travis.yml index 23a3ffce..33e47101 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,22 @@ -language: swift -osx_image: xcode10.1 - env: - - LC_CTYPE=en_US.UTF-8 LANG=en_US.UTF-8 -before_install: - - rvm install ruby-2.4.2 -install: - - bundle install --without=documentation -script: - - set -o pipefail - - xcodebuild -project SwiftFormat.xcodeproj -scheme "SwiftFormat (Framework)" -sdk macosx clean build test | bundle exec xcpretty -after_success: bundle exec slather + global: + - LC_CTYPE=en_US.UTF-8 +matrix: + include: + - os: osx + language: swift + osx_image: xcode10.1 + before_install: + - rvm install ruby-2.4.2 + install: + - bundle install --without=documentation + script: + - set -o pipefail + - xcodebuild -project SwiftFormat.xcodeproj -scheme "SwiftFormat (Framework)" -sdk macosx clean build test | bundle exec xcpretty + after_success: bundle exec slather + - os: linux + language: generic + sudo: required + dist: trusty + install: eval "$(curl -sL https://swiftenv.fuller.li/install.sh)" + script: swift test diff --git a/CHANGELOG.md b/CHANGELOG.md index b3f9b329..4148710d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## [0.41.0](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.41.0) (2019-11-23) + +- The `wrapArguments` rule can now automatically wrap functions and collections to `--maxwidth` +- Added `—maxwidth` option to specify the width at which code should wrap (currently only used by `wrapArguments` rule) +- Added `—tabwidth` option to help with code indenting and wrapping when using tabs for indent +- Fixed indenting of code wrapped after the `in` in a `for...in` loop +- Fixed indenting of code wrapped before the `is` in an expression +- Added version check for `redundantBackticks` rule to support fixes in Swift 5 +- Fixed error when parsing escaped triple-quote in a multiline string +- Fixed bug where a multiline comments before an opening brace could result in corrupted output +- CLI will now fail if .swiftformat file contains an invalid option, instead of ignoring it +- Added support for formatting Swift package manifest files using Xcode Extension + ## [0.40.14](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.40.14) (2019-10-28) - The `redundantReturn` rule no longer incorrectly removes `return` inside `catch let` statements diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat index 0eaaefea..9cd24701 100755 Binary files a/CommandLineTool/swiftformat and b/CommandLineTool/swiftformat differ diff --git a/EditorExtension/Application/Info.plist b/EditorExtension/Application/Info.plist index cce373c4..6a50c961 100644 --- a/EditorExtension/Application/Info.plist +++ b/EditorExtension/Application/Info.plist @@ -32,7 +32,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.40.14 + 0.41.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) LSMinimumSystemVersion diff --git a/EditorExtension/Application/Source/RulesViewController.swift b/EditorExtension/Application/Source/RulesViewController.swift index ddcf21c6..58be4928 100644 --- a/EditorExtension/Application/Source/RulesViewController.swift +++ b/EditorExtension/Application/Source/RulesViewController.swift @@ -91,8 +91,7 @@ final class RulesViewController: NSViewController { .compactMap { optionName in optionsByName[optionName] } .sorted { $0.descriptor.displayName < $1.descriptor.displayName } .compactMap { option -> UserSelectionType? in - guard !option.isDeprecated, - option.descriptor.argumentName != FormatOptions.Descriptor.indentation.argumentName else { + guard !option.isDeprecated else { return nil } let descriptor = option.descriptor diff --git a/EditorExtension/Extension/Info.plist b/EditorExtension/Extension/Info.plist index 4289ad6a..2bf66b58 100644 --- a/EditorExtension/Extension/Info.plist +++ b/EditorExtension/Extension/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.40.14 + 0.41.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) LSMinimumSystemVersion diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib deleted file mode 100755 index 6a489221..00000000 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib and /dev/null differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib index d8f52c13..16fe5166 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.dylib deleted file mode 100755 index af1a9bd1..00000000 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.dylib and /dev/null differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib index d6f5028b..f63f51a6 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib index 6d827c83..950fc939 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.dylib deleted file mode 100755 index c940ac0e..00000000 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.dylib and /dev/null differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib index be169193..cae4f406 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib index bc64eb03..c4906720 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib index 3f0212e3..7d4de0fa 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib index d3db299b..8859fec6 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftMetal.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftMetal.dylib deleted file mode 100755 index 9b77471f..00000000 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftMetal.dylib and /dev/null differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib index ac4e393e..1ef67567 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib deleted file mode 100755 index 6c0b2160..00000000 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib and /dev/null differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib deleted file mode 100755 index b45fc2cc..00000000 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib and /dev/null differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftos.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftos.dylib deleted file mode 100755 index 13bc9b48..00000000 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftos.dylib and /dev/null differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist index 03e561d9..22349d99 100644 --- a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist +++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist @@ -32,7 +32,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.40.14 + 0.41.0 CFBundleSupportedPlatforms MacOSX @@ -42,17 +42,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 11A1027 + 11B500 DTPlatformVersion GM DTSDKBuild - 19A547 + 19B89 DTSDKName macosx10.15 DTXcode - 1110 + 1120 DTXcodeBuild - 11A1027 + 11B500 LSMinimumSystemVersion 10.11 NSHumanReadableCopyright diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode b/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode index 36f57b48..f89611d8 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode and b/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist index 4c447f3c..05ab3a57 100644 --- a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist +++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.40.14 + 0.41.0 CFBundleSupportedPlatforms MacOSX @@ -27,17 +27,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 11A1027 + 11B500 DTPlatformVersion GM DTSDKBuild - 19A547 + 19B89 DTSDKName macosx10.15 DTXcode - 1110 + 1120 DTXcodeBuild - 11A1027 + 11B500 LSMinimumSystemVersion 10.11 NSExtension diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat index dd3acc0b..8ede3a2f 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat and b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib index a0ede084..8758257a 100644 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist index 3cda01a4..7b82ea5f 100644 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib index 67c04353..744518b1 100644 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib index 1f4c88b0..a659a886 100644 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib index 43772502..e509afe5 100644 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib index 6ab0a0de..0c7d9332 100644 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/libswiftRemoteMirror.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/libswiftRemoteMirror.dylib deleted file mode 100755 index ee16b17a..00000000 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/libswiftRemoteMirror.dylib and /dev/null differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources b/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources index 73f5cdbc..820a58e9 100644 --- a/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources +++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources @@ -6,48 +6,35 @@ Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib - gmp47iqO53PvL9GveZ9qJdgVjmA= + cR2SAXd1ZcZuUHyErWPvvPOh3V8= Resources/Base.lproj/Main.storyboardc/Info.plist - o9E+w3O9pCQMVOZmDS/w0waUC6Q= + beK5KT2eskEP2d4Y8DHDdlIAwcc= Resources/Base.lproj/Main.storyboardc/MainMenu.nib - IU4KiI1wtvt06pyGQK+W5nPfy/k= + /8WLfd+Q0ZBWV5qVUBD2h1+j0VE= Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib - DtNeN+ltNvit1GULwN+6MWNl9kc= + budYzojNt2aS14K+gYS/GsGu4i4= Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib - FGeDucVv3O8btwoeogu/3PSMU5I= + TVkb1lN223uQCkJFbwdbF/NAses= Resources/Base.lproj/Main.storyboardc/RulesViewController.nib - sr0oJRZdkQ2+prrScp6huu8huPc= + sUuTsUiBpVAtn2dbOX9yT35wryY= Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib Fpuyfh9zwfm9IaqhlADoThv3beY= - Resources/libswiftRemoteMirror.dylib - - 1uY4m6NnbbFKv6vB+SsQ6AwcFEU= - files2 - Frameworks/libswiftAppKit.dylib - - cdhash - - UwGlV6bygBO1sYT1w7ElBdCY6m4= - - requirement - identifier "com.apple.dt.runtime.swiftAppKit" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "8VQKF583ED" - Frameworks/libswiftCore.dylib cdhash @@ -57,15 +44,6 @@ requirement identifier "com.apple.dt.runtime.swiftCore" and anchor apple generic and certificate leaf[subject.CN] = "Mac Developer: Nick Lockwood (XDQ4XJZXHD)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */ - Frameworks/libswiftCoreData.dylib - - cdhash - - M+J8I54X1UdPuKRlMqWbq70hHms= - - requirement - identifier "com.apple.dt.runtime.swiftCoreData" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "8VQKF583ED" - Frameworks/libswiftCoreFoundation.dylib cdhash @@ -84,15 +62,6 @@ requirement identifier "com.apple.dt.runtime.swiftCoreGraphics" and anchor apple generic and certificate leaf[subject.CN] = "Mac Developer: Nick Lockwood (XDQ4XJZXHD)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */ - Frameworks/libswiftCoreImage.dylib - - cdhash - - UuFrSagjmTdVYVkLqeOBwOx7jtg= - - requirement - identifier "com.apple.dt.runtime.swiftCoreImage" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "8VQKF583ED" - Frameworks/libswiftDarwin.dylib cdhash @@ -129,15 +98,6 @@ requirement identifier "com.apple.dt.runtime.swiftIOKit" and anchor apple generic and certificate leaf[subject.CN] = "Mac Developer: Nick Lockwood (XDQ4XJZXHD)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */ - Frameworks/libswiftMetal.dylib - - cdhash - - FnA0fIJThH7dm37ZVBgzMVCF4zM= - - requirement - identifier "com.apple.dt.runtime.swiftMetal" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "8VQKF583ED" - Frameworks/libswiftObjectiveC.dylib cdhash @@ -147,38 +107,11 @@ requirement identifier "com.apple.dt.runtime.swiftObjectiveC" and anchor apple generic and certificate leaf[subject.CN] = "Mac Developer: Nick Lockwood (XDQ4XJZXHD)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */ - Frameworks/libswiftQuartzCore.dylib - - cdhash - - qDed/s0aOXi9OXFw7lceTCZdSGU= - - requirement - identifier "com.apple.dt.runtime.swiftQuartzCore" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "8VQKF583ED" - - Frameworks/libswiftXPC.dylib - - cdhash - - 4Sw12mQ/vFcjZNDVL/h/WGeCYlk= - - requirement - identifier "com.apple.dt.runtime.swiftXPC" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "8VQKF583ED" - - Frameworks/libswiftos.dylib - - cdhash - - iJzo5i0LkGw6K/VPt8Pys29pS8Q= - - requirement - identifier "com.apple.dt.runtime.swiftos" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "8VQKF583ED" - PlugIns/SwiftFormat.appex cdhash - HdlSKLh0lfBavKb8kRUA5bimc7c= + eP0DtnkcJvT8+w+d37CIJGgTQUg= requirement identifier "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension" and anchor apple generic and certificate leaf[subject.CN] = "Mac Developer: Nick Lockwood (XDQ4XJZXHD)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */ @@ -187,66 +120,66 @@ hash - gmp47iqO53PvL9GveZ9qJdgVjmA= + cR2SAXd1ZcZuUHyErWPvvPOh3V8= hash2 - 3ghgbt/rW2OS4FiHE4S7+qR52F/HreRJOIK4Gb66Q2k= + /7UU+591nZL+pJeSiz7pZmE6whh3C4zs0NQpYDRjtLg= Resources/Base.lproj/Main.storyboardc/Info.plist hash - o9E+w3O9pCQMVOZmDS/w0waUC6Q= + beK5KT2eskEP2d4Y8DHDdlIAwcc= hash2 - M18T7ijrfnk4MrUMjdxUpnq5wOw1BDvKlG3w78m3fV4= + j5Cb/07kIL46Kl50zoLK1EFFTVcnoiGqZRxwaQq3qkQ= Resources/Base.lproj/Main.storyboardc/MainMenu.nib hash - IU4KiI1wtvt06pyGQK+W5nPfy/k= + /8WLfd+Q0ZBWV5qVUBD2h1+j0VE= hash2 - ChQfxUfiNfz+ZmMWpvyYZIIkYVPudNh9LObghgT3VY8= + UT8KbcZ/3W1ko/ACu2Rsspe103TgpUb7XoCN/bvq6tM= Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib hash - DtNeN+ltNvit1GULwN+6MWNl9kc= + budYzojNt2aS14K+gYS/GsGu4i4= hash2 - OJ1O0Xfjfzm1PihoP90d69CfX2z6xboZnIWGRB59ZIU= + L69cMjFWCQ3ZRH8H0sgnGXbmr8QCt0M+prPn6tzi3b0= Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib hash - FGeDucVv3O8btwoeogu/3PSMU5I= + TVkb1lN223uQCkJFbwdbF/NAses= hash2 - mL+dO/l08V5hhMOKEskN2gstfBxol35n56pIzVXUVF4= + d6ttxOYPb23JfxdNLmWJ19QWSO09xh7ELriEx8KaXIo= Resources/Base.lproj/Main.storyboardc/RulesViewController.nib hash - sr0oJRZdkQ2+prrScp6huu8huPc= + sUuTsUiBpVAtn2dbOX9yT35wryY= hash2 - oSbC2Zrji/kdo65qlJiPBDG+9KT5fJliyiFSV6RAsiY= + v9CbCu0zCGniy+2IIQfDXBeD0B3FGBg6tTJUcJHWvDs= Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib @@ -260,17 +193,6 @@ WZlJzEVKN27feqWkD1ZlvDcYU1YT3ekJb67zOGP6gek= - Resources/libswiftRemoteMirror.dylib - - hash - - 1uY4m6NnbbFKv6vB+SsQ6AwcFEU= - - hash2 - - IK6jHZcKpLIxX51C/uueWgjnaTU5qROHPMgc1kWBDro= - - rules diff --git a/Package.swift b/Package.swift index e4115305..e3c2a3bd 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.0 +// swift-tools-version:4.2 import PackageDescription let package = Package( diff --git a/Sources/Formatter.swift b/Sources/Formatter.swift index bd5b5f83..f848fecc 100644 --- a/Sources/Formatter.swift +++ b/Sources/Formatter.swift @@ -2,7 +2,7 @@ // Formatter.swift // SwiftFormat // -// Version 0.40.14 +// Version 0.41.0 // // Created by Nick Lockwood on 12/08/2016. // Copyright 2016 Nick Lockwood diff --git a/Sources/Info.plist b/Sources/Info.plist index 6c518832..78bbe511 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.40.14 + 0.41.0 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift index 688f293f..cfb6adc8 100644 --- a/Sources/SwiftFormat.swift +++ b/Sources/SwiftFormat.swift @@ -32,7 +32,7 @@ import Foundation /// The current SwiftFormat version -public let version = "0.40.14" +public let version = "0.41.0" /// The standard SwiftFormat config file name public let swiftFormatConfigurationFile = ".swiftformat" diff --git a/Sources/Tokenizer.swift b/Sources/Tokenizer.swift index 70bfe09d..cb1750cf 100644 --- a/Sources/Tokenizer.swift +++ b/Sources/Tokenizer.swift @@ -2,7 +2,7 @@ // Tokenizer.swift // SwiftFormat // -// Version 0.40.14 +// Version 0.41.0 // // Created by Nick Lockwood on 11/08/2016. // Copyright 2016 Nick Lockwood diff --git a/SwiftFormat.podspec.json b/SwiftFormat.podspec.json index bac39b3e..295ee1d9 100644 --- a/SwiftFormat.podspec.json +++ b/SwiftFormat.podspec.json @@ -1,6 +1,6 @@ { "name": "SwiftFormat", - "version": "0.40.14", + "version": "0.41.0", "license": { "type": "MIT", "file": "LICENSE.md" @@ -10,7 +10,7 @@ "authors": "Nick Lockwood", "source": { "git": "https://github.com/nicklockwood/SwiftFormat.git", - "tag": "0.40.14" + "tag": "0.41.0" }, "default_subspecs": "Core", "subspecs": [ @@ -31,7 +31,8 @@ "platforms": { "ios": "9.0", "tvos": "9.0", - "osx": "10.11" + "osx": "10.12" }, + "swift_versions": "4.2", "requires_arc": true } diff --git a/Tests/CommandLineTests.swift b/Tests/CommandLineTests.swift index c706ca89..35d2ee97 100644 --- a/Tests/CommandLineTests.swift +++ b/Tests/CommandLineTests.swift @@ -151,12 +151,7 @@ class CommandLineTests: XCTestCase { func testFormatting() { CLI.print = { _, _ in } - #if swift(>=4.1.5) - let args = ". --dryrun" - #else - let args = ". --dryrun --disable redundantSelf" // redundantSelf crashes Xcode 9.4 in debug mode - #endif - + let args = ". --dryrun --disable redundantSelf" XCTAssertEqual(CLI.run(in: projectDirectory.path, with: args), .ok) } diff --git a/Tests/Info.plist b/Tests/Info.plist index 7a8c790c..a32ca8e4 100644 --- a/Tests/Info.plist +++ b/Tests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.40.14 + 0.41.0 CFBundleSignature ???? CFBundleVersion