Merge pull request #103 from SwiftGen/feature/stencil-0.13

Stencil 0.13

.circleci/config.yml

@@ -6,15 +6,15 @@ defaults:
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
       BUNDLE_PATH: vendor/bundle
     macos:
-      xcode: "9.3.0"
+      xcode: "10.0.0"
     shell: /bin/bash --login -eo pipefail
   - &linux-config
     environment:
       CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
       BUNDLE_PATH: vendor/bundle
     docker:
-      - image: norionomura/jazzy:swift-4.1.3
+      - image: norionomura/jazzy:swift-4.2.0
     shell: /bin/bash --login -eo pipefail
   - &prepare-storage
     run:
@@ -45,7 +45,7 @@ defaults:
     store_artifacts:
       path: /tmp/circleci-artifacts
 
-    
+
 version: 2
 jobs:
   lint:

CHANGELOG.md

@@ -14,23 +14,28 @@ _None_
 
 ### New Features
 
-_None_
+* Updated Stencil to the latest version (0.13).  
+  [David Jennes](https://github.com/djbe)
+  [#103](https://github.com/SwiftGen/StencilSwiftKit/pull/103)
 
 ### Internal Changes
 
 * Improved the documentation of string filters a bit for a better overview of the inputs & outputs.  
   [David Jennes](https://github.com/djbe)
   [#102](https://github.com/AliSoftware/SwiftGen/pull/102)
+* Updated to latest Xcode (10.0).  
+  [David Jennes](https://github.com/djbe)
+  [#103](https://github.com/SwiftGen/StencilSwiftKit/pull/103)
 
 ## 2.6.0
 
 ### Bug fixes
 
 * Fixed using filter expression in call node.  
-  [Ilya Puchka](https://github.com/ilyapuchka) 
+  [Ilya Puchka](https://github.com/ilyapuchka)
   [#85](https://github.com/SwiftGen/StencilSwiftKit/pull/85)
 * Fixed compilation issue with Xcode 10 & Swift 4.2 by adding hints to help the compiler.  
-  [Olivier Halligon](https://github.com/AliSoftware) 
+  [Olivier Halligon](https://github.com/AliSoftware)
   [#93](https://github.com/SwiftGen/StencilSwiftKit/pull/93)
 * Migrated to PathKit for url filters. The dirname will return '.' for a filename without base directory.  
   [Rahul Katariya](https://github.com/RahulKatariya)
@@ -46,17 +51,17 @@ _None_
   [David Jennes](https://github.com/djbe)
   [#247](https://github.com/AliSoftware/SwiftGen/pull/247)
 * Updated Stencil to the latest version (0.12.1).  
-  [David Jennes](https://github.com/djbe) 
+  [David Jennes](https://github.com/djbe)
   [#95](https://github.com/SwiftGen/StencilSwiftKit/pull/95)
   [#99](https://github.com/SwiftGen/StencilSwiftKit/pull/99)
 
 ### Internal Changes
 
 * Updated to latest Xcode (9.3.0).  
-  [David Jennes](https://github.com/djbe) 
+  [David Jennes](https://github.com/djbe)
   [#86](https://github.com/SwiftGen/StencilSwiftKit/pull/86)
 * Update to SwiftLint 0.27 and enable some extra SwiftLint rules.  
-  [David Jennes](https://github.com/djbe) 
+  [David Jennes](https://github.com/djbe)
   [#96](https://github.com/SwiftGen/StencilSwiftKit/pull/96)
 * Test Linux SPM support in CI.  
   [David Jennes](https://github.com/janderit)
@@ -67,22 +72,22 @@ _None_
 ### New Features
 
 * Updated Stencil to the latest version (0.11.0).  
-  [David Jennes](https://github.com/djbe) 
+  [David Jennes](https://github.com/djbe)
   [#83](https://github.com/SwiftGen/StencilSwiftKit/pull/83)
 
 ### Internal Changes
 
 * Switched to using SwiftLint via CocoaPods instead of our own install scripts.  
-  [David Jennes](https://github.com/djbe) 
+  [David Jennes](https://github.com/djbe)
   [#78](https://github.com/SwiftGen/StencilSwiftKit/pull/78)
 * Enabled some extra SwiftLint rules for better code consistency.  
-  [David Jennes](https://github.com/djbe) 
+  [David Jennes](https://github.com/djbe)
   [#79](https://github.com/SwiftGen/StencilSwiftKit/pull/79)
 * Migrated to CircleCI 2.0.  
-  [David Jennes](https://github.com/djbe) 
+  [David Jennes](https://github.com/djbe)
   [#81](https://github.com/SwiftGen/StencilSwiftKit/pull/81)
 * Migrated to Swift 4, and dropped support for Swift 3.  
-  [David Jennes](https://github.com/djbe) 
+  [David Jennes](https://github.com/djbe)
   [#80](https://github.com/SwiftGen/StencilSwiftKit/pull/80)
 
 ## 2.4.0

Package.resolved

@@ -6,26 +6,26 @@
         "repositoryURL": "https://github.com/kylef/PathKit.git",
         "state": {
           "branch": null,
-          "revision": "fa81fa9e3a9f59645159c4ea45c0c46ee6558f71",
-          "version": "0.9.1"
+          "revision": "e2f5be30e4c8f531c9c1e8765aa7b71c0a45d7a0",
+          "version": "0.9.2"
         }
       },
       {
         "package": "Spectre",
         "repositoryURL": "https://github.com/kylef/Spectre.git",
         "state": {
           "branch": null,
-          "revision": "e34d5687e1e9d865e3527dd58bc2f7464ef6d936",
-          "version": "0.8.0"
+          "revision": "f14ff47f45642aa5703900980b014c2e9394b6e5",
+          "version": "0.9.0"
         }
       },
       {
         "package": "Stencil",
         "repositoryURL": "https://github.com/stencilproject/Stencil.git",
         "state": {
           "branch": null,
-          "revision": "b476e50f89577f5848e8013dbf0a850abac892aa",
-          "version": "0.12.1"
+          "revision": "c7dbba41a5cf7ab5a5bdfb5f7855170d05c5f031",
+          "version": "0.13.0"
         }
       }
     ]

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.1"))
+      .package(url: "https://github.com/stencilproject/Stencil.git", .upToNextMinor(from: "0.13.0"))
   ],
   targets: [
     .target(

Package@swift-4.2.swift

@@ -0,0 +1,27 @@
+// swift-tools-version:4.2
+import PackageDescription
+
+let package = Package(
+  name: "StencilSwiftKit",
+  products: [
+      .library(name: "StencilSwiftKit", targets: ["StencilSwiftKit"])
+  ],
+  dependencies: [
+      .package(url: "https://github.com/stencilproject/Stencil.git", .upToNextMinor(from: "0.13.0"))
+  ],
+  targets: [
+    .target(
+      name: "StencilSwiftKit",
+      dependencies: [
+        "Stencil"
+      ]
+    ),
+    .testTarget(
+      name: "StencilSwiftKitTests",
+      dependencies: [
+        "StencilSwiftKit"
+      ]
+    )
+  ],
+  swiftLanguageVersions: [.v4, .v4_2]
+)

Podfile

@@ -5,14 +5,5 @@ raise 'Please use bundle exec to run the pod command' unless defined?(Bundler)
 
 target 'Tests' do
   pod 'StencilSwiftKit', path: '.'
-  pod 'SwiftLint', '~> 0.25'
-end
-
-post_install do |installer|
-  swift3_pods = %w[Stencil]
-  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings['SWIFT_VERSION'] = '3.2' if swift3_pods.include?(target.name)
-    end
-  end
+  pod 'SwiftLint', '~> 0.27'
 end

Podfile.lock

@@ -1,14 +1,14 @@
 PODS:
-  - PathKit (0.9.1)
-  - Stencil (0.12.1):
+  - PathKit (0.9.2)
+  - Stencil (0.13.0):
     - PathKit (~> 0.9.0)
   - StencilSwiftKit (2.6.0):
-    - Stencil (~> 0.12.1)
+    - Stencil (~> 0.13.0)
   - SwiftLint (0.27.0)
 
 DEPENDENCIES:
   - StencilSwiftKit (from `.`)
-  - SwiftLint (~> 0.25)
+  - SwiftLint (~> 0.27)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -21,11 +21,11 @@ EXTERNAL SOURCES:
     :path: "."
 
 SPEC CHECKSUMS:
-  PathKit: 7dcba9f0150afb67e0a520c49707a2cbc8e95937
-  Stencil: 8a08577b341a059420c444b8aa5733378a6a4384
-  StencilSwiftKit: e509ccb9680e00eb877d3d944c8c408ef233bf2f
+  PathKit: 273f59a38e3218eb95abd9f6a61730a8bcfd2f06
+  Stencil: 0f46117fc081cc506d5c4b5b90cfdfe207945aa9
+  StencilSwiftKit: f68ec52f2447fe0756e92c92fd9ca3e9a49b7fb2
   SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
 
-PODFILE CHECKSUM: 0bd9ec310bace9d5b62e785ea1fb74547c15074d
+PODFILE CHECKSUM: bfb045d6ef409d0ed3751cc1023e316c5e7803ad
 
 COCOAPODS: 1.5.3