diff --git a/CHANGELOG.md b/CHANGELOG.md index aa0105a6..3c45bcb9 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Change Log +## [0.50.4](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.50.4) (2022-11-23) + +- Added Swift package command plugin +- Added `docComments` rule to convert between regular and documentation comments +- Fixed `redundantLet` rule incorrectly stripping `let` inside Result Builders +- Fixed `void` rule in cases where `Void` has been locally shadowed +- Fixed `fileHeader` rule when file only contains header comment +- Fixed unexpected indent and spurious `wrap` warning for blank lines +- Fixed parsing bug in `redundantSelf` rule + ## [0.50.3](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.50.3) (2022-10-19) - Fixed bug where `redundantFileprivate` rule could break Array extensions using type sugar diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat index c1ee5442..74a0d465 100755 Binary files a/CommandLineTool/swiftformat and b/CommandLineTool/swiftformat differ diff --git a/Sources/Formatter.swift b/Sources/Formatter.swift index 26cfef6c..9a4ad509 100644 --- a/Sources/Formatter.swift +++ b/Sources/Formatter.swift @@ -2,7 +2,7 @@ // Formatter.swift // SwiftFormat // -// Version 0.50.3 +// Version 0.50.4 // // Created by Nick Lockwood on 12/08/2016. // Copyright 2016 Nick Lockwood diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift index 92aaa3f2..55e5465e 100644 --- a/Sources/SwiftFormat.swift +++ b/Sources/SwiftFormat.swift @@ -32,7 +32,7 @@ import Foundation /// The current SwiftFormat version -let swiftFormatVersion = "0.50.3" +let swiftFormatVersion = "0.50.4" public let version = swiftFormatVersion /// The standard SwiftFormat config file name diff --git a/Sources/Tokenizer.swift b/Sources/Tokenizer.swift index 97ee352e..34fcc802 100644 --- a/Sources/Tokenizer.swift +++ b/Sources/Tokenizer.swift @@ -2,7 +2,7 @@ // Tokenizer.swift // SwiftFormat // -// Version 0.50.3 +// Version 0.50.4 // // Created by Nick Lockwood on 11/08/2016. // Copyright 2016 Nick Lockwood diff --git a/SwiftFormat.podspec.json b/SwiftFormat.podspec.json index fd0caedf..11277420 100644 --- a/SwiftFormat.podspec.json +++ b/SwiftFormat.podspec.json @@ -1,6 +1,6 @@ { "name": "SwiftFormat", - "version": "0.50.3", + "version": "0.50.4", "license": { "type": "MIT", "file": "LICENSE.md" @@ -10,7 +10,7 @@ "authors": "Nick Lockwood", "source": { "git": "https://github.com/nicklockwood/SwiftFormat.git", - "tag": "0.50.3" + "tag": "0.50.4" }, "default_subspecs": "Core", "subspecs": [ diff --git a/SwiftFormat.xcodeproj/project.pbxproj b/SwiftFormat.xcodeproj/project.pbxproj index 54e5ba53..ec18ff91 100644 --- a/SwiftFormat.xcodeproj/project.pbxproj +++ b/SwiftFormat.xcodeproj/project.pbxproj @@ -619,7 +619,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0810; - LastUpgradeCheck = 1400; + LastUpgradeCheck = 1410; ORGANIZATIONNAME = "Nick Lockwood"; TargetAttributes = { 015AF2B61DC6A538008F0A8C = { @@ -922,6 +922,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 10.14; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormatTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_COMPILATION_MODE = wholemodule; @@ -942,6 +943,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 10.14; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormatTests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1086,7 +1088,8 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 0.50.3; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MARKETING_VERSION = 0.50.4; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1115,7 +1118,8 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 0.50.3; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MARKETING_VERSION = 0.50.4; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1134,6 +1138,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 10.14; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormatTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; @@ -1152,6 +1157,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 10.14; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormatTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; @@ -1168,6 +1174,7 @@ DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)Tool"; PRODUCT_NAME = swiftformat; PROVISIONING_PROFILE = ""; @@ -1185,6 +1192,7 @@ DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = 8VQKF583ED; ENABLE_HARDENED_RUNTIME = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)Tool"; PRODUCT_NAME = swiftformat; PROVISIONING_PROFILE = ""; @@ -1216,7 +1224,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 0.50.3; + MARKETING_VERSION = 0.50.4; PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode"; PRODUCT_NAME = "SwiftFormat for Xcode"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1247,7 +1255,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 0.50.3; + MARKETING_VERSION = 0.50.4; PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode"; PRODUCT_NAME = "SwiftFormat for Xcode"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1275,7 +1283,7 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 0.50.3; + MARKETING_VERSION = 0.50.4; PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension"; PRODUCT_NAME = SwiftFormat; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1305,7 +1313,7 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 0.50.3; + MARKETING_VERSION = 0.50.4; PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension"; PRODUCT_NAME = SwiftFormat; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/SwiftFormat.xcodeproj/xcshareddata/xcschemes/Performance Tests.xcscheme b/SwiftFormat.xcodeproj/xcshareddata/xcschemes/Performance Tests.xcscheme index 8d36ac04..6896846a 100644 --- a/SwiftFormat.xcodeproj/xcshareddata/xcschemes/Performance Tests.xcscheme +++ b/SwiftFormat.xcodeproj/xcshareddata/xcschemes/Performance Tests.xcscheme @@ -1,6 +1,6 @@