diff --git a/CHANGELOG.md b/CHANGELOG.md index ad12d83c..0f0a93d7 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## [0.35.6](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.35.6) (2018-09-29) + +- Fixed bug where `self` could be incorrectly removed inside `#if` blocks +- Fixed some bugs when inserting or removing `self` inside `didSet` handlers +- The `strongOutlets` rule now ignores properties named `delegate` or `dataSource` +- The `wrapCollections` rule now behaves more consistently with nested collection literals +- Added "Open Recent" menu item to the SwiftFormat for Xcode app + ## [0.35.5](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.35.5) (2018-09-08) - Fixed a bug in `redundantParens` rule that affected closure types that take a single tuple argument diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat index 5b8fc63b..d981e999 100755 Binary files a/CommandLineTool/swiftformat and b/CommandLineTool/swiftformat differ diff --git a/EditorExtension/Application/Info.plist b/EditorExtension/Application/Info.plist index b1ad01d0..ec2a68ee 100644 --- a/EditorExtension/Application/Info.plist +++ b/EditorExtension/Application/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.35.5 + 0.35.6 CFBundleVersion $(CURRENT_PROJECT_VERSION) LSMinimumSystemVersion diff --git a/EditorExtension/Extension/Info.plist b/EditorExtension/Extension/Info.plist index 8b87dde2..370c7cc7 100644 --- a/EditorExtension/Extension/Info.plist +++ b/EditorExtension/Extension/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.35.5 + 0.35.6 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 0813e976..7fd36c1e 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 7f3ce906..58843102 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 314c8777..8eb57fd4 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 f138ec62..f7e90cbf 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 47dcd20a..a34304cb 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 6eec1b20..f367c92d 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 00ba0487..6cd884d1 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 11c0c66c..faca372e 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 93031cb0..30db3ddb 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 170c262c..760d0b05 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 9c68ffd0..0456cf19 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 64cd22ef..054ed665 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 d27dbf43..d7619eac 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 710b0b36..7dd1c163 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 d6d2bc89..8689225f 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 f94d7c3f..1d48ae31 100644 --- a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist +++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.35.5 + 0.35.6 CFBundleSupportedPlatforms MacOSX @@ -27,17 +27,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 9F2000 + 10A254a DTPlatformVersion GM DTSDKBuild - 17E189 + 18A384 DTSDKName - macosx10.13 + macosx10.14 DTXcode - 0941 + 1000 DTXcodeBuild - 9F2000 + 10A254a 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 54dd22c2..30d6ded3 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 7d8f3fd3..e2ba74db 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.35.5 + 0.35.6 CFBundleSupportedPlatforms MacOSX @@ -27,17 +27,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 9F2000 + 10A254a DTPlatformVersion GM DTSDKBuild - 17E189 + 18A384 DTSDKName - macosx10.13 + macosx10.14 DTXcode - 0941 + 1000 DTXcodeBuild - 9F2000 + 10A254a 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 3aa5771b..efd6b1f7 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 8c928150..3793b303 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 4051cd7f..3e01b1ac 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 f8db632c..c72eebb9 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 868dfb9d..096be6cb 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 a21b437a..4284c1f8 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 c1b84c62..74d6ebbe 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/Base.lproj/Main.storyboardc/lOk-3C-AtC-view-Efh-0R-Cg8.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/lOk-3C-AtC-view-Efh-0R-Cg8.nib index cdb8bd9c..33f94fdd 100644 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/lOk-3C-AtC-view-Efh-0R-Cg8.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/lOk-3C-AtC-view-Efh-0R-Cg8.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 4049b966..aaf138e5 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 dad0707c..7cbca1de 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 - jMHeOiZHBGGzzhec75k/KQvXK60= + NSnnDfg5hj649TIkg6ZgYKBJRc8= Resources/Base.lproj/Main.storyboardc/Info.plist - Ww1bg6+/BCxr4j6mGChdYCU8bYo= + CX6sj00tz5q/5O62Sp/HaEkfjdI= Resources/Base.lproj/Main.storyboardc/MainMenu.nib - A7vYsDvox1HSjFRhJvWktLdX540= + mOsRG8WpNVwpI8wzpdwAXv7hes4= Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib - vXnUNxTQ/yRfFocd6C8M+KieLcI= + euRrzz448VDkd8I+YWRqnIT0+Lc= Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib - xh/sjORm8xcjNnK0OCAlgFuI2K4= + 49Rp+jkFurfZW2+cwiA0Lteanvw= Resources/Base.lproj/Main.storyboardc/RulesViewController.nib - vGUC/sRiK/lZyeYh95tvLq4yb8s= + ntnl+KyhLS6DBNWzRjmjppIbPAg= Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib @@ -34,11 +34,11 @@ Resources/Base.lproj/Main.storyboardc/lOk-3C-AtC-view-Efh-0R-Cg8.nib - 2v11Pi/gzVXlHjXxMrf2e7mYuGM= + Pnmb3YKBg6O3PSV52NeG34rqD/w= Resources/libswiftRemoteMirror.dylib - uAm1yyS6w+u0WzrRv4vgL2GNlZ8= + T5WNSYoXFdTnwq/cM/9UOURZuko= files2 @@ -47,7 +47,7 @@ cdhash - a2husIOwICT4GwhWv8Bt0TtL3eA= + iB5kyqRBqO0Hvwi/xZao0AgZc1U= 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 */ @@ -56,7 +56,7 @@ cdhash - j5oDZHuWakQRBDugrPh251t/ZrQ= + V1mNP6P2v66tKCL54dqkMcpHSr0= 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 */ @@ -65,7 +65,7 @@ cdhash - k2ULfaQVV8PLwZ8iSZHFNt9/29M= + /xQjNGIxl1Ye++4ZLpX8+Ht09Mo= 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 */ @@ -74,7 +74,7 @@ cdhash - yqItsV0uD9Gb9ONXh6AEWboONmg= + oQePqjAc352FqA8AjNQrobXtzic= 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 */ @@ -83,7 +83,7 @@ cdhash - QXRalJhxTz/ngEtmkIX0xyIvYm8= + JGbXAQlGqBQL6JGZtsvISKYO1AI= 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 */ @@ -92,7 +92,7 @@ cdhash - NhIWO0CDLYqn7y+41R+OdnFAz6I= + sK2Tc5A/nbz2/oMytUF1K3if0zc= 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 */ @@ -101,7 +101,7 @@ cdhash - FNR32kiFJc3eneRWHinh8q8SFEQ= + JVVG9YOS42x8YfYLOps7lpgMuyU= 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 */ @@ -110,7 +110,7 @@ cdhash - uVaN+OeczIRlSa2vI3FMe04bsYw= + CeDVfGwqlRZNWRUU6PHh9wxo7j8= 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 */ @@ -119,7 +119,7 @@ cdhash - 6ut5m8AfyvEjkLo2Z5tkxfvwjfc= + F4fyfwGOuF10QHML85jDvPoCV+U= 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 */ @@ -128,7 +128,7 @@ cdhash - pGJGkokfBSAra+cKccEAebo6gF8= + 69Z+w6FEFR1gxQAuvOfVs3UfeCE= 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 */ @@ -137,7 +137,7 @@ cdhash - YGySNWFRK66mxT0P3+Sz7QNwAM4= + OEyvDZCRM7AfyEX7eyi51DqM2lA= 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 */ @@ -146,7 +146,7 @@ cdhash - 2axBl8vIRChCU2f8OsII715zpBo= + X5XuLQApanrs/51GKKeiDQXOUbM= 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 */ @@ -155,7 +155,7 @@ cdhash - jJOrsAayZbJ6cXA5+JGcB8x/6w4= + ErZWy1XvG4JysRdYJ1/ClSnHB2g= 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 */ @@ -164,7 +164,7 @@ cdhash - cBIKVz7BAiNVh116pXBYuLF5KJw= + CJ9j4US11pl+iV16zAR8bOAfrgY= 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 */ @@ -173,7 +173,7 @@ cdhash - mnzmh6rInfA2Kf2rIRVa1lZJZcY= + +mkNr7avSm3Sqleh1NKm1dBOgNs= 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 */ @@ -182,7 +182,7 @@ cdhash - irLeNJqtG6NsOgsXDIS7fYBs2o0= + xYjvaAnb7u01NopAG+h/AwwJbeY= 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 */ @@ -191,66 +191,66 @@ hash - jMHeOiZHBGGzzhec75k/KQvXK60= + NSnnDfg5hj649TIkg6ZgYKBJRc8= hash2 - t8Nh2jbnQXQWpzw5V5/lhFec49tqglD799Irs9JS65w= + GvWaK06NMM5VkdBHngWW47zxksqND3wpQGzt35UpU90= Resources/Base.lproj/Main.storyboardc/Info.plist hash - Ww1bg6+/BCxr4j6mGChdYCU8bYo= + CX6sj00tz5q/5O62Sp/HaEkfjdI= hash2 - 8xyM0Idy9q+oZRkND5+uEoUo6uu3jncwoNYpwLcpoZ8= + RCnTGrZWIHhqaiQMkJMkNt5JLXu8TOSchRAQLJE2kXI= Resources/Base.lproj/Main.storyboardc/MainMenu.nib hash - A7vYsDvox1HSjFRhJvWktLdX540= + mOsRG8WpNVwpI8wzpdwAXv7hes4= hash2 - kesE+gNsWBHj1VqM2T52ZY6JiJUa6Gt3Wek0oadKVvQ= + Pn2VRlc+kmyFYuo2K3zXP/3m5WTnzxq3aId5YNEpMMk= Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib hash - vXnUNxTQ/yRfFocd6C8M+KieLcI= + euRrzz448VDkd8I+YWRqnIT0+Lc= hash2 - 8vYGpJdOofncfLeWslPO32hhqV5mVUt7o+Es9rgwc50= + CPgzXX1dhDTnrZCWF9wh4xeiLIDlJUD9FiIy0TxpGqg= Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib hash - xh/sjORm8xcjNnK0OCAlgFuI2K4= + 49Rp+jkFurfZW2+cwiA0Lteanvw= hash2 - aQ4xxjvJzO+eUuZeoCKpE8vzVc5xqU0JWtiD+KsJvhs= + T/jMESFfoB2Hktca/wRVTMuXavHvwI4JDcM9UltDLJ0= Resources/Base.lproj/Main.storyboardc/RulesViewController.nib hash - vGUC/sRiK/lZyeYh95tvLq4yb8s= + ntnl+KyhLS6DBNWzRjmjppIbPAg= hash2 - pSBZIArsXUWaIN5IRFrRyMYQ6/gbXv17iR+nnjhmLp4= + UHHdzqd7OOQr+Ga7LyeGGT9WTONP7Oj4oOkmj05gLCw= Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib @@ -268,22 +268,22 @@ hash - 2v11Pi/gzVXlHjXxMrf2e7mYuGM= + Pnmb3YKBg6O3PSV52NeG34rqD/w= hash2 - UfJlwc7O/uBskC3FfjQ07vAxHq2G5Zadi4yrUvYzBQk= + hidHLrQXgrxYXWY7KohQiTROajMoYB4vXsh0WC5PWiw= Resources/libswiftRemoteMirror.dylib hash - uAm1yyS6w+u0WzrRv4vgL2GNlZ8= + T5WNSYoXFdTnwq/cM/9UOURZuko= hash2 - noPqjK+gCdxVdLnaQxhxGU+P4DeujViaDbpDIYNjQ7A= + VqXNHZVW6j/ILAGhxBRluVnPGzxh1jn5x3fcNO2bU/Q= diff --git a/Sources/Formatter.swift b/Sources/Formatter.swift index 76ea4bf4..ed4f63e5 100644 --- a/Sources/Formatter.swift +++ b/Sources/Formatter.swift @@ -2,7 +2,7 @@ // Formatter.swift // SwiftFormat // -// Version 0.35.5 +// Version 0.35.6 // // Created by Nick Lockwood on 12/08/2016. // Copyright 2016 Nick Lockwood diff --git a/Sources/Info.plist b/Sources/Info.plist index 276a32ed..1a96895a 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.35.5 + 0.35.6 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift index f6d9264e..13885c5c 100644 --- a/Sources/SwiftFormat.swift +++ b/Sources/SwiftFormat.swift @@ -32,7 +32,7 @@ import Foundation /// The current SwiftFormat version -public let version = "0.35.5" +public let version = "0.35.6" /// The standard SwiftFormat config file name public let swiftFormatConfigurationFile = ".swiftformat" diff --git a/Sources/Tokenizer.swift b/Sources/Tokenizer.swift index 12072c86..3ef26feb 100644 --- a/Sources/Tokenizer.swift +++ b/Sources/Tokenizer.swift @@ -2,7 +2,7 @@ // Tokenizer.swift // SwiftFormat // -// Version 0.35.5 +// Version 0.35.6 // // Created by Nick Lockwood on 11/08/2016. // Copyright 2016 Nick Lockwood diff --git a/SwiftFormat.podspec.json b/SwiftFormat.podspec.json index b182037a..32334f84 100644 --- a/SwiftFormat.podspec.json +++ b/SwiftFormat.podspec.json @@ -1,6 +1,6 @@ { "name": "SwiftFormat", - "version": "0.35.5", + "version": "0.35.6", "license": { "type": "MIT", "file": "LICENSE.md" @@ -10,7 +10,7 @@ "authors": "Nick Lockwood", "source": { "git": "https://github.com/nicklockwood/SwiftFormat.git", - "tag": "0.35.5" + "tag": "0.35.6" }, "default_subspecs": "Core", "subspecs": [ diff --git a/Tests/Info.plist b/Tests/Info.plist index 3e7cc7f6..20187108 100644 --- a/Tests/Info.plist +++ b/Tests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.35.5 + 0.35.6 CFBundleSignature ???? CFBundleVersion