Skip to content

Commit

Permalink
Updated for 0.30.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicklockwood
nicklockwood committed Nov 10, 2017
1 parent 01373e0 commit 5eba649
Show file tree
Hide file tree
Showing 36 changed files with 61 additions and 56 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
@@ -1,8 +1,13 @@
# Change Log

## [0.30.1](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.30.1) (2017-11-10)

- Fixed error when parsing a subscript with default value inside a `switch` statement
- Nil default values are no longer removed inside `Codable` structs/classes, as this can break the implementation

## [0.30.0](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.30.0) (2017-10-27)

- Space is now inserted between the operator name and opeening paren in an operator function declaration
- Space is now inserted between the operator name and opening paren in an operator function declaration
- Added `--operatorfunc` option to control whether operator should be followed by a space in a function declaration
- Added `--elseposition` option to control whether `else`, `catch` & `while` should appear on same line as preceding `}`
- Added `--indentcase` option to control whether `case` statements should be indented inside a `switch`
Expand Down
Binary file modified CommandLineTool/swiftformat
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion EditorExtension/Application/Info.plist
View file
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.30.0</string>
<string>0.30.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSMinimumSystemVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion EditorExtension/Extension/Info.plist
View file
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>0.30.0</string>
<string>0.30.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSMinimumSystemVersion</key>
Expand Down
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftMetal.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftos.dylib
View file
Binary file not shown.
12 changes: 6 additions & 6 deletions EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist
View file
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>16G29</string>
<string>16G1036</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.30.0</string>
<string>0.30.1</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
Expand All @@ -27,17 +27,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>9A235</string>
<string>9B55</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>17A360</string>
<string>17B41</string>
<key>DTSDKName</key>
<string>macosx10.13</string>
<key>DTXcode</key>
<string>0900</string>
<string>0910</string>
<key>DTXcodeBuild</key>
<string>9A235</string>
<string>9B55</string>
<key>LSMinimumSystemVersion</key>
<string>10.11</string>
<key>NSHumanReadableCopyright</key>
Expand Down
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode
View file
Binary file not shown.
12 changes: 6 additions & 6 deletions ...xtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist
View file
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>16G29</string>
<string>16G1036</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>0.30.0</string>
<string>0.30.1</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
Expand All @@ -27,17 +27,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>9A235</string>
<string>9B55</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>17A360</string>
<string>17B41</string>
<key>DTSDKName</key>
<string>macosx10.13</string>
<key>DTXcode</key>
<string>0900</string>
<string>0910</string>
<key>DTXcodeBuild</key>
<string>9A235</string>
<string>9B55</string>
<key>LSMinimumSystemVersion</key>
<string>10.11</string>
<key>NSExtension</key>
Expand Down
Binary file modified ...n/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat
View file
Binary file not shown.
Binary file modified ...nsion/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist
View file
Binary file not shown.
Binary file modified ...ion/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib
View file
Binary file not shown.
Binary file modified ...code.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib
View file
Binary file not shown.
Binary file modified ...iftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/ViewController.nib
View file
Binary file not shown.
Binary file modified ...r Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib
View file
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/libswiftRemoteMirror.dylib
View file
Binary file not shown.
68 changes: 34 additions & 34 deletions EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources
View file
Expand Up @@ -6,27 +6,27 @@
<dict>
<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
<data>
ywhLZDwhtbarq2jzVwhfDxdAfYc=
V2s1pKUm2HtuChnYxqBIdfagg0c=
</data>
<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
<data>
PYmBOAn9HYvZlSstqG4GR9Y95kY=
nYnwhFW73nEmnFH+9p8bvCJNCXg=
</data>
<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
<data>
c2TA0Kz1Omz6CVxN7vvD6qgVyx4=
a2M5gb/jwIsCW+FORvoSq7qyDHg=
</data>
<key>Resources/Base.lproj/Main.storyboardc/ViewController.nib</key>
<data>
sx5eo3jvaWPe8s6u8wOfrMS1JMA=
j/0D4sUd1NrwWUaVEwKdB/xghKU=
</data>
<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
<data>
asO7TWUYK2z3KaRNTvyb3aQUTiw=
1T1rI1KE9QqXGD3UN3ZuOae9GH8=
</data>
<key>Resources/libswiftRemoteMirror.dylib</key>
<data>
kRJ69A+8JniBjyPhNQBswlhKAok=
crULNDMnzc0rDmaQBHwL3FGx02o=
</data>
</dict>
<key>files2</key>
Expand All @@ -35,7 +35,7 @@
<dict>
<key>cdhash</key>
<data>
WKQQsDKeIS6q+ECeS27t3zbhX84=
RMXigcBwLe/6Dv/EK766IERSDs0=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -44,7 +44,7 @@
<dict>
<key>cdhash</key>
<data>
9ffF0rPrcZFRbwmFcsL7PAdmVWA=
AWtkvlEY9NVlvRJiYUxPmyA7bNM=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -53,7 +53,7 @@
<dict>
<key>cdhash</key>
<data>
88404xJrp2Y+VQr6ZtlZ3eGOBEo=
znlxDYeWju3Wn2z5R3ulD/X4Yz0=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -62,7 +62,7 @@
<dict>
<key>cdhash</key>
<data>
e1je4KHjCfV9fTgwwYbY7c86af8=
1HXLNPfryndUL/2/oxUOMCJFG7g=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -71,7 +71,7 @@
<dict>
<key>cdhash</key>
<data>
QoMUsMXT1PxkgieX4cVEixc5Unk=
Q4qkCUq1dCsy+/XZAugRPcG7yGQ=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -80,7 +80,7 @@
<dict>
<key>cdhash</key>
<data>
ukwKSQtfBCsqKbH8ZmSx7k+KbjE=
C4u4Yt+bZ7CzzqqODLhqHNlaGlo=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -89,7 +89,7 @@
<dict>
<key>cdhash</key>
<data>
OY8noLtIzw0gsGtNURki7aNM0iw=
gVojr3lpGYUx5plo7Jrp81Spd8c=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -98,7 +98,7 @@
<dict>
<key>cdhash</key>
<data>
8/HcXpxgQ3kAfcv34srzhCPCY8w=
o5T5Jz1D7zlS0ODror7Usj8ZO18=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -107,7 +107,7 @@
<dict>
<key>cdhash</key>
<data>
u1yLDs/hPp9k7ir55BX7YyxYQco=
UvSIdjzdZ4AGtsx8zspZRMiNsq0=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -116,7 +116,7 @@
<dict>
<key>cdhash</key>
<data>
FowbLxcnhlZK0bDTc0LcBQ3wNQA=
2B4+xQHFanRzqiUeXj6quL3QZW4=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -125,7 +125,7 @@
<dict>
<key>cdhash</key>
<data>
8J/c7o14Zd34z0Vvy53QEbzxqXY=
HN9KZh7I0cZw3xnE39hv6M4kn4s=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -134,7 +134,7 @@
<dict>
<key>cdhash</key>
<data>
lBak89n8K/DLrDuhzQKhWUwplJI=
Js0tYDFdsQ17mvOhkHXioAxbLhU=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -143,7 +143,7 @@
<dict>
<key>cdhash</key>
<data>
feG3AyJhD/EO6oIV23xK7GmB9h4=
890Q6QIOZY4DzNB5hjJTJTc3rtM=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -152,7 +152,7 @@
<dict>
<key>cdhash</key>
<data>
OokwDgpI2E/2lDDC3kZzc8HSyJw=
eTJGvhGu0LFSv/JMoipkc2IHqzo=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -161,7 +161,7 @@
<dict>
<key>cdhash</key>
<data>
B3kifBvhqO27cHRptl6AbhxFvSg=
Oe98/hivII3DiVrS3oEalhcZlDQ=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -170,7 +170,7 @@
<dict>
<key>cdhash</key>
<data>
074+1WGJlfGiEWhfOBs5PlrHaN8=
s+/qARZGHHEcnA4PKIBwZrvPJY0=
</data>
<key>requirement</key>
<string>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 */</string>
Expand All @@ -179,66 +179,66 @@
<dict>
<key>hash</key>
<data>
ywhLZDwhtbarq2jzVwhfDxdAfYc=
V2s1pKUm2HtuChnYxqBIdfagg0c=
</data>
<key>hash2</key>
<data>
uA56wnP+XEXCrsKwoeoDIdLi0FyckJ9Ap3TcrUZLqHQ=
MriIUQIHyx97oTdyqxeA0L5HQfJf3P0Eg3zM5jV8nlU=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
<dict>
<key>hash</key>
<data>
PYmBOAn9HYvZlSstqG4GR9Y95kY=
nYnwhFW73nEmnFH+9p8bvCJNCXg=
</data>
<key>hash2</key>
<data>
8/C+TNHzkY4zUaQIm0r9JreMxDP0JZjzfghG2GmmbCs=
jNA0die26EW/6uX09u4JGp6lbpPFHyGPvJAhB6PerPQ=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
<dict>
<key>hash</key>
<data>
c2TA0Kz1Omz6CVxN7vvD6qgVyx4=
a2M5gb/jwIsCW+FORvoSq7qyDHg=
</data>
<key>hash2</key>
<data>
VKS1HbBhoammJkCmkKv/PGWpfHw1lwl1+JkZFpv5Q6k=
MXv1Bv9zjFHHqe5AAHcYWMzw+PLd8A+eZoZ+NGiWqVs=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/ViewController.nib</key>
<dict>
<key>hash</key>
<data>
sx5eo3jvaWPe8s6u8wOfrMS1JMA=
j/0D4sUd1NrwWUaVEwKdB/xghKU=
</data>
<key>hash2</key>
<data>
p6ZCBQ2qsOXkJjmr3iHU155cEXxWVikROes0K6WBkYE=
Gh5ieR9P4+/Eu9F25DuLu2XejB9XGgBuF/XBS2HflNw=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
<dict>
<key>hash</key>
<data>
asO7TWUYK2z3KaRNTvyb3aQUTiw=
1T1rI1KE9QqXGD3UN3ZuOae9GH8=
</data>
<key>hash2</key>
<data>
ZSGCWK5hboOfFEMiM2a6xfh+WKo0Ea3u+aRmJOOMIp0=
QFcOXF8+EIH56tfEyOkmo7g1evIqSr5fcc1fkK73HPY=
</data>
</dict>
<key>Resources/libswiftRemoteMirror.dylib</key>
<dict>
<key>hash</key>
<data>
kRJ69A+8JniBjyPhNQBswlhKAok=
crULNDMnzc0rDmaQBHwL3FGx02o=
</data>
<key>hash2</key>
<data>
eLJuPyXJJcXeYpdIWwVyfY3YEEX/G0EZ6Ptukl+UzmQ=
A/WCcGNgZhwXa3IwClKsXkYBI0N03KBYYLVYHXHg/Do=
</data>
</dict>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Sources/Formatter.swift
View file
Expand Up @@ -2,7 +2,7 @@
// Formatter.swift
// SwiftFormat
//
// Version 0.30.0
// Version 0.30.1
//
// Created by Nick Lockwood on 12/08/2016.
// Copyright 2016 Nick Lockwood
Expand Down
2 changes: 1 addition & 1 deletion Sources/Info.plist
View file
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.30.0</string>
<string>0.30.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftFormat.swift
View file
Expand Up @@ -32,7 +32,7 @@
import Foundation

/// The current SwiftFormat version
public let version = "0.30.0"
public let version = "0.30.1"

/// An enumeration of the types of error that may be thrown by SwiftFormat
public enum FormatError: Error, CustomStringConvertible {
Expand Down

0 comments on commit 5eba649

Please sign in to comment.