diff --git a/CHANGELOG.md b/CHANGELOG.md index 03c2a7e66..e66a6cf6b 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Change Log +## [0.33.8](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.33.8) (2018-06-25) + +- Fixed issue where `self` could be incorrectly inserted inside a `where` clause +- Fixed a bug where generics could be misidentified as greater-than / less-than operators +- Fixed formatting of `#if` blocks around case statements +- The `hoistPatternLet` rule no longer hoists the `let or `var` when there are no named variables +- Fixed nondeterministic behavior when applying spacing rules +- Fixed warning when compiling with Xcode 10 beta + ## [0.33.7](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.33.7) (2018-05-18) - Fixed an issue where headerdoc comments could be stripped by `fileHeader` rule diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat index 60890b702..e2d6550aa 100755 Binary files a/CommandLineTool/swiftformat and b/CommandLineTool/swiftformat differ diff --git a/EditorExtension/Application/Info.plist b/EditorExtension/Application/Info.plist index 0759c80a1..c0fc9f826 100644 --- a/EditorExtension/Application/Info.plist +++ b/EditorExtension/Application/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.33.7 + 0.33.8 CFBundleVersion $(CURRENT_PROJECT_VERSION) LSMinimumSystemVersion diff --git a/EditorExtension/Extension/Info.plist b/EditorExtension/Extension/Info.plist index 3305a30f0..87e5c95cd 100644 --- a/EditorExtension/Extension/Info.plist +++ b/EditorExtension/Extension/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.33.7 + 0.33.8 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 index 6921bf0fe..2892c8428 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib index 48562e3ee..ce59efd9e 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 index 39c7ad56d..8e73cb5ae 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib index 2c723cea3..6f6173da9 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 58e3b5d4f..3949607a9 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 index b9b38f3aa..0f6a26be9 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib index d84894a45..0058c4a17 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 9aea6c9af..287479397 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 ef35d0333..c00134323 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 14b9df472..33896b382 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 index a8048dcaa..234984801 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftMetal.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftMetal.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib index d1fead91d..3516807ec 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 index c27363fa7..5da6fd195 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib index 604d91886..b6dd39dcf 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftos.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftos.dylib index 062b3122a..10183a2f8 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftos.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftos.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist index 4cf17a1f5..bcdc66d8e 100644 --- a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist +++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 17E199 + 17F77 CFBundleDevelopmentRegion en CFBundleExecutable @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.33.6 + 0.33.8 CFBundleSupportedPlatforms MacOSX @@ -27,7 +27,7 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 9E145 + 9F2000 DTPlatformVersion GM DTSDKBuild @@ -35,9 +35,9 @@ DTSDKName macosx10.13 DTXcode - 0930 + 0941 DTXcodeBuild - 9E145 + 9F2000 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 900dbf4b0..65e661d8b 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 6916a8c10..621e37489 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 @@ -3,7 +3,7 @@ BuildMachineOSBuild - 17E199 + 17F77 CFBundleDevelopmentRegion en CFBundleExecutable @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.33.6 + 0.33.8 CFBundleSupportedPlatforms MacOSX @@ -27,7 +27,7 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 9E145 + 9F2000 DTPlatformVersion GM DTSDKBuild @@ -35,9 +35,9 @@ DTSDKName macosx10.13 DTXcode - 0930 + 0941 DTXcodeBuild - 9E145 + 9F2000 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 e015597e5..dabca8895 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 a25846751..c02f6fe7c 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 0b8d0d88c..8e64a7b25 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 fc6afe733..ad6f702a6 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 86fcd48ea..183c9cf41 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 6e95f298a..cf9498e02 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 083c293d1..910de2e45 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 index 4c9dd2a99..4049b9666 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/libswiftRemoteMirror.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/libswiftRemoteMirror.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources b/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources index 6454c9a39..1d8fb8ed5 100644 --- a/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources +++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources @@ -6,27 +6,27 @@ Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib - nEm3mFIw9PLmks2XH9c8rkiWby8= + KmTgJ15OB2QkMZBKW0xmZbC3Pb8= Resources/Base.lproj/Main.storyboardc/Info.plist - SFati5gZIj2mgyS/fc8UYN5NvwE= + QTpHNoXW8Zmy0QiR4Q8xDl3tFiQ= Resources/Base.lproj/Main.storyboardc/MainMenu.nib - lzPmVH+89sbCNfr7e95gWtorKTw= + IiyNaBh/UubjyNg+VwlRQwOocaE= Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib - tjAjXZms1HRDA+GJvB2pBCEzcGA= + wqyRYmLENOxufxQ3LQ2wYFxIQTU= Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib - 5B3xFRxbzzHNWCDwASF9NfrGoS8= + 3oK09US+3VqZcJfLbPAFalsR15w= Resources/Base.lproj/Main.storyboardc/RulesViewController.nib - qMdHnWxZGczrmPVp8dGqCN1Kj3g= + lQ38Zc8RR2KNbgua8X/vrL/UoCg= Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib @@ -34,7 +34,7 @@ Resources/libswiftRemoteMirror.dylib - LdXExC/yGa2r0w+H7AyBPziE5sc= + uAm1yyS6w+u0WzrRv4vgL2GNlZ8= files2 @@ -43,7 +43,7 @@ cdhash - bL6MRfKdAoMvOpoJWiEbRjEKneo= + JU9tI5igV2lLpKo6B6l3ijc6UvM= requirement identifier "com.apple.dt.runtime.swiftAppKit" 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 */ @@ -52,7 +52,7 @@ cdhash - Xh++iGknw+yolEOuphFfOhCR1ns= + P8wkRAF1FhJIZHDrgGTmPV21XQQ= 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 */ @@ -61,7 +61,7 @@ cdhash - gsU3Fioq99BbUJtHyumaF4ZF4lE= + Q0mq1ci9jKLZTCP5KNkWsWRbI4E= requirement identifier "com.apple.dt.runtime.swiftCoreData" 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 */ @@ -70,7 +70,7 @@ cdhash - +xORRpIzyJ7mVaAe64KJNoLB2Eo= + df3nGc0TuFP8SG170l4MtX21kAo= requirement identifier "com.apple.dt.runtime.swiftCoreFoundation" 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 */ @@ -79,7 +79,7 @@ cdhash - MwUnq5Ola6GQSloEt7H4BcE5tJE= + 5DqJe8jsEE0LlmkE5N410OsX8xo= 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 */ @@ -88,7 +88,7 @@ cdhash - I+gZaT8Jx7PTaOSmGsVTZiS/0PM= + 3n8cXl3ROLyeNUQ0WB5v3ZoZB5c= requirement identifier "com.apple.dt.runtime.swiftCoreImage" 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 */ @@ -97,7 +97,7 @@ cdhash - qPxfzkP3q/obedj73E03Lt491YU= + xKP/uC/H0lzMPhzk3PzPepkrBqE= requirement identifier "com.apple.dt.runtime.swiftDarwin" 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 */ @@ -106,7 +106,7 @@ cdhash - s0M5xQAO4u1XRxdWfezLg8H4Mf8= + MqUn37E6Ms0pMv0neEeo6SxM1Mg= requirement identifier "com.apple.dt.runtime.swiftDispatch" 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 */ @@ -115,7 +115,7 @@ cdhash - K4a+ln6Jck4m95ct95MLsUvbkrU= + c7h/hk0Fe3nqdaqX0ZDJoVfMbTM= requirement identifier "com.apple.dt.runtime.swiftFoundation" 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 */ @@ -124,7 +124,7 @@ cdhash - pzSLEyRZG6E5n2QKc4uw+v4WVFU= + 0ddibLWEUX++fbgpJcqQZRrkcYY= 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 */ @@ -133,7 +133,7 @@ cdhash - hnfzbxek5auIWvqiCLfF+v6mqHE= + hAL0i8yT4Nkg2LmcyZQmP226fdE= requirement identifier "com.apple.dt.runtime.swiftMetal" 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 */ @@ -142,7 +142,7 @@ cdhash - VTr4biItdirb4GzpRJmwq6Ax+ic= + h9ZI8vxJzY6njxZJQkeEF9qGF5M= 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 */ @@ -151,7 +151,7 @@ cdhash - wrtChOWn6zZngZgmoLlCPQMeAzI= + D9gPumzjeWuZB04dHYH9XCZN394= requirement identifier "com.apple.dt.runtime.swiftQuartzCore" 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 */ @@ -160,7 +160,7 @@ cdhash - O8zbTXA618cD70F2QrafO12IX/A= + xVWIk4fV3fEwSb2vc+MHu5eOLJA= requirement identifier "com.apple.dt.runtime.swiftXPC" 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 */ @@ -169,7 +169,7 @@ cdhash - hcsyh3JcA4s5JpfTVBAe2DKqY+U= + sZutJE1wVulaoKa5a/XE338sRXY= requirement identifier "com.apple.dt.runtime.swiftos" 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 */ @@ -178,7 +178,7 @@ cdhash - UDeykhckTVYtlsc92s8iDqK0lKI= + pRSlBnQIPoZy2sNyP1FdJ/Uyb2A= 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 +187,66 @@ hash - nEm3mFIw9PLmks2XH9c8rkiWby8= + KmTgJ15OB2QkMZBKW0xmZbC3Pb8= hash2 - y91wa1V9IhbHQw+WKf6kQavh60UovlAl1uueFfQy79c= + rtSr14s50sRCLSY7ebejTlzORdlOgU55QKwh3XGcppo= Resources/Base.lproj/Main.storyboardc/Info.plist hash - SFati5gZIj2mgyS/fc8UYN5NvwE= + QTpHNoXW8Zmy0QiR4Q8xDl3tFiQ= hash2 - hdfxOD2FRq4A/3zB/DrMOnYXqyVEuf3a22eWC3QoxtM= + SlUBUvEYaV7TVxJ+BOuLgT+QAOpMWhBfN9fP8M7LmYk= Resources/Base.lproj/Main.storyboardc/MainMenu.nib hash - lzPmVH+89sbCNfr7e95gWtorKTw= + IiyNaBh/UubjyNg+VwlRQwOocaE= hash2 - hRzTcikdHGyD+ncPtLHWcPr2nxWoCPBcJcY8SBMY6J4= + Vvku5yaEkREa0LpvIstBHXdDtD5mvx2VboNzHjrOe80= Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib hash - tjAjXZms1HRDA+GJvB2pBCEzcGA= + wqyRYmLENOxufxQ3LQ2wYFxIQTU= hash2 - Y1F27Uwh2X7qd8VRFgZhRUus69ztxLIuidL1s14Hie8= + A5DtdoZ16g7lPTtpRgRMlFzlMYxdqjZYYc0uUsTEL5g= Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib hash - 5B3xFRxbzzHNWCDwASF9NfrGoS8= + 3oK09US+3VqZcJfLbPAFalsR15w= hash2 - kac216sKEuYUI5ldp9xeKvjevoYiuQR27f34VO1ZktY= + xbiSjXce68qMxCKNIA05zKptgVEqDxHESTvGvNUE32c= Resources/Base.lproj/Main.storyboardc/RulesViewController.nib hash - qMdHnWxZGczrmPVp8dGqCN1Kj3g= + lQ38Zc8RR2KNbgua8X/vrL/UoCg= hash2 - QA0D0Ix4yCjwXGzy8BjxZW/Zu4TxPlYjxPUaaYgFcbQ= + e2m+o/17QzmujNiGfCSJ4dB0YPLs8me4pj4+blU3BAU= Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib @@ -264,11 +264,11 @@ hash - LdXExC/yGa2r0w+H7AyBPziE5sc= + uAm1yyS6w+u0WzrRv4vgL2GNlZ8= hash2 - 1foNDnM3PUkivBntIxeSItNKfl44X82yH3ZLokQNMaU= + noPqjK+gCdxVdLnaQxhxGU+P4DeujViaDbpDIYNjQ7A= diff --git a/README.md b/README.md index 8b91e1e11..1706af1cb 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Travis](https://img.shields.io/travis/nicklockwood/SwiftFormat.svg)](https://travis-ci.org/nicklockwood/SwiftFormat) [![Coveralls](https://coveralls.io/repos/github/nicklockwood/SwiftFormat/badge.svg)](https://coveralls.io/github/nicklockwood/SwiftFormat) -[![Swift 3.2](https://img.shields.io/badge/swift-3.2-orange.svg?style=flat)](https://developer.apple.com/swift) -[![Swift 4.0](https://img.shields.io/badge/swift-4.0-red.svg?style=flat)](https://developer.apple.com/swift) +[![Swift 3.4](https://img.shields.io/badge/swift-3.4-orange.svg?style=flat)](https://developer.apple.com/swift) +[![Swift 4.2](https://img.shields.io/badge/swift-4.2-red.svg?style=flat)](https://developer.apple.com/swift) [![License](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://opensource.org/licenses/MIT) [![Twitter](https://img.shields.io/badge/twitter-@nicklockwood-blue.svg)](http://twitter.com/nicklockwood) diff --git a/Sources/Formatter.swift b/Sources/Formatter.swift index dafad02a9..b5d2c9351 100644 --- a/Sources/Formatter.swift +++ b/Sources/Formatter.swift @@ -2,7 +2,7 @@ // Formatter.swift // SwiftFormat // -// Version 0.33.7 +// Version 0.33.8 // // Created by Nick Lockwood on 12/08/2016. // Copyright 2016 Nick Lockwood diff --git a/Sources/Info.plist b/Sources/Info.plist index 13f1fc616..b63b4890b 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.33.7 + 0.33.8 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift index 3d2bad1f7..f73d726f2 100644 --- a/Sources/SwiftFormat.swift +++ b/Sources/SwiftFormat.swift @@ -32,7 +32,7 @@ import Foundation /// The current SwiftFormat version -public let version = "0.33.7" +public let version = "0.33.8" /// An enumeration of the types of error that may be thrown by SwiftFormat public enum FormatError: Error, CustomStringConvertible { diff --git a/Sources/Tokenizer.swift b/Sources/Tokenizer.swift index 031a6ea68..90e20d072 100644 --- a/Sources/Tokenizer.swift +++ b/Sources/Tokenizer.swift @@ -2,7 +2,7 @@ // Tokenizer.swift // SwiftFormat // -// Version 0.33.7 +// Version 0.33.8 // // Created by Nick Lockwood on 11/08/2016. // Copyright 2016 Nick Lockwood diff --git a/SwiftFormat.podspec.json b/SwiftFormat.podspec.json index 60f3199fe..599b5c463 100644 --- a/SwiftFormat.podspec.json +++ b/SwiftFormat.podspec.json @@ -1,6 +1,6 @@ { "name": "SwiftFormat", - "version": "0.33.7", + "version": "0.33.8", "license": { "type": "MIT", "file": "LICENSE.md" @@ -10,7 +10,7 @@ "authors": "Nick Lockwood", "source": { "git": "https://github.com/nicklockwood/SwiftFormat.git", - "tag": "0.33.7" + "tag": "0.33.8" }, "default_subspecs": "Core", "subspecs": [ diff --git a/Tests/Info.plist b/Tests/Info.plist index ff73d5306..77823d882 100644 --- a/Tests/Info.plist +++ b/Tests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.33.7 + 0.33.8 CFBundleSignature ???? CFBundleVersion