Merge branch 'release/4.1.0' into versions

.gitignore

@@ -1,12 +1,45 @@
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
 # Xcode
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
-## Build generated
+## User settings
+xcuserdata/
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
 build/
 DerivedData/
-
-## Various settings
+*.moved-aside
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -15,16 +48,14 @@ DerivedData/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
+
+## App packaging
 *.ipa
+*.dSYM.zip
+*.dSYM
 
 ## Playgrounds
 timeline.xctimeline
@@ -34,6 +65,13 @@ playground.xcworkspace
 #
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
+# Package.pins
+# Package.resolved
+# *.xcodeproj
+#
+# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
+# hence it is not needed unless you have added a package configuration file to your project
+.swiftpm
 .build/
 
 # CocoaPods
@@ -43,25 +81,36 @@ playground.xcworkspace
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
 
 # Carthage
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
-Carthage/Checkouts
-Carthage/Build
+# Carthage/Checkouts
+
+Carthage/Build/
+
+# Accio dependency management
+Dependencies/
+.accio/
 
 # fastlane
 #
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
-# screenshots whenever they are needed.
+# It is recommended to not store the screenshots in the git repo.
+# Instead, use fastlane to re-generate the screenshots whenever they are needed.
 # For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
 
 fastlane/report.xml
-fastlane/screenshots
-*.storyboard.strings
-TestExample*.strings
-*.strings.tmp
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
 
-# Swift Package Manager
-BartyCrouch.xcodeproj/
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/

.swiftlint.yml

@@ -4,7 +4,6 @@ opt_in_rules:
 - attributes
 - closure_end_indentation
 - closure_spacing
-- conditional_returns_on_newline
 - contains_over_first_not_nil
 - convenience_type
 - empty_count
@@ -14,8 +13,6 @@ opt_in_rules:
 - explicit_type_interface
 - extension_access_modifier
 - fallthrough
-- fatal_error_message
-- file_header
 - file_name
 - file_types_order
 - first_where
@@ -29,12 +26,10 @@ opt_in_rules:
 - modifier_order
 - multiline_arguments
 - multiline_arguments_brackets
-- multiline_function_chains
 - multiline_literal_brackets
 - multiline_parameters
 - multiline_parameters_brackets
 - nimble_operator
-- no_extension_access_modifier
 - number_separator
 - object_literal
 - operator_usage_whitespace
@@ -76,19 +71,15 @@ included:
 excluded:
 - Tests/LinuxMain.swift
 - Tests/Resources
+- Tests/BartyCrouchKitTests/CommandLine
+- Tests/BartyCrouchKitTests/FileHandling
 
 # Rule Configurations
-conditional_returns_on_newline:
-  if_only: true
-
 explicit_type_interface:
   allow_redundancy: true
   excluded:
     - local
 
-file_header:
-  required_pattern: \/\/  Created by [^\(\)\d\n]+ on \S{6,10}\.
-
 file_name:
   suffix_pattern: "Extensions?|\\+.*"
 
@@ -101,6 +92,8 @@ file_types_order:
 identifier_name:
   excluded:
     - id
+    - db
+    - to
 
 line_length: 160
 

BartyCrouch.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "BartyCrouch"
-  s.version      = "4.0.2"
+  s.version      = "4.1.0"
   s.summary      = "Localization/I18n: Incrementally update/translate your Strings files from .swift, .h, .m(m), .storyboard or .xib files."
 
   s.description  = <<-DESC
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.license      = { :type => "MIT", :file => "LICENSE" }
 
   s.author             = { "Cihat Gündüz" => "cocoapods@cihatguenduez.de" }
-  s.social_media_url   = "https://twitter.com/Dschee"
+  s.social_media_url   = "https://twitter.com/Jeehut"
 
   s.source         = { :http => "#{s.homepage}/releases/download/#{s.version}/portable_bartycrouch.zip" }
   s.preserve_paths = "*"

CHANGELOG.md

@@ -1,7 +1,21 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
+
+<details>
+<summary>Formatting Rules for Entries</summary>
+Each entry should use the following format:
+
+```markdown
+- Summary of what was changed in a single line using past tense & followed by two whitespaces.  
+  Issue: [#0](https://github.com/Flinesoft/BartyCrouch/issues/0) | PR: [#0](https://github.com/Flinesoft/BartyCrouch/pull/0) | Author: [Cihat Gündüz](https://github.com/Jeehut)
+```
+
+Note that at the end of the summary line, you need to add two whitespaces (`  `) for correct rendering on GitHub.
+
+If needed, pluralize to `Tasks`, `PRs` or `Authors` and list multiple entries separated by `, `. Also, remove entries not needed in the second line.
+</details>
 
 ## [Unreleased]
 ### Added
@@ -17,6 +31,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ### Security
 - None.
 
+## [4.1.0] - 2020-04-10
+### Added
+- Added support for specifying multiple paths for all `path` options.  
+  Issue: [#155](https://github.com/Flinesoft/BartyCrouch/issues/155) | PR: [#167](https://github.com/Flinesoft/HandySwift/pull/167) | Author: [Frederick Pietschmann](https://github.com/fredpi)
+### Changed
+- Upgraded SwiftSyntax to Swift 5.2 version `0.50200.0`.  
+  Issue: [#170](https://github.com/Flinesoft/BartyCrouch/issues/170) | PRs: [#171](https://github.com/Flinesoft/BartyCrouch/pull/171), [#172](https://github.com/Flinesoft/BartyCrouch/pull/172), [#173](https://github.com/Flinesoft/BartyCrouch/pull/173) | Authors: [Tomoya Hirano](https://github.com/noppefoxwolf), [Cihat Gündüz](https://github.com/Jeehut)
+- Updated all dependencies to their latest versions to prevent warnings.  
+  PR: [#172](https://github.com/Flinesoft/BartyCrouch/pull/172) | Author: [Cihat Gündüz](https://github.com/Jeehut)
+
 ## [4.0.2] - 2019-05-13
 ### Fixed
 - Make Code Transform, Normalize & Lint fast again (up to 50x faster). Fixes [#128](https://github.com/Flinesoft/BartyCrouch/issues/128) by [Frederick Pietschmann](https://github.com/fredpi).

Demo/Untouched/Demo/AppDelegate.swift

@@ -1,5 +1,3 @@
-//  Created by Cihat Gündüz on 18.01.19.
-
 import UIKit
 
 @UIApplicationMain

Demo/Untouched/Demo/ViewController.swift

@@ -1,5 +1,3 @@
-//  Created by Cihat Gündüz on 18.01.19.
-
 import UIKit
 
 class ViewController: UIViewController {

Demo/Untouched/DemoTests/DemoTests.swift

@@ -1,5 +1,3 @@
-//  Created by Cihat Gündüz on 18.01.19.
-
 import XCTest
 @testable import Demo
 

Demo/Untouched/DemoUITests/DemoUITests.swift

@@ -1,5 +1,3 @@
-//  Created by Cihat Gündüz on 18.01.19.
-
 import XCTest
 
 class DemoUITests: XCTestCase {

Formula/bartycrouch.rb

@@ -1,7 +1,7 @@
 class Bartycrouch < Formula
   desc "Incrementally update/translate your Strings files"
   homepage "https://github.com/Flinesoft/BartyCrouch"
-  url "https://github.com/Flinesoft/BartyCrouch.git", :tag => "4.0.1", :revision => "b7e940a6383c9d1f013288081dcc2a395c68448b"
+  url "https://github.com/Flinesoft/BartyCrouch.git", :tag => "4.0.2", :revision => "7d4cfec9530c7364727a4461712b54909f8d4a90"
   head "https://github.com/Flinesoft/BartyCrouch.git"
 
   depends_on :xcode => ["10.2", :build]

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2018 Flinesoft
+Copyright (c) 2016-2020 Flinesoft (alias Cihat Gündüz)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/Flinesoft/HandySwift.git",
         "state": {
           "branch": null,
-          "revision": "f736ec0ab264269cd4df91d6a685b4c78292cd76",
-          "version": "2.8.0"
+          "revision": "80a9697f586cba84278a48539c58b1b1afc61e13",
+          "version": "3.2.0"
         }
       },
       {
@@ -33,35 +33,35 @@
         "repositoryURL": "https://github.com/onevcat/Rainbow.git",
         "state": {
           "branch": null,
-          "revision": "797a68d0a642609424b08f11eb56974a54d5f6e2",
-          "version": "3.1.4"
+          "revision": "9c52c1952e9b2305d4507cf473392ac2d7c9b155",
+          "version": "3.1.5"
         }
       },
       {
         "package": "SwiftSyntax",
         "repositoryURL": "https://github.com/apple/swift-syntax.git",
         "state": {
           "branch": null,
-          "revision": "43aa4a19b8105a803d8149ad2a86aa53a77efef3",
-          "version": "0.50000.0"
+          "revision": "0688b9cfc4c3dd234e4f55f1f056b2affc849873",
+          "version": "0.50200.0"
         }
       },
       {
         "package": "Toml",
-        "repositoryURL": "https://github.com/jdfergason/swift-toml.git",
+        "repositoryURL": "https://github.com/Jeehut/swift-toml.git",
         "state": {
-          "branch": null,
-          "revision": "f4a3d9fbd94a855d6f85989c7e4c29e0ad75999c",
-          "version": "1.0.0"
+          "branch": "master",
+          "revision": "e0f7f568de4a9ae760a3b2d495616e180fafa5ac",
+          "version": null
         }
       },
       {
         "package": "SwiftCLI",
         "repositoryURL": "https://github.com/jakeheis/SwiftCLI.git",
         "state": {
           "branch": null,
-          "revision": "5318c37d3cacc8780f50b87a8840a6774320ebdf",
-          "version": "5.2.2"
+          "revision": "c72c4564f8c0a24700a59824880536aca45a4cae",
+          "version": "6.0.1"
         }
       }
     ]