Merge branch 'master' into feature/swift6

Author: fumito-ito

.github/workflows/check-pr.yml

@@ -18,4 +18,7 @@ jobs:
         run: swift build
 
       - name: Test
-        run: swift test
+        run: swift test
+        
+      - name: Lint with cocoapods
+        run: pod lib lint --allow-warnings

GRMustache.swift.podspec

@@ -1,16 +1,16 @@
 Pod::Spec.new do |s|
 	s.name     = 'GRMustache.swift'
-	s.version  = '5.0.0'
+	s.version  = '6.0.0'
 	s.license  = { :type => 'MIT', :file => 'LICENSE' }
 	s.summary  = 'Flexible Mustache templates for Swift.'
 	s.homepage = 'https://github.com/groue/GRMustache.swift'
 	s.author   = { 'Gwendal Roué' => '[email protected]' }
 	s.source   = { :git => 'https://github.com/groue/GRMustache.swift.git', :tag => s.version }
 	s.source_files = 'Sources/**/*.{h,m,swift}', 'ObjC/**/*.{h,m,swift}'
 	s.module_name = 'Mustache'
-	s.swift_version = '5.0'
-	s.ios.deployment_target = '8.0'
-	s.osx.deployment_target = '10.10'
+	s.swift_version = '5.9'
+	s.ios.deployment_target = '11.0'
+	s.osx.deployment_target = '10.11'
 	s.tvos.deployment_target = '9.0'
 	s.requires_arc = true
 	s.framework = 'Foundation'

README.md

@@ -12,7 +12,8 @@ GRMustache.swift [![Swift](https://img.shields.io/badge/swift-6-orange.svg?style
 - Swift 4.0: use the [version 3.0.0](https://github.com/groue/GRMustache.swift/tree/3.0.0)
 - Swift 4.2: use the [version 3.1.0](https://github.com/groue/GRMustache.swift/tree/3.1.0)
 - Swift 5.0: use the [version 4.0.0](https://github.com/groue/GRMustache.swift/tree/4.0.0)
-- Swift 6.0: use the [version 5.1.0](https://github.com/groue/GRMustache.swift/tree/5.1.0)
+- Swift 5.9: use the [version 6.0.0](https://github.com/groue/GRMustache.swift/tree/6.0.0)
+- Swift 6.0: use the [version 7.0.0](https://github.com/groue/GRMustache.swift/tree/7.0.0) or later
 
 Follow [@groue](http://twitter.com/groue) on Twitter for release announcements and usage tips.
 
@@ -119,7 +120,7 @@ To use GRMustache.swift with the Swift Package Manager, add https://github.com/g
 
 ```swift
 dependencies: [
-    .package(url: "https://github.com/groue/GRMustache.swift", from: "5.0.0")
+    .package(url: "https://github.com/groue/GRMustache.swift", from: "6.0.0")
 ]
 ```
 
@@ -141,7 +142,7 @@ targets: [
 
     ```sh
     cd [GRMustache.swift directory]
-    git checkout 2.0.0
+    git checkout 6.0.0
     ````
 
 3. Embed the `Mustache.xcodeproj` project in your own project.

Sources/Foundation.swift

@@ -21,7 +21,9 @@
 // THE SOFTWARE.
 
 import Foundation
+#if canImport(GRMustacheKeyAccess)
 import GRMustacheKeyAccess
+#endif
 
 /// GRMustache provides built-in support for rendering `NSObject`.
 extension NSObject : MustacheBoxable {