Merge branch 'develop' into feature/colors-xml-argb

Author: djbe

CHANGELOG.md

@@ -10,6 +10,12 @@ _None_
 
 ### New Features
 
+* The built-in templates will now correctly handle Swift Package Manager resources, using `Bundle.module` if it's available. As before, you can override the used `Bundle` using the `bundle` or `lookupFunction` template parameters.  
+  [Arnaud Dorgans](https://github.com/arnauddorgans)
+  [#763](https://github.com/SwiftGen/SwiftGen/pull/763)
+* Added `config generate-xcfilelist` subcommand to generate input and output `xcfilelist`s based on your configuration file. These files should then be used in an Xcode build step that executes `swiftgen config run`. Don't forget to regenerate the file lists after adding/removing resources in your project in a way that might impact them.  
+  [@CraigSiemens](https://github.com/CraigSiemens)
+  [#441](https://github.com/SwiftGen/SwiftGen/issues/441)
 * Colors: the XML parser now accepts a `colorFormat` option, used to change the color format. The default equals `rgba`.  
   [@kevinstier](https://github.com/kevinstier)
   [#562](https://github.com/SwiftGen/SwiftGen/issues/562)
@@ -23,7 +29,9 @@ _None_
 
 ### Internal Changes
 
-_None_
+* Update Yams from `3.0.0` to `4.0.0`.  
+  [@hungrxyz](https://github.com/hungrxyz)
+  [#772](https://github.com/SwiftGen/SwiftGen/issues/772)
 
 ## 6.3.0
 

Package.swift

@@ -11,7 +11,7 @@ let package = Package(
         .package(url: "https://github.com/kylef/Commander.git", from: "0.9.0"),
         .package(url: "https://github.com/kylef/PathKit.git", from: "0.9.0"),
         .package(url: "https://github.com/kylef/Stencil.git", from: "0.13.0"),
-        .package(url: "https://github.com/jpsim/Yams.git", from: "3.0.0"),
+        .package(url: "https://github.com/jpsim/Yams.git", from: "4.0.0"),
         .package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", from: "2.7.0"),
         .package(url: "https://github.com/tid-kijyun/Kanna.git", from: "5.2.2")
     ],

Podfile.lock

@@ -7,15 +7,15 @@ PODS:
   - StencilSwiftKit (2.7.2):
     - Stencil (~> 0.13.1)
   - SwiftLint (0.39.2)
-  - Yams (3.0.1)
+  - Yams (4.0.0)
 
 DEPENDENCIES:
   - Commander (~> 0.9)
   - Kanna (~> 5.2)
   - PathKit (~> 0.9)
   - StencilSwiftKit (~> 2.7)
   - SwiftLint (~> 0.39)
-  - Yams (~> 3.0)
+  - Yams (~> 4.0)
 
 SPEC REPOS:
   trunk:
@@ -34,7 +34,7 @@ SPEC CHECKSUMS:
   Stencil: b5128a0a43ece9225db5cbd94d6569fe6fba609b
   StencilSwiftKit: 9ebd42556b6c7396440f286b6c9aca1549c963ff
   SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447
-  Yams: 4199a97883e0369046e3fe882fcc95e559966370
+  Yams: 9d49b85824751ee13d31e9ec6617c4dfb9a8c3cd
 
 PODFILE CHECKSUM: f7eacff17036060bfc85488a45bd989d99e359f3