Skip to content

Commit

Permalink
Update for 0.48.8 release
Browse files Browse the repository at this point in the history
  • Loading branch information
nicklockwood committed Jul 8, 2021
1 parent 1685879 commit c8abbd2
Show file tree
Hide file tree
Showing 41 changed files with 36 additions and 32 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## [0.48.8](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.48.8) (2020-07-08)

- Fixed regression introduced in 0.48.7 where parens around operator literals were incorrectly removed

## [0.48.7](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.48.7) (2020-07-07)

- Fixed bug where `redundantParens` rule could introduce an ambiguity by removing parens around a range argument
Expand Down
Binary file modified CommandLineTool/swiftformat
Binary file not shown.
Binary file modified EditorExtension/SwiftFormat for Xcode.app/Contents/CodeResources
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.48.7</string>
<string>0.48.8</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
Expand Down
Binary file not shown.
Binary file not shown.
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.48.7</string>
<string>0.48.8</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,31 @@
</data>
<key>Resources/Assets.car</key>
<data>
js+PUP9vzfdK5eMYGBWPQdECXvY=
mmE8H3LTH0VgAsMOIX/KLCyzq8E=
</data>
<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
<data>
JxSn3ZJ1C28Tj+1XWKr5+HRZMnk=
CAz/byJ5rYQxef+fb/EbII10m3g=
</data>
<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
<data>
eCh2dGlINZxblFqTfr+wG9zRzgE=
CFQL7R/Dq8+nhpAw5ovpZitKyw4=
</data>
<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
<data>
eEK+9vwvOfT0lx7C6adSTbcObfA=
SWh+5wdV8WauelWU07VyYZiBUPI=
</data>
<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
<data>
RlQOAEWW/cq3z+2MzBysMTggU8o=
TA2nwSBAB6lMM5qI2rMwwMXk9Rg=
</data>
<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
<data>
qAMsni8+UOntPa8hJI3qa01gMk4=
aX0SM5nZp/LgGXnO0LuEWPuBxxE=
</data>
<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
<data>
FoO7XjFaRiSqcReX/ZyL9srRWHI=
AYSqixcR7DSek+hK6t5zGhKWtgo=
</data>
<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
<data>
Expand Down Expand Up @@ -209,7 +209,7 @@
<dict>
<key>cdhash</key>
<data>
0caJcJSY6FkBzUhOaJKrKhQmEfw=
QP/curr6ZXqiee27vodeRvYLEaI=
</data>
<key>requirement</key>
<string>anchor apple generic and identifier "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or 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")</string>
Expand All @@ -225,49 +225,49 @@
<dict>
<key>hash2</key>
<data>
wabgzocgFufjTt9GrtfXKizYclrkW8qUQ6WeOD1LKVU=
LC+Mgft57st5/hf+5IxMZto5JnrkKFY2W7mnrvaszU8=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
<dict>
<key>hash2</key>
<data>
W5GGsoDTnOkKZUXF/zcCgLNPDuibGw2pp3T8OfS6/2s=
ic7yoFT1eH9lYAOQ+kWpJSfRSaY9hNNjcdAgEa9Y4xo=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
<dict>
<key>hash2</key>
<data>
5xHorX2+W7xxaLMYflwv6TVraZ1ZpyWQOjiPvIu/K+s=
SyJGWVKFb1A9bwDYB6/Css7gbORtVCDnMZ7241W1vTw=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
<dict>
<key>hash2</key>
<data>
zi1uvL0qA2v7zkxjeeHPJqdlisqYc6Fjx595A1eM7Wc=
ze2wF3ETk+EjP+uGizrsMdRRPa4jNmWk9FNWgJuQSfI=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
<dict>
<key>hash2</key>
<data>
BFtQZaXBdaph9EE+64Rwa8MKlBj6Dr7yjpJ1l/ujWZY=
eI2Fr6XNzJ8fvWNroYqxRgEIVjwQKg/NRUi337Ld0Kw=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
<dict>
<key>hash2</key>
<data>
ofQtKNx5hyVaLYIiZI3kRVfEHQe+6gcJImNOj4ERUYw=
c24SbIQnx7I/KZR1q4m3isIdch32xfZBJwhQ/uEBM/Y=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
<dict>
<key>hash2</key>
<data>
v6sqWDhWfN1SUY4mDSJ0Zq68NXxUgV/FNWnYPVHbK+U=
5VgpXTQj8zJ5CLQlOblAYI9wp8C9tQDnj85UskeTgQw=
</data>
</dict>
<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![](EditorExtension/Application/Assets.xcassets/AppIcon.appiconset/icon_256x256.png)

[![PayPal](https://img.shields.io/badge/paypal-donate-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9ZGWNK5FEZFF6&source=url)
[![Travis](https://api.travis-ci.org/nicklockwood/SwiftFormat.svg?branch=master)](https://travis-ci.org/nicklockwood/SwiftFormat)
[![Travis](https://api.travis-ci.com/nicklockwood/SwiftFormat.svg?branch=master)](https://travis-ci.com/github/nicklockwood/SwiftFormat)
[![Codecov](https://codecov.io/gh/nicklockwood/SwiftFormat/graphs/badge.svg)](https://codecov.io/gh/nicklockwood/SwiftFormat)
[![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)
Expand Down Expand Up @@ -621,8 +621,8 @@ Error codes
The swiftformat command-line tool will always exit with one of the following codes:
* 0 - Success. This code will be returned in the event of a successful formatting run or if linting detects no violations.
* 1 - Lint failure. This code will be returned when running in `--lint` mode if the input requires formatting.
* 0 - Success. This code will be returned in the event of a successful formatting run or if `--lint` detects no violations.
* 1 - Lint failure. This code will be returned only when running in `--lint` mode if the input requires formatting.
* 70 - Program error. This code will be returned if there is a problem with the input or configuration arguments.
Expand Down
2 changes: 1 addition & 1 deletion Sources/Formatter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Formatter.swift
// SwiftFormat
//
// Version 0.48.7
// Version 0.48.8
//
// Created by Nick Lockwood on 12/08/2016.
// Copyright 2016 Nick Lockwood
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftFormat.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import Foundation

/// The current SwiftFormat version
let swiftFormatVersion = "0.48.7"
let swiftFormatVersion = "0.48.8"
public let version = swiftFormatVersion

/// The standard SwiftFormat config file name
Expand Down
2 changes: 1 addition & 1 deletion Sources/Tokenizer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Tokenizer.swift
// SwiftFormat
//
// Version 0.48.7
// Version 0.48.8
//
// Created by Nick Lockwood on 11/08/2016.
// Copyright 2016 Nick Lockwood
Expand Down
4 changes: 2 additions & 2 deletions SwiftFormat.podspec.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "SwiftFormat",
"version": "0.48.7",
"version": "0.48.8",
"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.48.7"
"tag": "0.48.8"
},
"default_subspecs": "Core",
"subspecs": [
Expand Down
12 changes: 6 additions & 6 deletions SwiftFormat.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,7 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 0.48.7;
MARKETING_VERSION = 0.48.8;
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1127,7 +1127,7 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 0.48.7;
MARKETING_VERSION = 0.48.8;
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1223,7 +1223,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 0.48.7;
MARKETING_VERSION = 0.48.8;
PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
PRODUCT_NAME = "SwiftFormat for Xcode";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -1253,7 +1253,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 0.48.7;
MARKETING_VERSION = 0.48.8;
PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
PRODUCT_NAME = "SwiftFormat for Xcode";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -1281,7 +1281,7 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 0.48.7;
MARKETING_VERSION = 0.48.8;
PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
PRODUCT_NAME = SwiftFormat;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -1311,7 +1311,7 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 0.48.7;
MARKETING_VERSION = 0.48.8;
PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
PRODUCT_NAME = SwiftFormat;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
2 changes: 1 addition & 1 deletion Tests/Info.plist
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.48.7</string>
<string>0.48.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit c8abbd2

Please sign in to comment.