Skip to content

Commit

Permalink
Merge pull request #110 from SwiftGen/feature/2019
Browse files Browse the repository at this point in the history
Update copyright notices for 2019
  • Loading branch information
djbe authored Jan 2, 2019
2 parents 636bb48 + 256a960 commit dbcac97
Show file tree
Hide file tree
Showing 28 changed files with 77 additions and 62 deletions.
9 changes: 9 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ opt_in_rules:
- empty_string
- fallthrough
- fatal_error_message
- file_header
- first_where
- force_unwrapping
- implicit_return
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
30 changes: 15 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -62,34 +62,34 @@ 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)
faraday (~> 0.8, < 1.0)
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)
Expand All @@ -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
4 changes: 2 additions & 2 deletions LICENSE → LICENCE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License
MIT Licence

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
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `LICENCE` file in this repository.
2 changes: 1 addition & 1 deletion Sources/StencilSwiftKit/CallMacroNodes.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
8 changes: 3 additions & 5 deletions Sources/StencilSwiftKit/Context.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
//
// Context.swift
// Pods
//
// Created by David Jennes on 14/02/2017.
//
// StencilSwiftKit
// Copyright © 2019 SwiftGen
// MIT Licence
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Sources/StencilSwiftKit/Environment.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
2 changes: 1 addition & 1 deletion Sources/StencilSwiftKit/Filters+Numbers.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
2 changes: 1 addition & 1 deletion Sources/StencilSwiftKit/Filters+Strings.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
2 changes: 1 addition & 1 deletion Sources/StencilSwiftKit/Filters.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
3 changes: 1 addition & 2 deletions Sources/StencilSwiftKit/MapNode.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 Olivier Halligon
// Created by Peter Livesey.
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
2 changes: 1 addition & 1 deletion Sources/StencilSwiftKit/Parameters.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
2 changes: 1 addition & 1 deletion Sources/StencilSwiftKit/SetNode.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
2 changes: 1 addition & 1 deletion Sources/StencilSwiftKit/StencilSwiftTemplate.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
2 changes: 1 addition & 1 deletion Sources/StencilSwiftKit/SwiftIdentifier.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
9 changes: 7 additions & 2 deletions StencilSwiftKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,19 @@ Pod::Spec.new do |s|

s.homepage = 'https://github.com/SwiftGen/StencilSwiftKit'
s.license = 'MIT'
s.author = { 'Olivier Halligon' => '[email protected]' }
s.author = {
'Olivier Halligon' => '[email protected]'
}
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'
Expand Down
4 changes: 2 additions & 2 deletions Tests/StencilSwiftKitTests/CallNodeTests.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// StencilSwiftKit UnitTests
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
8 changes: 3 additions & 5 deletions Tests/StencilSwiftKitTests/ContextTests.swift
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Tests/StencilSwiftKitTests/MacroNodeTests.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// StencilSwiftKit UnitTests
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
4 changes: 2 additions & 2 deletions Tests/StencilSwiftKitTests/MapNodeTests.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// StencilSwiftKit UnitTests
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
4 changes: 2 additions & 2 deletions Tests/StencilSwiftKitTests/ParametersTests.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// ParametersTests.swift
// Copyright (c) 2017 SwiftGen
// StencilSwiftKit UnitTests
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
4 changes: 2 additions & 2 deletions Tests/StencilSwiftKitTests/ParseBoolTests.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// StencilSwiftKit UnitTests
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
4 changes: 2 additions & 2 deletions Tests/StencilSwiftKitTests/ParseEnumTests.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// StencilSwiftKit UnitTests
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
4 changes: 2 additions & 2 deletions Tests/StencilSwiftKitTests/ParseStringTests.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// StencilSwiftKit UnitTests
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
4 changes: 2 additions & 2 deletions Tests/StencilSwiftKitTests/SetNodeTests.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// StencilSwiftKit UnitTests
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
4 changes: 2 additions & 2 deletions Tests/StencilSwiftKitTests/StringFiltersTests.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// StencilSwiftKit UnitTests
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down
4 changes: 2 additions & 2 deletions Tests/StencilSwiftKitTests/SwiftIdentifierTests.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// StencilSwiftKit
// Copyright (c) 2017 SwiftGen
// StencilSwiftKit UnitTests
// Copyright © 2019 SwiftGen
// MIT Licence
//

Expand Down

0 comments on commit dbcac97

Please sign in to comment.