Update for 0.49.6 release

nicklockwood · Mar 15, 2022 · 6f6860f · 6f6860f
1 parent 8926240
commit 6f6860f
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## [0.49.6](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.49.6) (2022-03-15)
+
+- Fixed bug where `redundantParens` rule removed required parens in `any` type expressions
+- Fixed whitespace behavior around `some`/`any` keywords
+- Fixed crash when `// swiftformat:sort` was applied to an enum with only one case
+- SwiftFormat can now be built on Windows
+
 ## [0.49.5](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.49.5) (2022-03-06)
 
 - Fixed bug where `redundantClosure` incorrectly inlined throwing closures

diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat
diff --git a/EditorExtension/Shared/OptionsStore.swift b/EditorExtension/Shared/OptionsStore.swift
@@ -101,7 +101,7 @@ struct OptionsStore {
     }
 
     var options: [SavedOption] {
-        return try! load().map(SavedOption.init)
+        return try! load().map { try SavedOption((id: $0, arg: $1)) }
     }
 
     func save(_ option: SavedOption) {

diff --git a/README.md b/README.md
@@ -97,7 +97,7 @@ And then run it using:
 $ mint run swiftformat
 ```
 
-Or if you prefer, you can check out and build SwiftFormat manually on macOS or Linux as follows:
+Or if you prefer, you can check out and build SwiftFormat manually on macOS, Linux or Windows as follows:
 
 ```bash
 $ git clone https://github.com/nicklockwood/SwiftFormat
@@ -722,7 +722,7 @@ FAQ
 
 *Q. What platforms does SwiftFormat support?*
 
-> A. SwiftFormat works on macOS 10.13 (High Sierra) and above, and also runs on Ubuntu Linux.
+> A. SwiftFormat works on macOS 10.13 (High Sierra) and above, and also runs on Ubuntu Linux and Windows.
 
 
 *Q. What versions of Swift are supported?*

diff --git a/Sources/Formatter.swift b/Sources/Formatter.swift
@@ -2,7 +2,7 @@
 //  Formatter.swift
 //  SwiftFormat
 //
-//  Version 0.49.5
+//  Version 0.49.6
 //
 //  Created by Nick Lockwood on 12/08/2016.
 //  Copyright 2016 Nick Lockwood

diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift
@@ -32,7 +32,7 @@
 import Foundation
 
 /// The current SwiftFormat version
-let swiftFormatVersion = "0.49.5"
+let swiftFormatVersion = "0.49.6"
 public let version = swiftFormatVersion
 
 /// The standard SwiftFormat config file name

diff --git a/Sources/Tokenizer.swift b/Sources/Tokenizer.swift
@@ -2,7 +2,7 @@
 //  Tokenizer.swift
 //  SwiftFormat
 //
-//  Version 0.49.5
+//  Version 0.49.6
 //
 //  Created by Nick Lockwood on 11/08/2016.
 //  Copyright 2016 Nick Lockwood

diff --git a/SwiftFormat.podspec.json b/SwiftFormat.podspec.json
@@ -1,6 +1,6 @@
 {
   "name": "SwiftFormat",
-  "version": "0.49.5",
+  "version": "0.49.6",
   "license": {
     "type": "MIT",
     "file": "LICENSE.md"
@@ -10,7 +10,7 @@
   "authors": "Nick Lockwood",
   "source": {
     "git": "https://github.com/nicklockwood/SwiftFormat.git",
-    "tag": "0.49.5"
+    "tag": "0.49.6"
   },
   "default_subspecs": "Core",
   "subspecs": [
@@ -33,6 +33,6 @@
     "tvos": "11.0",
     "osx": "10.12"
   },
-  "swift_versions": ["4.2", "5.0", "5.1", "5.2", "5.3", "5.4", "5.5"],
+  "swift_versions": ["4.2", "5.0", "5.1", "5.2", "5.3", "5.4", "5.5", "5.6"],
   "requires_arc": true
 }
diff --git a/SwiftFormat.xcodeproj/project.pbxproj b/SwiftFormat.xcodeproj/project.pbxproj
@@ -1080,7 +1080,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.49.5;
+				MARKETING_VERSION = 0.49.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1108,7 +1108,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.49.5;
+				MARKETING_VERSION = 0.49.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1204,7 +1204,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.49.5;
+				MARKETING_VERSION = 0.49.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1234,7 +1234,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.49.5;
+				MARKETING_VERSION = 0.49.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1262,7 +1262,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.49.5;
+				MARKETING_VERSION = 0.49.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
 				PRODUCT_NAME = SwiftFormat;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1292,7 +1292,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.49.5;
+				MARKETING_VERSION = 0.49.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
 				PRODUCT_NAME = SwiftFormat;
 				PROVISIONING_PROFILE_SPECIFIER = "";