From b82be54e9e3b59d3fe43ea3ad8734481ae54d02a Mon Sep 17 00:00:00 2001 From: David Jennes Date: Tue, 1 Jan 2019 16:31:48 +0100 Subject: [PATCH 1/4] Update copyright notices --- LICENSE | 2 +- README.md | 6 ++++++ Sources/StencilSwiftKit/CallMacroNodes.swift | 2 +- Sources/StencilSwiftKit/Context.swift | 8 +++----- Sources/StencilSwiftKit/Environment.swift | 2 +- Sources/StencilSwiftKit/Filters+Numbers.swift | 2 +- Sources/StencilSwiftKit/Filters+Strings.swift | 2 +- Sources/StencilSwiftKit/Filters.swift | 2 +- Sources/StencilSwiftKit/MapNode.swift | 3 +-- Sources/StencilSwiftKit/Parameters.swift | 2 +- Sources/StencilSwiftKit/SetNode.swift | 2 +- Sources/StencilSwiftKit/StencilSwiftTemplate.swift | 2 +- Sources/StencilSwiftKit/SwiftIdentifier.swift | 2 +- StencilSwiftKit.podspec | 9 +++++++-- Tests/StencilSwiftKitTests/CallNodeTests.swift | 4 ++-- Tests/StencilSwiftKitTests/ContextTests.swift | 8 +++----- Tests/StencilSwiftKitTests/MacroNodeTests.swift | 4 ++-- Tests/StencilSwiftKitTests/MapNodeTests.swift | 4 ++-- Tests/StencilSwiftKitTests/ParametersTests.swift | 4 ++-- Tests/StencilSwiftKitTests/ParseBoolTests.swift | 4 ++-- Tests/StencilSwiftKitTests/ParseEnumTests.swift | 4 ++-- Tests/StencilSwiftKitTests/ParseStringTests.swift | 4 ++-- Tests/StencilSwiftKitTests/SetNodeTests.swift | 4 ++-- Tests/StencilSwiftKitTests/StringFiltersTests.swift | 4 ++-- Tests/StencilSwiftKitTests/SwiftIdentifierTests.swift | 4 ++-- 25 files changed, 50 insertions(+), 44 deletions(-) diff --git a/LICENSE b/LICENSE index e1524b1e..942793ec 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 SwiftGen +Copyright (c) 2019 SwiftGen Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index d403ccad..959a0f25 100644 --- a/README.md +++ b/README.md @@ -85,3 +85,9 @@ For easier use, you can use the `StencilContext.enrich(context:parameters:enviro - `param`: the parsed parameters using the parser mentioned above. - `env`: a dictionary with all available environment variables (such as `PATH`). + +--- + +# Licence + +This code and tool is under the MIT Licence. See the `LICENSE` file in this repository. diff --git a/Sources/StencilSwiftKit/CallMacroNodes.swift b/Sources/StencilSwiftKit/CallMacroNodes.swift index 6ff3e33e..f769975a 100644 --- a/Sources/StencilSwiftKit/CallMacroNodes.swift +++ b/Sources/StencilSwiftKit/CallMacroNodes.swift @@ -1,6 +1,6 @@ // // StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Sources/StencilSwiftKit/Context.swift b/Sources/StencilSwiftKit/Context.swift index 6abb5f3c..39dd7a4b 100644 --- a/Sources/StencilSwiftKit/Context.swift +++ b/Sources/StencilSwiftKit/Context.swift @@ -1,9 +1,7 @@ // -// Context.swift -// Pods -// -// Created by David Jennes on 14/02/2017. -// +// StencilSwiftKit +// Copyright © 2019 SwiftGen +// MIT Licence // import Foundation diff --git a/Sources/StencilSwiftKit/Environment.swift b/Sources/StencilSwiftKit/Environment.swift index 575bbffe..13f474b4 100644 --- a/Sources/StencilSwiftKit/Environment.swift +++ b/Sources/StencilSwiftKit/Environment.swift @@ -1,6 +1,6 @@ // // StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Sources/StencilSwiftKit/Filters+Numbers.swift b/Sources/StencilSwiftKit/Filters+Numbers.swift index 95b86714..ce94a640 100644 --- a/Sources/StencilSwiftKit/Filters+Numbers.swift +++ b/Sources/StencilSwiftKit/Filters+Numbers.swift @@ -1,6 +1,6 @@ // // StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Sources/StencilSwiftKit/Filters+Strings.swift b/Sources/StencilSwiftKit/Filters+Strings.swift index 197a5be4..20a3a357 100644 --- a/Sources/StencilSwiftKit/Filters+Strings.swift +++ b/Sources/StencilSwiftKit/Filters+Strings.swift @@ -1,6 +1,6 @@ // // StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Sources/StencilSwiftKit/Filters.swift b/Sources/StencilSwiftKit/Filters.swift index 15920038..702ddbfe 100644 --- a/Sources/StencilSwiftKit/Filters.swift +++ b/Sources/StencilSwiftKit/Filters.swift @@ -1,6 +1,6 @@ // // StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Sources/StencilSwiftKit/MapNode.swift b/Sources/StencilSwiftKit/MapNode.swift index b0e39797..fef850e4 100644 --- a/Sources/StencilSwiftKit/MapNode.swift +++ b/Sources/StencilSwiftKit/MapNode.swift @@ -1,7 +1,6 @@ // // StencilSwiftKit -// Copyright (c) 2017 Olivier Halligon -// Created by Peter Livesey. +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Sources/StencilSwiftKit/Parameters.swift b/Sources/StencilSwiftKit/Parameters.swift index 4e555206..1c76348b 100644 --- a/Sources/StencilSwiftKit/Parameters.swift +++ b/Sources/StencilSwiftKit/Parameters.swift @@ -1,6 +1,6 @@ // // StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Sources/StencilSwiftKit/SetNode.swift b/Sources/StencilSwiftKit/SetNode.swift index 9c5516fb..a4438ea3 100644 --- a/Sources/StencilSwiftKit/SetNode.swift +++ b/Sources/StencilSwiftKit/SetNode.swift @@ -1,6 +1,6 @@ // // StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Sources/StencilSwiftKit/StencilSwiftTemplate.swift b/Sources/StencilSwiftKit/StencilSwiftTemplate.swift index 1b8a9829..bfbcc272 100644 --- a/Sources/StencilSwiftKit/StencilSwiftTemplate.swift +++ b/Sources/StencilSwiftKit/StencilSwiftTemplate.swift @@ -1,6 +1,6 @@ // // StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Sources/StencilSwiftKit/SwiftIdentifier.swift b/Sources/StencilSwiftKit/SwiftIdentifier.swift index 096b7fb9..d80cf9ad 100644 --- a/Sources/StencilSwiftKit/SwiftIdentifier.swift +++ b/Sources/StencilSwiftKit/SwiftIdentifier.swift @@ -1,6 +1,6 @@ // // StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/StencilSwiftKit.podspec b/StencilSwiftKit.podspec index 6d93d0a0..f86cf764 100644 --- a/StencilSwiftKit.podspec +++ b/StencilSwiftKit.podspec @@ -12,14 +12,19 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/SwiftGen/StencilSwiftKit' s.license = 'MIT' - s.author = { 'Olivier Halligon' => 'olivier@halligon.net' } + s.author = { + 'Olivier Halligon' => 'olivier@halligon.net' + } s.social_media_url = 'https://twitter.com/aligatr' s.platform = :osx, '10.9' s.swift_version = '4.2' s.cocoapods_version = '>= 1.4.0' - s.source = { git: 'https://github.com/SwiftGen/StencilSwiftKit.git', tag: s.version.to_s } + s.source = { + git: 'https://github.com/SwiftGen/StencilSwiftKit.git', + tag: s.version.to_s + } s.source_files = 'Sources/**/*.swift' s.dependency 'Stencil', '~> 0.13.1' diff --git a/Tests/StencilSwiftKitTests/CallNodeTests.swift b/Tests/StencilSwiftKitTests/CallNodeTests.swift index 201dfd55..8c33b10c 100644 --- a/Tests/StencilSwiftKitTests/CallNodeTests.swift +++ b/Tests/StencilSwiftKitTests/CallNodeTests.swift @@ -1,6 +1,6 @@ // -// StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// StencilSwiftKit UnitTests +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Tests/StencilSwiftKitTests/ContextTests.swift b/Tests/StencilSwiftKitTests/ContextTests.swift index e5de4a8f..3dcf904c 100644 --- a/Tests/StencilSwiftKitTests/ContextTests.swift +++ b/Tests/StencilSwiftKitTests/ContextTests.swift @@ -1,9 +1,7 @@ // -// ContextTests.swift -// StencilSwiftKit -// -// Created by David Jennes on 14/02/2017. -// Copyright © 2017 AliSoftware. All rights reserved. +// StencilSwiftKit UnitTests +// Copyright © 2019 SwiftGen +// MIT Licence // import StencilSwiftKit diff --git a/Tests/StencilSwiftKitTests/MacroNodeTests.swift b/Tests/StencilSwiftKitTests/MacroNodeTests.swift index 32694d45..6cf40ad9 100644 --- a/Tests/StencilSwiftKitTests/MacroNodeTests.swift +++ b/Tests/StencilSwiftKitTests/MacroNodeTests.swift @@ -1,6 +1,6 @@ // -// StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// StencilSwiftKit UnitTests +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Tests/StencilSwiftKitTests/MapNodeTests.swift b/Tests/StencilSwiftKitTests/MapNodeTests.swift index 05a5e6a8..f7e8b8c3 100644 --- a/Tests/StencilSwiftKitTests/MapNodeTests.swift +++ b/Tests/StencilSwiftKitTests/MapNodeTests.swift @@ -1,6 +1,6 @@ // -// StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// StencilSwiftKit UnitTests +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Tests/StencilSwiftKitTests/ParametersTests.swift b/Tests/StencilSwiftKitTests/ParametersTests.swift index 259a4a18..84399ebb 100644 --- a/Tests/StencilSwiftKitTests/ParametersTests.swift +++ b/Tests/StencilSwiftKitTests/ParametersTests.swift @@ -1,6 +1,6 @@ // -// ParametersTests.swift -// Copyright (c) 2017 SwiftGen +// StencilSwiftKit UnitTests +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Tests/StencilSwiftKitTests/ParseBoolTests.swift b/Tests/StencilSwiftKitTests/ParseBoolTests.swift index 43da3b22..2b635ba6 100644 --- a/Tests/StencilSwiftKitTests/ParseBoolTests.swift +++ b/Tests/StencilSwiftKitTests/ParseBoolTests.swift @@ -1,6 +1,6 @@ // -// StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// StencilSwiftKit UnitTests +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Tests/StencilSwiftKitTests/ParseEnumTests.swift b/Tests/StencilSwiftKitTests/ParseEnumTests.swift index 47a6161f..4420291e 100644 --- a/Tests/StencilSwiftKitTests/ParseEnumTests.swift +++ b/Tests/StencilSwiftKitTests/ParseEnumTests.swift @@ -1,6 +1,6 @@ // -// StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// StencilSwiftKit UnitTests +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Tests/StencilSwiftKitTests/ParseStringTests.swift b/Tests/StencilSwiftKitTests/ParseStringTests.swift index bb88e64f..e9b03908 100644 --- a/Tests/StencilSwiftKitTests/ParseStringTests.swift +++ b/Tests/StencilSwiftKitTests/ParseStringTests.swift @@ -1,6 +1,6 @@ // -// StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// StencilSwiftKit UnitTests +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Tests/StencilSwiftKitTests/SetNodeTests.swift b/Tests/StencilSwiftKitTests/SetNodeTests.swift index d0e683eb..f99cebfd 100644 --- a/Tests/StencilSwiftKitTests/SetNodeTests.swift +++ b/Tests/StencilSwiftKitTests/SetNodeTests.swift @@ -1,6 +1,6 @@ // -// StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// StencilSwiftKit UnitTests +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Tests/StencilSwiftKitTests/StringFiltersTests.swift b/Tests/StencilSwiftKitTests/StringFiltersTests.swift index dd087e7a..707a2a0f 100644 --- a/Tests/StencilSwiftKitTests/StringFiltersTests.swift +++ b/Tests/StencilSwiftKitTests/StringFiltersTests.swift @@ -1,6 +1,6 @@ // -// StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// StencilSwiftKit UnitTests +// Copyright © 2019 SwiftGen // MIT Licence // diff --git a/Tests/StencilSwiftKitTests/SwiftIdentifierTests.swift b/Tests/StencilSwiftKitTests/SwiftIdentifierTests.swift index c1e4183d..e88da1a6 100644 --- a/Tests/StencilSwiftKitTests/SwiftIdentifierTests.swift +++ b/Tests/StencilSwiftKitTests/SwiftIdentifierTests.swift @@ -1,6 +1,6 @@ // -// StencilSwiftKit -// Copyright (c) 2017 SwiftGen +// StencilSwiftKit UnitTests +// Copyright © 2019 SwiftGen // MIT Licence // From f40639f6be4f7b4c77e6c9f07d5985b2d2e6b59f Mon Sep 17 00:00:00 2001 From: David Jennes Date: Tue, 1 Jan 2019 16:34:49 +0100 Subject: [PATCH 2/4] Lint file headers --- .swiftlint.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.swiftlint.yml b/.swiftlint.yml index 59a06f17..55597820 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -12,6 +12,7 @@ opt_in_rules: - empty_string - fallthrough - fatal_error_message + - file_header - first_where - force_unwrapping - implicit_return @@ -41,6 +42,14 @@ opt_in_rules: - yoda_condition # Rules customization +file_header: + required_pattern: | + \/\/ + \/\/ StencilSwiftKit( UnitTests)? + \/\/ Copyright © 2019 SwiftGen + \/\/ MIT Licence + \/\/ + line_length: warning: 120 error: 200 From 806675b6e4aef428719e538fbab66d13d23fbe02 Mon Sep 17 00:00:00 2001 From: David Jennes Date: Tue, 1 Jan 2019 18:47:22 +0100 Subject: [PATCH 3/4] Last license/licence --- LICENSE => LICENCE | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename LICENSE => LICENCE (98%) diff --git a/LICENSE b/LICENCE similarity index 98% rename from LICENSE rename to LICENCE index 942793ec..504cad45 100644 --- a/LICENSE +++ b/LICENCE @@ -1,4 +1,4 @@ -MIT License +MIT Licence Copyright (c) 2019 SwiftGen diff --git a/README.md b/README.md index 959a0f25..47811c98 100644 --- a/README.md +++ b/README.md @@ -90,4 +90,4 @@ For easier use, you can use the `StencilContext.enrich(context:parameters:enviro # Licence -This code and tool is under the MIT Licence. See the `LICENSE` file in this repository. +This code and tool is under the MIT Licence. See the `LICENCE` file in this repository. From 256a960e6742db104be8cc223f4a3bc5acac657b Mon Sep 17 00:00:00 2001 From: David Jennes Date: Tue, 1 Jan 2019 18:55:15 +0100 Subject: [PATCH 4/4] Update gems --- Gemfile | 4 ++-- Gemfile.lock | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 6fe7c3d5..a080645c 100644 --- a/Gemfile +++ b/Gemfile @@ -11,10 +11,10 @@ end # In addition to :build, for contributing group :development do gem 'cocoapods', '~> 1.5' - gem 'rubocop', '~> 0.58' + gem 'rubocop', '~> 0.62' end # For releasing to GitHub group :release do - gem 'octokit', '~> 4.9' + gem 'octokit', '~> 4.13' end diff --git a/Gemfile.lock b/Gemfile.lock index c7d034e8..93f534e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -36,7 +36,7 @@ GEM fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.2) - cocoapods-downloader (1.2.1) + cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) @@ -46,9 +46,9 @@ GEM netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.4) escape (0.0.4) - faraday (0.15.2) + faraday (0.15.4) multipart-post (>= 1.2, < 3) fourflusher (2.0.1) fuzzy_match (2.0.4) @@ -62,25 +62,25 @@ GEM nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) - octokit (4.10.0) + octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) parallel (1.12.1) - parser (2.5.1.2) + parser (2.5.3.0) ast (~> 2.4.0) powerpack (0.1.2) public_suffix (3.0.3) rainbow (3.0.0) - rake (12.3.1) + rake (12.3.2) rouge (2.0.7) - rubocop (0.58.2) + rubocop (0.62.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-macho (1.2.0) + unicode-display_width (~> 1.4.0) + ruby-macho (1.3.1) ruby-progressbar (1.10.0) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) @@ -88,8 +88,8 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.4.0) - xcodeproj (1.6.0) + unicode-display_width (1.4.1) + xcodeproj (1.7.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -103,10 +103,10 @@ PLATFORMS DEPENDENCIES cocoapods (~> 1.5) - octokit (~> 4.9) + octokit (~> 4.13) rake (~> 12.3) - rubocop (~> 0.58) + rubocop (~> 0.62) xcpretty BUNDLED WITH - 1.16.1 + 1.16.5