Merge pull request #95 from SwiftGen/feature/stencil-0.12

Stencil 0.12

Author: djbe

CHANGELOG.md

@@ -27,6 +27,9 @@
   pair.  
   [David Jennes](https://github.com/djbe)
   [#247](https://github.com/AliSoftware/SwiftGen/pull/247)
+* Updated Stencil to the latest version (0.12.0).  
+  [David Jennes](https://github.com/djbe) 
+  [#95](https://github.com/SwiftGen/StencilSwiftKit/pull/95)
 
 ### Internal Changes
 

Gemfile

@@ -2,8 +2,19 @@
 
 source 'https://rubygems.org'
 
-gem 'cocoapods', '~> 1.5'
-gem 'octokit', '~> 4.7'
-gem 'rake', '~> 10.4'
-gem 'rubocop', '~> 0.51'
-gem 'xcpretty'
+# The bare minimum for building, e.g. in Homebrew
+group :build do
+	gem 'rake', '~> 12.3'
+	gem 'xcpretty'
+end
+
+# In addition to :build, for contributing
+group :development do
+	gem 'cocoapods', '~> 1.5'
+	gem 'rubocop', '~> 0.58'
+end
+
+# For releasing to GitHub
+group :release do
+	gem 'octokit', '~> 4.9'
+end

Gemfile.lock

@@ -10,12 +10,12 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
-    atomos (0.1.2)
+    atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.5.0)
+    cocoapods (1.5.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.0)
+      cocoapods-core (= 1.5.3)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
       cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,79 +31,81 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.1)
       xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.0)
+    cocoapods-core (1.5.3)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.0)
+    cocoapods-downloader (1.2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.3.0)
+    cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
     concurrent-ruby (1.0.5)
     escape (0.0.4)
-    faraday (0.15.0)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.1)
     minitest (5.11.3)
-    molinillo (0.6.5)
+    molinillo (0.6.6)
     multipart-post (2.0.0)
-    nanaimo (0.2.5)
+    nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
-    octokit (4.8.0)
+    octokit (4.10.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
-    public_suffix (3.0.2)
+    powerpack (0.1.2)
+    public_suffix (3.0.3)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (12.3.1)
     rouge (2.0.7)
-    rubocop (0.55.0)
+    rubocop (0.58.2)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
+      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.1.0)
-    ruby-progressbar (1.9.0)
+    ruby-macho (1.2.0)
+    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.3.2)
-    xcodeproj (1.5.7)
+    unicode-display_width (1.4.0)
+    xcodeproj (1.6.0)
       CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.2)
+      atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.4)
-    xcpretty (0.2.8)
+      nanaimo (~> 0.2.6)
+    xcpretty (0.3.0)
       rouge (~> 2.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cocoapods (~> 1.5)
-  octokit (~> 4.7)
-  rake (~> 10.4)
-  rubocop (~> 0.51)
+  octokit (~> 4.9)
+  rake (~> 12.3)
+  rubocop (~> 0.58)
   xcpretty
 
 BUNDLED WITH

Package.resolved

@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/stencilproject/Stencil.git",
         "state": {
           "branch": null,
-          "revision": "c2e25f25acfbe24442809c055141d8323af8f6cc",
-          "version": "0.11.0"
+          "revision": "6a4959cea0aa2667eeb5c20d9196d242ea172fcd",
+          "version": "0.12.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.11.0"))
+        .package(url: "https://github.com/stencilproject/Stencil.git", .upToNextMinor(from: "0.12.0"))
     ],
     targets: [
       .target(

Podfile.lock

@@ -1,17 +1,17 @@
 PODS:
   - PathKit (0.8.0)
-  - Stencil (0.11.0):
+  - Stencil (0.12.0):
     - PathKit (~> 0.8.0)
   - StencilSwiftKit (2.5.0):
-    - Stencil (~> 0.11)
+    - Stencil (~> 0.12)
   - SwiftLint (0.25.1)
 
 DEPENDENCIES:
   - StencilSwiftKit (from `.`)
   - SwiftLint (~> 0.25)
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/cocoapods/specs.git:
     - PathKit
     - Stencil
     - SwiftLint
@@ -22,10 +22,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   PathKit: dcab05d701474011aae0e40cf892298a831f63d6
-  Stencil: a1873ecd92cbc053c6b391de7583b9f5bfbb3de6
-  StencilSwiftKit: 6bad36133ce4dc2ef41728f35a5008e88e5fabf4
+  Stencil: c324035607f483153c780fb42367d284cadd30a6
+  StencilSwiftKit: 80a778f61bb742fd7714a5f9f3c2249d2eafa594
   SwiftLint: ce933681be10c3266e82576dad676fa815a602e9
 
 PODFILE CHECKSUM: 0bd9ec310bace9d5b62e785ea1fb74547c15074d
 
-COCOAPODS: 1.5.0
+COCOAPODS: 1.5.3