From c8b6880223a0d82e24ed98177a86293611bd56b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihat=20Gu=CC=88ndu=CC=88z?= Date: Fri, 24 Apr 2020 19:02:37 +0200 Subject: [PATCH 1/9] Update Formula to version 4.2.0 --- Formula/bartycrouch.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/bartycrouch.rb b/Formula/bartycrouch.rb index 169f092..c5646cb 100644 --- a/Formula/bartycrouch.rb +++ b/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.1.1", :revision => "201b0b02c196dcda14c806a539ab963284abeeaf" + url "https://github.com/Flinesoft/BartyCrouch.git", :tag => "4.2.0", :revision => "49b4cf27d5b521abf615d4ccb7754d642205f802" head "https://github.com/Flinesoft/BartyCrouch.git" depends_on :xcode => ["11.4", :build] From bcc6aa286f47be6ad9e4feda67069af17744b2fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihat=20Gu=CC=88ndu=CC=88z?= Date: Fri, 24 Apr 2020 19:21:16 +0200 Subject: [PATCH 2/9] Add new After Release Checlist to Contributing section --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index d534469..1fa7e04 100644 --- a/README.md +++ b/README.md @@ -405,5 +405,12 @@ See the file [MIGRATION_GUIDES.md](https://github.com/Flinesoft/BartyCrouch/blob Contributions are welcome. Feel free to open an issue on GitHub with your ideas or implement an idea yourself and post a pull request. If you want to contribute code, please try to follow the same syntax and semantic in your **commit messages** (see rationale [here](http://chris.beams.io/posts/git-commit/)). Also, please make sure to add an entry to the `CHANGELOG.md` file which explains your change. +After Release Checklist: + +1. Run `make portable_zip` to generate `.build/release/portable_bartycrouch.zip` +2. Create new release with text from new `CHANGELOG.md` section & attach `portable_bartycrouch.zip` as binary +2. Update `tag` and `revision` in `Formula/bartycrouch.rb`, commit & push change +3. Run `brew bump-formula-pr bartycrouch --tag= --revision=` + ## License This library is released under the [MIT License](http://opensource.org/licenses/MIT). See LICENSE for details. From 447a1ea0355bd57aff397f922bba6a9baa9cdd44 Mon Sep 17 00:00:00 2001 From: Manabu Nakazawa Date: Sun, 3 May 2020 21:44:57 +1000 Subject: [PATCH 3/9] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1fa7e04..1938ff1 100644 --- a/README.md +++ b/README.md @@ -247,7 +247,7 @@ tasks = ["interfaces", "code", "transform", "normalize"] - `codePaths`: The directory / directories to search for Swift code files. - `localizablePaths`: The enclosing path(s) containing the localized `Localizable.strings` files. -- `defaultsToKeys`: Add new keys both as key and value. +- `defaultToKeys`: Add new keys both as key and value. - `additive`: Prevents cleaning up keys not found in code. - `customFunction`: Use alternative name to `NSLocalizedString`. - `customLocalizableName`: Use alternative name for `Localizable.strings`. From d31cf12e20cffdade9f8306fe5200361d84fb6f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihat=20G=C3=BCnd=C3=BCz?= Date: Sun, 3 May 2020 14:27:32 +0200 Subject: [PATCH 4/9] [README.md] Fix some typos & update to `paths` --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1938ff1..e13ea62 100644 --- a/README.md +++ b/README.md @@ -140,16 +140,14 @@ emptyValues = true This is the default configuration of BartyCrouch and should work for most projects as is. In order to use BartyCrouch to its extent, it is recommended though to consider making the following changes: -1. To speed up execution time provide more specific paths for any key containing `path` if possible. (especially in the `update.transform` section, e.g. `"App/Sources"` for `codePath` or `"App/Supporting Files"` for `supportedLanguageEnumPath` ) +1. To speed it up significantly, provide more specific paths for any key containing `path` if possible (especially in the `update.transform` section, e.g. `["App/Sources"]` for `codePaths` or `["App/Supporting Files"]` for `supportedLanguageEnumPaths`). 2. Remove the `code` task if your project is Swift-only and you use the new [`transform` update task](#localization-workflow-via-transform). -3. If you are using [SwiftGen](https://github.com/SwiftGen/SwiftGen#strings) with the `structured-swift4` template, you will probably want to user the `transform` task and change its `transformer` option to `swiftgenStructured`. +3. If you are using [SwiftGen](https://github.com/SwiftGen/SwiftGen#strings) with the `structured-swift4` template, you will probably want to use the `transform` task and change its `transformer` option to `swiftgenStructured`. 4. If you decided to use the `transform` task, create a new file in your project (e.g. under `SupportingFiles`) named `BartyCrouch.swift` and copy the following code: ```swift -// // This file is required in order for the `transform` task of the translation helper tool BartyCrouch to work. // See here for more details: https://github.com/Flinesoft/BartyCrouch -// import Foundation From 5b27e331b6ba33593d85a0591d5637fb0a610c85 Mon Sep 17 00:00:00 2001 From: Christian Tietze Date: Tue, 19 May 2020 09:56:18 +0200 Subject: [PATCH 5/9] transform MD to HTML in
summary lines --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e13ea62..e49f633 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Checkout [this blog post](https://medium.com/@Jeehut/localization-in-swift-like- ### Installation
-Via [Homebrew](https://brew.sh/) +Via Homebrew To install Bartycrouch the first time, simply run the command: @@ -82,7 +82,7 @@ brew upgrade bartycrouch
-Via [Mint](https://github.com/yonaskolb/Mint) +Via Mint To **install** or update to the latest version of BartyCrouch simply run this command: @@ -232,7 +232,7 @@ In order to configure which tasks are executed, edit this section in the config tasks = ["interfaces", "code", "transform", "normalize"] ``` -
Options for `interfaces` +
Options for interfaces - `paths`: The directory / directories to search for Storyboards & XIB files. - `defaultToBase`: Add Base translation as value to new keys. @@ -241,7 +241,7 @@ tasks = ["interfaces", "code", "transform", "normalize"]
-
Options for `code` +
Options for code - `codePaths`: The directory / directories to search for Swift code files. - `localizablePaths`: The enclosing path(s) containing the localized `Localizable.strings` files. @@ -254,7 +254,7 @@ tasks = ["interfaces", "code", "transform", "normalize"]
-
Options for `transform` +
Options for transform - `codePaths`: The directory / directories to search for Swift code files. - `localizablePaths`: The enclosing path(s) containing the localized `Localizable.strings` files. @@ -266,7 +266,7 @@ tasks = ["interfaces", "code", "transform", "normalize"]
-
Options for `translate` +
Options for translate - `paths`: The directory / directories to search for Strings files. - `secret`: Your [Microsoft Translator Text API Subscription Key](https://docs.microsoft.com/en-us/azure/cognitive-services/translator/translator-text-how-to-signup#authentication-key). @@ -274,7 +274,7 @@ tasks = ["interfaces", "code", "transform", "normalize"]
-
Options for `normalize` +
Options for normalize - `paths`: The directory / directories to search for Strings files. - `sourceLocale`: The source language to harmonize keys of other languages with. From 238a9d1c41f975fa58c3baaf173c2ab82a7131cc Mon Sep 17 00:00:00 2001 From: Christian Tietze Date: Tue, 19 May 2020 09:59:52 +0200 Subject: [PATCH 6/9] fix missing closing bold asterisks --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e49f633..c02013f 100644 --- a/README.md +++ b/README.md @@ -213,7 +213,7 @@ Also the following command line options can be provided: - **`-v`, `--verbose`**: Prints more detailed information about the executed command. - **`-x`, `--xcode-output`**: Prints warnings & errors in Xcode compatible format. - **`-w`, `--fail-on-warnings`**: Returns a failed status code if any warning is encountered. -- **`-p`, `--path`: Specifies a different path than current to run BartyCrouch from there. +- **`-p`, `--path`**: Specifies a different path than current to run BartyCrouch from there. ### `update` subcommand From 25a8d447773b71c38bf0262a3e6e84971eb40bd2 Mon Sep 17 00:00:00 2001 From: Weston Bustraan Date: Fri, 25 Sep 2020 20:04:02 -0400 Subject: [PATCH 7/9] Updated swift-syntax to match Swift 5.3 --- Package.resolved | 4 ++-- Package.swift | 2 +- .../BartyCrouchKit/FileHandling/TranslateTransformer.swift | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Package.resolved b/Package.resolved index 45a6613..25252fd 100644 --- a/Package.resolved +++ b/Package.resolved @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/apple/swift-syntax.git", "state": { "branch": null, - "revision": "0688b9cfc4c3dd234e4f55f1f056b2affc849873", - "version": "0.50200.0" + "revision": "844574d683f53d0737a9c6d706c3ef31ed2955eb", + "version": "0.50300.0" } }, { diff --git a/Package.swift b/Package.swift index 21d1986..6ab6d31 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ let package = Package( .package(name: "Rainbow", url: "https://github.com/onevcat/Rainbow.git", from: "3.1.5"), .package(name: "SwiftCLI", url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.1"), .package(name: "Toml", url: "https://github.com/jdfergason/swift-toml.git", .branch("master")), - .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .exact("0.50200.0")), + .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .exact("0.50300.0")), ], targets: [ .target( diff --git a/Sources/BartyCrouchKit/FileHandling/TranslateTransformer.swift b/Sources/BartyCrouchKit/FileHandling/TranslateTransformer.swift index 928e37c..8b98819 100644 --- a/Sources/BartyCrouchKit/FileHandling/TranslateTransformer.swift +++ b/Sources/BartyCrouchKit/FileHandling/TranslateTransformer.swift @@ -188,7 +188,8 @@ class TranslateTransformer: SyntaxRewriter { leftParen: SyntaxFactory.makeLeftParenToken(), argumentList: SyntaxFactory.makeTupleExprElementList([keyArgument, commentArgument]), rightParen: SyntaxFactory.makeRightParenToken(), - trailingClosure: nil + trailingClosure: nil, + additionalTrailingClosures: nil ) ) } From 5f634603f947c962e8666d72fb1bee67a9b048a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihat=20Gu=CC=88ndu=CC=88z?= Date: Mon, 28 Sep 2020 20:22:43 +0200 Subject: [PATCH 8/9] Upgrade docs to Xcode 12 & add missing Changelog entry --- .jamithub/projconf.json | 1 - .projlint.yml | 85 ----------------------------------------- CHANGELOG.md | 3 +- Formula/bartycrouch.rb | 2 +- Package.swift | 2 +- README.md | 4 +- beak.swift | 29 -------------- 7 files changed, 6 insertions(+), 120 deletions(-) delete mode 100644 .jamithub/projconf.json delete mode 100644 .projlint.yml delete mode 100644 beak.swift diff --git a/.jamithub/projconf.json b/.jamithub/projconf.json deleted file mode 100644 index 65a5755..0000000 --- a/.jamithub/projconf.json +++ /dev/null @@ -1 +0,0 @@ -{"projectType":"commandLineTool","sourceAvailability":"open"} \ No newline at end of file diff --git a/.projlint.yml b/.projlint.yml deleted file mode 100644 index 8ac6799..0000000 --- a/.projlint.yml +++ /dev/null @@ -1,85 +0,0 @@ -shared_variables: - rightholder: Flinesoft - project_name: BartyCrouch - -rules: - - xcode_build_phases: - project_path: <:project_name:>.xcodeproj - target_name: <:project_name:>Kit - run_scripts: - SwiftLint: | - if [ "${CONFIGURATION}" = "Debug" ]; then - if which swiftlint > /dev/null; then - swiftlint --quiet - else - echo "warning: SwiftLint not installed, download it from https://github.com/realm/SwiftLint" - fi - fi - - ProjLint: | - if [ "${CONFIGURATION}" = "Debug" ]; then - if which projlint > /dev/null; then - projlint lint --xcode --timeout 2 --ignore-network-errors - else - echo "warning: ProjLint not installed, download it from https://github.com/JamitLabs/ProjLint" - fi - fi - - - xcode_project_navigator: - project_path: <:project_name:>.xcodeproj - sorted: - - Sources/<:project_name:> - - Sources/<:project_name:>Kit - - Sources/SupportingFiles - - Tests/<:project_name:>KitTests - - Tests/SupportingFiles - inner_group_order: - - assets - - entitlements - - plists - - strings - - others - - [code_files, interfaces] - - folders - structure: - - Sources: - - <:project_name:> - - <:project_name:>Kit - - SupportingFiles: - - Info.plist - - Tests: - - <:project_name:>KitTests - - SupportingFiles: - - Info.plist - - RootFiles: - - beak.swift - - .projlint.yml - - .swiftlint.yml - - Package.swift - - Products - - file_content_template: - matching: - .swiftlint.yml: - template_url: "https://raw.githubusercontent.com/JamitLabs/ProjLintTemplates/master/Framework/SwiftLint.stencil" - parameters: - rightholder: <:rightholder:> - .projlint.yml: - template_url: "https://raw.githubusercontent.com/JamitLabs/ProjLintTemplates/master/Framework/ProjLint.stencil" - parameters: - rightholder: <:rightholder:> - project_name: <:project_name:> - - file_existence: - existing_paths: - - .gitignore - - .swiftlint.yml - - CODE_OF_CONDUCT.md - - CONTRIBUTING.md - - CHANGELOG.md - - LICENSE - - README.md - - <:project_name:>.podspec - - Package.swift - - beak.swift - - <:project_name:>.xcodeproj/xcshareddata/IDETemplateMacros.plist - - Sources/SupportingFiles/Info.plist - - Tests/SupportingFiles/Info.plist diff --git a/CHANGELOG.md b/CHANGELOG.md index 959a0ab..b9f6324 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,8 @@ If needed, pluralize to `Tasks`, `PRs` or `Authors` and list multiple entries se ### Added - None. ### Changed -- None. +- Updated swift-syntax to match Swift 5.3. + Issues: [#199](https://github.com/Flinesoft/BartyCrouch/issues/199), [#201](https://github.com/Flinesoft/BartyCrouch/issues/201) | PR: [#204](https://github.com/Flinesoft/BartyCrouch/pull/204) | Author: [w8wjb](https://github.com/w8wjb) ### Deprecated - None. ### Removed diff --git a/Formula/bartycrouch.rb b/Formula/bartycrouch.rb index c5646cb..e710a51 100644 --- a/Formula/bartycrouch.rb +++ b/Formula/bartycrouch.rb @@ -4,7 +4,7 @@ class Bartycrouch < Formula url "https://github.com/Flinesoft/BartyCrouch.git", :tag => "4.2.0", :revision => "49b4cf27d5b521abf615d4ccb7754d642205f802" head "https://github.com/Flinesoft/BartyCrouch.git" - depends_on :xcode => ["11.4", :build] + depends_on :xcode => ["12.0", :build] def install system "make", "install", "prefix=#{prefix}" diff --git a/Package.swift b/Package.swift index 6ab6d31..0732e8b 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.2 +// swift-tools-version:5.3 import PackageDescription let package = Package( diff --git a/README.md b/README.md index c02013f..b474d72 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ Version: 4.2.0 - Swift: 5.2 + Swift: 5.3 License: MIT diff --git a/beak.swift b/beak.swift deleted file mode 100644 index e6d3f4e..0000000 --- a/beak.swift +++ /dev/null @@ -1,29 +0,0 @@ -// beak: kareman/SwiftShell @ .upToNextMajor(from: "4.1.2") -// beak: Flinesoft/HandySwift @ .upToNextMajor(from: "2.7.0") - -import HandySwift -import Foundation -import SwiftShell - -// MARK: - Tasks -/// Installs project dependencies. -public func installDependencies() throws { - let spmCommand = "swift package resolve" - print("Installing dependencies via SPM: '\(spmCommand)'") - try runAndPrint(bash: spmCommand) - - let carthageCommand = "carthage bootstrap --platform macOS --cache-builds" - print("Installing dependencies via Carthage: '\(carthageCommand)'") - try runAndPrint(bash: carthageCommand) -} - -/// Updates project dependencies. -public func updateDependencies() throws { - let spmCommand = "swift package update" - print("Updating dependencies via SPM: '\(spmCommand)'") - try runAndPrint(bash: spmCommand) - - let carthageCommand = "carthage update --platform macOS --cache-builds" - print("Updating dependencies via Carthage: '\(carthageCommand)'") - try runAndPrint(bash: carthageCommand) -} From 4d7d519ee06a861322b3613b6fef1f4e6e0b0386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihat=20Gu=CC=88ndu=CC=88z?= Date: Mon, 28 Sep 2020 20:30:24 +0200 Subject: [PATCH 9/9] Bump version num & finalize new Changelog section --- BartyCrouch.podspec | 2 +- CHANGELOG.md | 8 ++++++-- README.md | 4 ++-- Sources/BartyCrouch/main.swift | 2 +- Sources/SupportingFiles/Info.plist | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/BartyCrouch.podspec b/BartyCrouch.podspec index cba1cd9..a12555a 100644 --- a/BartyCrouch.podspec +++ b/BartyCrouch.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "BartyCrouch" - s.version = "4.2.0" + s.version = "4.3.0" s.summary = "Localization/I18n: Incrementally update/translate your Strings files from .swift, .h, .m(m), .storyboard or .xib files." s.description = <<-DESC diff --git a/CHANGELOG.md b/CHANGELOG.md index b9f6324..533c088 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,8 +21,7 @@ If needed, pluralize to `Tasks`, `PRs` or `Authors` and list multiple entries se ### Added - None. ### Changed -- Updated swift-syntax to match Swift 5.3. - Issues: [#199](https://github.com/Flinesoft/BartyCrouch/issues/199), [#201](https://github.com/Flinesoft/BartyCrouch/issues/201) | PR: [#204](https://github.com/Flinesoft/BartyCrouch/pull/204) | Author: [w8wjb](https://github.com/w8wjb) +- None. ### Deprecated - None. ### Removed @@ -32,6 +31,11 @@ If needed, pluralize to `Tasks`, `PRs` or `Authors` and list multiple entries se ### Security - None. +## [4.3.0] - 2020-09-28 +### Changed +- Updated swift-syntax to match Swift 5.3. + Issues: [#199](https://github.com/Flinesoft/BartyCrouch/issues/199), [#201](https://github.com/Flinesoft/BartyCrouch/issues/201) | PR: [#204](https://github.com/Flinesoft/BartyCrouch/pull/204) | Author: [w8wjb](https://github.com/w8wjb) + ## [4.2.0] - 2020-04-24 ### Added - Added new `-p` / `--path` option to run BartyCrouch from a different path than current. diff --git a/README.md b/README.md index b474d72..8d99c0f 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ - Version: 4.2.0 + Version: 4.3.0 Swift: 5.3 diff --git a/Sources/BartyCrouch/main.swift b/Sources/BartyCrouch/main.swift index 74d08b0..534ef97 100644 --- a/Sources/BartyCrouch/main.swift +++ b/Sources/BartyCrouch/main.swift @@ -5,7 +5,7 @@ import SwiftCLI // MARK: - CLI let cli = CLI( name: "bartycrouch", - version: "4.2.0", + version: "4.3.0", description: "Incrementally update & translate your Strings files from code or interface files." ) diff --git a/Sources/SupportingFiles/Info.plist b/Sources/SupportingFiles/Info.plist index 4b6c275..d3ef75f 100644 --- a/Sources/SupportingFiles/Info.plist +++ b/Sources/SupportingFiles/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.2.0 + 4.3.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright