Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update stencil to 0.11.0 #83

Merged
merged 4 commits into from
Apr 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ opt_in_rules:
- closure_spacing
- contains_over_first_not_nil
- discouraged_optional_boolean
- discouraged_optional_collection
- empty_count
- empty_string
- fatal_error_message
- first_where
- force_unwrapping
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ _None_

### New Features

_None_
* Updated Stencil to the latest version (0.11.0).
[David Jennes](https://github.com/djbe)
[#83](https://github.com/SwiftGen/StencilSwiftKit/pull/83)

### Internal Changes

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

gem 'cocoapods', '~> 1.4'
gem 'cocoapods', '~> 1.5'
gem 'octokit', '~> 4.7'
gem 'rake', '~> 10.4'
gem 'rubocop', '~> 0.51'
Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ GEM
ast (2.4.0)
atomos (0.1.2)
claide (1.0.2)
cocoapods (1.4.0)
cocoapods (1.5.0)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.4.0)
cocoapods-core (= 1.5.0)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.1.3, < 2.0)
cocoapods-downloader (>= 1.2.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
Expand All @@ -27,16 +27,16 @@ GEM
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
gh_inspector (~> 1.0)
molinillo (~> 0.6.4)
molinillo (~> 0.6.5)
nap (~> 1.0)
ruby-macho (~> 1.1)
xcodeproj (>= 1.5.4, < 2.0)
cocoapods-core (1.4.0)
xcodeproj (>= 1.5.7, < 2.0)
cocoapods-core (1.5.0)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.1.3)
cocoapods-downloader (1.2.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
Expand All @@ -58,7 +58,7 @@ GEM
minitest (5.11.3)
molinillo (0.6.5)
multipart-post (2.0.0)
nanaimo (0.2.4)
nanaimo (0.2.5)
nap (1.1.0)
netrc (0.11.0)
octokit (4.8.0)
Expand Down Expand Up @@ -100,7 +100,7 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.4)
cocoapods (~> 1.5)
octokit (~> 4.7)
rake (~> 10.4)
rubocop (~> 0.51)
Expand Down
2 changes: 1 addition & 1 deletion Package.pins
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"package": "Stencil",
"reason": null,
"repositoryURL": "https://github.com/kylef/Stencil.git",
"version": "0.10.1"
"version": "0.11.0"
}
],
"version": 1
Expand Down
12 changes: 6 additions & 6 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
"repositoryURL": "https://github.com/kylef/PathKit.git",
"state": {
"branch": null,
"revision": "891a3fec2699fc43aed18b7649950677c0152a22",
"version": "0.8.0"
"revision": "fa81fa9e3a9f59645159c4ea45c0c46ee6558f71",
"version": "0.9.1"
}
},
{
"package": "Spectre",
"repositoryURL": "https://github.com/kylef/Spectre.git",
"state": {
"branch": null,
"revision": "e46b75cf03ad5e563b4b0a5068d3d6f04d77d80b",
"version": "0.7.2"
"revision": "e34d5687e1e9d865e3527dd58bc2f7464ef6d936",
"version": "0.8.0"
}
},
{
"package": "Stencil",
"repositoryURL": "https://github.com/kylef/Stencil.git",
"state": {
"branch": null,
"revision": "cf7acea440124f6d348032123d8b163c51cfece0",
"version": "0.10.1"
"revision": "c2e25f25acfbe24442809c055141d8323af8f6cc",
"version": "0.11.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let package = Package(
.library(name: "StencilSwiftKit", targets: ["StencilSwiftKit"])
],
dependencies: [
.package(url: "https://github.com/kylef/Stencil.git", .upToNextMinor(from: "0.10.0"))
.package(url: "https://github.com/kylef/Stencil.git", .upToNextMinor(from: "0.11.0"))
],
targets: [
.target(
Expand Down
22 changes: 14 additions & 8 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,25 +1,31 @@
PODS:
- PathKit (0.8.0)
- Stencil (0.10.1):
- Stencil (0.11.0):
- PathKit (~> 0.8.0)
- StencilSwiftKit (2.4.0):
- Stencil (~> 0.10)
- SwiftLint (0.25.0)
- Stencil (~> 0.11)
- SwiftLint (0.25.1)

DEPENDENCIES:
- StencilSwiftKit (from `.`)
- SwiftLint (~> 0.25)

SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
- PathKit
- Stencil
- SwiftLint

EXTERNAL SOURCES:
StencilSwiftKit:
:path: .
:path: "."

SPEC CHECKSUMS:
PathKit: dcab05d701474011aae0e40cf892298a831f63d6
Stencil: 40b382c52edab08f1e800e6144c1f04ae47a7a9a
StencilSwiftKit: 67d1f9598afc6785293a21bd5ebe214b02343a2e
SwiftLint: e14651157288e9e01d6e1a71db7014fb5744a8ea
Stencil: a1873ecd92cbc053c6b391de7583b9f5bfbb3de6
StencilSwiftKit: b27ac57ac979d684d92adaf21488e8df9f23c99b
SwiftLint: ce933681be10c3266e82576dad676fa815a602e9

PODFILE CHECKSUM: 04a106459aafed0d043229000123a22c447e0e7e

COCOAPODS: 1.4.0
COCOAPODS: 1.5.0
2 changes: 1 addition & 1 deletion Pods/Local Podspecs/StencilSwiftKit.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 14 additions & 8 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading