From 3f39d94c6bb9a853b1645d386c67f37851445ed3 Mon Sep 17 00:00:00 2001 From: David Jennes Date: Thu, 30 Aug 2018 14:04:36 +0200 Subject: [PATCH 1/3] Update pods --- Podfile.lock | 14 ++++----- .../StencilSwiftKit.podspec.json | 2 +- Pods/Manifest.lock | 14 ++++----- Pods/PathKit/Sources/PathKit.swift | 30 ++++++++++++------- Pods/Target Support Files/PathKit/Info.plist | 2 +- Pods/Target Support Files/Stencil/Info.plist | 2 +- StencilSwiftKit.podspec | 2 +- 7 files changed, 38 insertions(+), 28 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index ab8dede7..8a97295c 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -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: @@ -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 diff --git a/Pods/Local Podspecs/StencilSwiftKit.podspec.json b/Pods/Local Podspecs/StencilSwiftKit.podspec.json index 0d6be5ea..3a7dab19 100644 --- a/Pods/Local Podspecs/StencilSwiftKit.podspec.json +++ b/Pods/Local Podspecs/StencilSwiftKit.podspec.json @@ -21,7 +21,7 @@ "source_files": "Sources/**/*.swift", "dependencies": { "Stencil": [ - "~> 0.12" + "~> 0.12.1" ] }, "frameworks": "Foundation" diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index ab8dede7..8a97295c 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -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: @@ -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 diff --git a/Pods/PathKit/Sources/PathKit.swift b/Pods/PathKit/Sources/PathKit.swift index 9f08ca59..99cb3afd 100644 --- a/Pods/PathKit/Sources/PathKit.swift +++ b/Pods/PathKit/Sources/PathKit.swift @@ -42,7 +42,7 @@ public struct Path { path = "." } else if components.first == Path.separator && components.count > 1 { let p = components.joined(separator: Path.separator) - path = p.substring(from: p.characters.index(after: p.startIndex)) + path = String(p[p.index(after: p.startIndex)...]) } else { path = components.joined(separator: Path.separator) } @@ -221,7 +221,7 @@ extension Path { /// The last path component without file extension /// - /// - Note: This returns "." for "..". + /// - Note: This returns "." for ".." on Linux, and ".." on Apple platforms. /// /// - Returns: the last path component without file extension /// @@ -276,10 +276,10 @@ extension Path { guard Path.fileManager.fileExists(atPath: normalize().path, isDirectory: &directory) else { return false } -#if os(Linux) - return directory -#else +#if !os(Linux) || swift(>=4.1) return directory.boolValue +#else + return directory #endif } @@ -295,10 +295,10 @@ extension Path { guard Path.fileManager.fileExists(atPath: normalize().path, isDirectory: &directory) else { return false } -#if os(Linux) - return !directory -#else +#if !os(Linux) || swift(>=4.1) return !directory.boolValue +#else + return !directory #endif } @@ -598,6 +598,15 @@ extension Path { #else let matchc = gt.gl_matchc #endif +#if swift(>=4.1) + return (0.. Path { rSlice = rSlice.filter { $0 != "." }.fullSlice // Eats up trailing components of the left and leading ".." of the right side - while lSlice.last != ".." && rSlice.first == ".." { - if (lSlice.count > 1 || lSlice.first != Path.separator) && !lSlice.isEmpty { + while lSlice.last != ".." && !lSlice.isEmpty && rSlice.first == ".." { + if lSlice.count > 1 || lSlice.first != Path.separator { // A leading "/" is never popped lSlice.removeLast() } diff --git a/Pods/Target Support Files/PathKit/Info.plist b/Pods/Target Support Files/PathKit/Info.plist index 2cf03a7f..5d80a394 100644 --- a/Pods/Target Support Files/PathKit/Info.plist +++ b/Pods/Target Support Files/PathKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.8.0 + 0.9.1 CFBundleSignature ???? CFBundleVersion diff --git a/Pods/Target Support Files/Stencil/Info.plist b/Pods/Target Support Files/Stencil/Info.plist index db204946..4a543b71 100644 --- a/Pods/Target Support Files/Stencil/Info.plist +++ b/Pods/Target Support Files/Stencil/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.12.0 + 0.12.1 CFBundleSignature ???? CFBundleVersion diff --git a/StencilSwiftKit.podspec b/StencilSwiftKit.podspec index e474b0a0..833ea9cf 100644 --- a/StencilSwiftKit.podspec +++ b/StencilSwiftKit.podspec @@ -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 From a32aadaa09e8b8bffa024331309a36fa663fd85c Mon Sep 17 00:00:00 2001 From: David Jennes Date: Thu, 30 Aug 2018 14:04:48 +0200 Subject: [PATCH 2/3] Update SPM --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index 43344111..9b9d608f 100644 --- a/Package.resolved +++ b/Package.resolved @@ -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" } } ] diff --git a/Package.swift b/Package.swift index 94085969..dc399e81 100644 --- a/Package.swift +++ b/Package.swift @@ -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( From a1119147b3b5ec96e1d12226b3fcf89f5d9ac38f Mon Sep 17 00:00:00 2001 From: David Jennes Date: Thu, 30 Aug 2018 14:05:40 +0200 Subject: [PATCH 3/3] Changelog entry --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a76249b..0add3a39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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