Skip to content

Commit

Permalink
Merge pull request #99 from SwiftGen/feature/stencil-0.12.1
Browse files Browse the repository at this point in the history
Stencil 0.12.1
  • Loading branch information
djbe authored Aug 30, 2018
2 parents 1cbc1b2 + a111914 commit baa8c16
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 32 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@
pair.
[David Jennes](https://github.com/djbe)
[#247](https://github.com/AliSoftware/SwiftGen/pull/247)
* Updated Stencil to the latest version (0.12.0).
* Updated Stencil to the latest version (0.12.1).
[David Jennes](https://github.com/djbe)
[#95](https://github.com/SwiftGen/StencilSwiftKit/pull/95)
[#99](https://github.com/SwiftGen/StencilSwiftKit/pull/99)

### Internal Changes

Expand Down
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"repositoryURL": "https://github.com/stencilproject/Stencil.git",
"state": {
"branch": null,
"revision": "6a4959cea0aa2667eeb5c20d9196d242ea172fcd",
"version": "0.12.0"
"revision": "b476e50f89577f5848e8013dbf0a850abac892aa",
"version": "0.12.1"
}
}
]
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/stencilproject/Stencil.git", .upToNextMinor(from: "0.12.0"))
.package(url: "https://github.com/stencilproject/Stencil.git", .upToNextMinor(from: "0.12.1"))
],
targets: [
.target(
Expand Down
14 changes: 7 additions & 7 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PODS:
- PathKit (0.8.0)
- Stencil (0.12.0):
- PathKit (~> 0.8.0)
- PathKit (0.9.1)
- Stencil (0.12.1):
- PathKit (~> 0.9.0)
- StencilSwiftKit (2.5.0):
- Stencil (~> 0.12)
- Stencil (~> 0.12.1)
- SwiftLint (0.27.0)

DEPENDENCIES:
Expand All @@ -21,9 +21,9 @@ EXTERNAL SOURCES:
:path: "."

SPEC CHECKSUMS:
PathKit: dcab05d701474011aae0e40cf892298a831f63d6
Stencil: c324035607f483153c780fb42367d284cadd30a6
StencilSwiftKit: 80a778f61bb742fd7714a5f9f3c2249d2eafa594
PathKit: 7dcba9f0150afb67e0a520c49707a2cbc8e95937
Stencil: 8a08577b341a059420c444b8aa5733378a6a4384
StencilSwiftKit: 83982c319fb7efd731dfd52a8a4b595604844e11
SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073

PODFILE CHECKSUM: 0bd9ec310bace9d5b62e785ea1fb74547c15074d
Expand Down
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.

14 changes: 7 additions & 7 deletions Pods/Manifest.lock

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

30 changes: 20 additions & 10 deletions Pods/PathKit/Sources/PathKit.swift

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

2 changes: 1 addition & 1 deletion Pods/Target Support Files/PathKit/Info.plist

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

2 changes: 1 addition & 1 deletion Pods/Target Support Files/Stencil/Info.plist

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

2 changes: 1 addition & 1 deletion StencilSwiftKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ Pod::Spec.new do |s|
s.source = { git: 'https://github.com/SwiftGen/StencilSwiftKit.git', tag: s.version.to_s }
s.source_files = 'Sources/**/*.swift'

s.dependency 'Stencil', '~> 0.12'
s.dependency 'Stencil', '~> 0.12.1'
s.framework = 'Foundation'
end

0 comments on commit baa8c16

Please sign in to comment.