Skip to content

Commit

Permalink
Updated for 0.35.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicklockwood
nicklockwood committed Aug 10, 2018
1 parent 46fdd50 commit 0785e7b
Show file tree
Hide file tree
Showing 39 changed files with 42 additions and 37 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## [0.35.2](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.35.2) (2018-08-10)

- Fixed a bug where `--rules` command incorrectly showed all rules as disabled
- Added close button to SwiftFormat for Xcode application window

## [0.35.1](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.35.1) (2018-08-08)

- Added support for hierarchical config files with a standard naming convention (see README for details)
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.35.1</string>
<string>0.35.2</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSMinimumSystemVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion EditorExtension/Application/Source/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
alert.beginSheetModal(for: window)
}

func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
func applicationShouldTerminateAfterLastWindowClosed(_: NSApplication) -> Bool {
return true
}
}
Expand Down
2 changes: 1 addition & 1 deletion EditorExtension/Extension/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>0.35.1</string>
<string>0.35.2</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.
2 changes: 1 addition & 1 deletion EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.35.1</string>
<string>0.35.2</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
Expand Down
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ...xtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>0.35.1</string>
<string>0.35.2</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
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 ...r Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib
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 ... Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.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 ...rmat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib
View file
Binary file not shown.
Binary file modified ...r Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/lOk-3C-AtC-view-Efh-0R-Cg8.nib
View file
Binary file not shown.
44 changes: 22 additions & 22 deletions EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@
<dict>
<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
<data>
VTIGrQSZqZwusgevr9/WUlYp4JI=
gqGQnf+GP5tTOiII5ioKsMLP4R0=
</data>
<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
<data>
MnmnoHRkekfs6C4FecO0oJHidGU=
OJ0P2/Bx5WJkFUlpytRAgkxZQZE=
</data>
<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
<data>
nFOYIt4AYEcX0p7arzScrtQDKek=
7jW81MfU8xJk0DYEx8vNtuYyotk=
</data>
<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
<data>
5egMkAmUzEhpsggdEIPJlU5f1/0=
B7wihajSm7BQGIa6pJMNCGG1S7c=
</data>
<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
<data>
u0rHXvxbCF8LFVXCr4mfrm/4vps=
QVBHOlI/GXnBm2V40t6zdXVOwf8=
</data>
<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
<data>
22mQZ9h6TR3IxJeqqZXcNxKUSqY=
GWrv5SEjWeNncGtprS7HhzXOqfI=
</data>
<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
<data>
AmXMPdvieE8zBdmZl6bB+ESu20c=
</data>
<key>Resources/Base.lproj/Main.storyboardc/lOk-3C-AtC-view-Efh-0R-Cg8.nib</key>
<data>
9ajivQePs0HDsuQvtYTElrMljPY=
gJ3QmkY5s9VfUMeUVP8FWWDMRPw=
</data>
<key>Resources/libswiftRemoteMirror.dylib</key>
<data>
Expand Down Expand Up @@ -182,7 +182,7 @@
<dict>
<key>cdhash</key>
<data>
B1n0HPcoY3BVgXvP0NUJ12pESWY=
EcQg/qgbWTuWM8oZEfYy9dIM17E=
</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 @@ -191,66 +191,66 @@
<dict>
<key>hash</key>
<data>
VTIGrQSZqZwusgevr9/WUlYp4JI=
gqGQnf+GP5tTOiII5ioKsMLP4R0=
</data>
<key>hash2</key>
<data>
MuALu3ewfII1Bq+vWFpbAIs9iKEUdFseH8TU/OWobHU=
/oTrDfXj2mq9KVJ+5H4vH+S5hmKNf7UsuQ0dtiudeRM=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
<dict>
<key>hash</key>
<data>
MnmnoHRkekfs6C4FecO0oJHidGU=
OJ0P2/Bx5WJkFUlpytRAgkxZQZE=
</data>
<key>hash2</key>
<data>
9Cb12qi2v195vlsFqIXxuD1jHMjkAbi1zPQjLUeq4jE=
IZdcm1anY1BsT5cGFkOiSywyJ5NkZYv679BGHa+7roo=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
<dict>
<key>hash</key>
<data>
nFOYIt4AYEcX0p7arzScrtQDKek=
7jW81MfU8xJk0DYEx8vNtuYyotk=
</data>
<key>hash2</key>
<data>
DTYvrspE2n3h7/WBHMel4EFS1vpj/x4UzVvThWQ/Hcg=
nfJokc3MkkvDSpFlTqmJj2vsx4wglPe+epN1Rsolocw=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
<dict>
<key>hash</key>
<data>
5egMkAmUzEhpsggdEIPJlU5f1/0=
B7wihajSm7BQGIa6pJMNCGG1S7c=
</data>
<key>hash2</key>
<data>
qHcGDsmA5Uu7A988KvaX0gmuVVnOwyXm5oQygCWt8nI=
8X+jbNXWfQjfm1TP8iZUI3dxX1c9vjxIHCGjPGgEXAI=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
<dict>
<key>hash</key>
<data>
u0rHXvxbCF8LFVXCr4mfrm/4vps=
QVBHOlI/GXnBm2V40t6zdXVOwf8=
</data>
<key>hash2</key>
<data>
GvTDJiiag3zKUa4pm4+1cZ/oEGGBiyzyA4OnuvHYA9E=
qI1bS0cd0GClIfJzckneL6j4FrKMZWOBC/KfJ6PmCWg=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
<dict>
<key>hash</key>
<data>
22mQZ9h6TR3IxJeqqZXcNxKUSqY=
GWrv5SEjWeNncGtprS7HhzXOqfI=
</data>
<key>hash2</key>
<data>
2xOoejODVLt7laY114cnQbDCgx6vZ0ZJUqcPFAhdR6w=
WkehT90r5HkakITUwG0iFRIPyoXO8AMH+pkAtUQmzjw=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
Expand All @@ -268,11 +268,11 @@
<dict>
<key>hash</key>
<data>
9ajivQePs0HDsuQvtYTElrMljPY=
gJ3QmkY5s9VfUMeUVP8FWWDMRPw=
</data>
<key>hash2</key>
<data>
ZaL+zLjSnJWUE/whYQkh6oFuSmy8vmvIZFB39bNTH1E=
kfBYJo65DtzB7ACRi8xnO7HyEKsEg4c2MH0wosbVupI=
</data>
</dict>
<key>Resources/libswiftRemoteMirror.dylib</key>
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ To use it safely, do the following:

3. (Optional) In Terminal, type `swiftformat --inferoptions "/path/to/your/code/"`. This will suggest a set of formatting options to use that match your existing project style (but you are free to ignore these and use the defaults, or your own settings if you prefer).

The path can point to either a single Swift file, or a directory of files. It can be either be absolute, or relative to the current directory. The `""` quotes around the path are optional, but if the path contains spaces then you either need to use quotes, or escape each space with `\`.
The path can point to either a single Swift file or a directory of files. It can be either be absolute, or relative to the current directory. The `""` quotes around the path are optional, but if the path contains spaces then you either need to use quotes, or escape each space with `\`. You may include multiple paths separated by spaces.

4. In Terminal, type `swiftformat "/path/to/your/code/"`. The same rules apply as above with respect to path formatting, but you can enter multiple paths if you wish, separated by spaces.
4. In Terminal, type `swiftformat "/path/to/your/code/"`. The same rules apply as above with respect to paths, and multiple space-delimited paths are allowed.

If you used `--inferoptions` to generate a suggested set of options in step 3, you should copy and paste them into the command, either before or after the path(s) to your source files.

If you have created a [configuration file](#config), you can specify it's path using `--config "/path/to/your/config-file/".
If you have created a [configuration file](#config), you can specify its path using `--config "/path/to/your/config-file/".

5. Press enter to begin formatting. Once the formatting is complete, use your source control system to check the changes, and verify that no undesirable changes have been introduced. If they have, revert the changes, tweak the options and try again.

Expand Down
2 changes: 1 addition & 1 deletion Sources/Formatter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Formatter.swift
// SwiftFormat
//
// Version 0.35.1
// Version 0.35.2
//
// 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
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.35.1</string>
<string>0.35.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftFormat.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import Foundation

/// The current SwiftFormat version
public let version = "0.35.1"
public let version = "0.35.2"

/// The standard SwiftFormat config file name
public let swiftFormatConfigurationFile = ".swiftformat"
Expand Down
2 changes: 1 addition & 1 deletion Sources/Tokenizer.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Tokenizer.swift
// SwiftFormat
//
// Version 0.35.1
// Version 0.35.2
//
// Created by Nick Lockwood on 11/08/2016.
// Copyright 2016 Nick Lockwood
Expand Down
4 changes: 2 additions & 2 deletions SwiftFormat.podspec.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "SwiftFormat",
"version": "0.35.1",
"version": "0.35.2",
"license": {
"type": "MIT",
"file": "LICENSE.md"
Expand All @@ -10,7 +10,7 @@
"authors": "Nick Lockwood",
"source": {
"git": "https://github.com/nicklockwood/SwiftFormat.git",
"tag": "0.35.1"
"tag": "0.35.2"
},
"default_subspecs": "Core",
"subspecs": [
Expand Down
2 changes: 1 addition & 1 deletion Tests/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.35.1</string>
<string>0.35.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit 0785e7b

Please sign in to comment.