Merge branch 'develop' into bugfix/json_yaml_bool

djbe · web-flow · commit fde4d3f1fc88 · 2020-10-04T20:11:26.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ defaults:
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
       BUNDLE_PATH: vendor/bundle
     macos:
-      xcode: "11.4.0"
+      xcode: "12.0.0"
     shell: /bin/bash --login -eo pipefail
   - &prepare-storage
     run:
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,4 +1,4 @@
-swiftlint_version: 0.39.2
+swiftlint_version: 0.40.3
 
 opt_in_rules:
  - anyobject_protocol
@@ -52,6 +52,7 @@ opt_in_rules:
  - overridden_super_call
  - override_in_extension
  - prefer_self_type_over_type_of_self
+ - prefer_zero_over_explicit_init
  - private_action
  - private_outlet
  - prohibited_super_call
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,9 @@ _None_
 * Update Yams from `3.0.0` to `4.0.0`.  
   [@hungrxyz](https://github.com/hungrxyz)
   [#772](https://github.com/SwiftGen/SwiftGen/issues/772)
+* Updated Pods and Gems dependencies, and Xcode 12.  
+  [David Jennes](https://github.com/djbe)
+  [#782](https://github.com/SwiftGen/SwiftGen/pull/782)
 
 ## 6.3.0
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    algoliasearch (1.27.3)
+    algoliasearch (1.27.4)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     ast (2.4.1)
@@ -57,18 +57,18 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.0.4)
+    danger (8.0.5)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (>= 0.9.0, < 2.0)
       faraday-http-cache (~> 2.0)
       git (~> 1.7)
-      kramdown (~> 2.0)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
@@ -94,7 +94,7 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     molinillo (0.6.6)
     multipart-post (2.1.1)
     nanaimo (0.3.0)
@@ -106,27 +106,27 @@ GEM
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.1.5)
       ast (~> 2.4.1)
     plist (3.5.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.1)
     rchardet (1.8.0)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.1)
     rexml (3.2.4)
     rouge (2.0.7)
-    rubocop (0.88.0)
+    rubocop (0.92.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      rubocop-ast (>= 0.5.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
+    rubocop-ast (0.7.1)
+      parser (>= 2.7.1.5)
     ruby-macho (1.4.0)
     ruby-progressbar (1.10.1)
     sawyer (0.8.2)
@@ -140,7 +140,7 @@ GEM
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    xcodeproj (1.17.1)
+    xcodeproj (1.18.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
diff --git a/Podfile.lock b/Podfile.lock
@@ -6,7 +6,7 @@ PODS:
     - PathKit (~> 0.9.0)
   - StencilSwiftKit (2.7.2):
     - Stencil (~> 0.13.1)
-  - SwiftLint (0.39.2)
+  - SwiftLint (0.40.3)
   - Yams (4.0.0)
 
 DEPENDENCIES:
@@ -33,7 +33,7 @@ SPEC CHECKSUMS:
   PathKit: 273f59a38e3218eb95abd9f6a61730a8bcfd2f06
   Stencil: b5128a0a43ece9225db5cbd94d6569fe6fba609b
   StencilSwiftKit: 9ebd42556b6c7396440f286b6c9aca1549c963ff
-  SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447
+  SwiftLint: dfd554ff0dff17288ee574814ccdd5cea85d76f7
   Yams: 9d49b85824751ee13d31e9ec6617c4dfb9a8c3cd
 
 PODFILE CHECKSUM: f7eacff17036060bfc85488a45bd989d99e359f3
diff --git a/Pods/.project_cache/installation_cache.yaml b/Pods/.project_cache/installation_cache.yaml
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/SwiftLint/swiftlint b/Pods/SwiftLint/swiftlint
diff --git a/Rakefile b/Rakefile
@@ -17,7 +17,7 @@ SCHEME_NAME = 'swiftgen'
 CONFIGURATION = 'Debug'
 RELEASE_CONFIGURATION = 'Release'
 POD_NAME = 'SwiftGen'
-MIN_XCODE_VERSION = 11.4
+MIN_XCODE_VERSION = 12.0
 
 BUILD_DIR = File.absolute_path('./build')
 BIN_NAME = 'swiftgen'
diff --git a/Sources/SwiftGen/Commander/Path+Commander.swift b/Sources/SwiftGen/Commander/Path+Commander.swift
@@ -9,14 +9,12 @@ import PathKit
 
 // MARK: Validators
 
-// swiftlint:disable opening_brace
 func checkPath(type: String, assertion: @escaping (Path) -> Bool) -> ((Path) throws -> Path) {
   { (path: Path) throws -> Path in
     guard assertion(path) else { throw ArgumentError.invalidType(value: path.description, type: type, argument: nil) }
     return path
   }
 }
-// swiftlint:enable opening_brace
 
 typealias PathValidator = ([Path]) throws -> ([Path])
 let pathsExist: PathValidator = { paths in try paths.map(checkPath(type: "path") { $0.exists }) }
diff --git a/Sources/SwiftGenKit/Utils/YAML.swift b/Sources/SwiftGenKit/Utils/YAML.swift
@@ -76,13 +76,11 @@ private extension Constructor {
 }
 
 private extension String {
-  // swiftlint:disable opening_brace
   static func constructExpandingEnvVars(env: [String: String]) -> (_ scalar: Node.Scalar) -> String? {
     { (scalar: Node.Scalar) -> String? in
       scalar.string.expandingEnvVars(env: env)
     }
   }
-  // swiftlint:enable opening_brace
 
   func expandingEnvVars(env: [String: String]) -> String {
     var result = self
diff --git a/SwiftGen.xcodeproj/project.pbxproj b/SwiftGen.xcodeproj/project.pbxproj
@@ -1073,7 +1073,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 1120;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = AliSoftware;
 				TargetAttributes = {
 					09A87B4F1BCCA2C600D9B9F5 = {
@@ -1679,6 +1679,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1734,6 +1735,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1766,7 +1768,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Tests/SwiftGenTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alisoftware.SwiftGenTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -1780,7 +1782,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Tests/SwiftGenTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alisoftware.SwiftGenTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -1894,7 +1896,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Tests/TemplatesTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alisoftware.TemplatesTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -1908,7 +1910,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Tests/TemplatesTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alisoftware.TemplatesTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -1922,7 +1924,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Tests/SwiftGenKitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alisoftware.SwiftGenKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -1936,7 +1938,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Tests/SwiftGenKitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alisoftware.SwiftGenKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
diff --git a/SwiftGen.xcodeproj/xcshareddata/xcschemes/SwiftGenKit - Generate Contexts.xcscheme b/SwiftGen.xcodeproj/xcshareddata/xcschemes/SwiftGenKit - Generate Contexts.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/SwiftGen.xcodeproj/xcshareddata/xcschemes/SwiftGenKit.xcscheme b/SwiftGen.xcodeproj/xcshareddata/xcschemes/SwiftGenKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/SwiftGen.xcodeproj/xcshareddata/xcschemes/Templates - Generate Output.xcscheme b/SwiftGen.xcodeproj/xcshareddata/xcschemes/Templates - Generate Output.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/SwiftGen.xcodeproj/xcshareddata/xcschemes/swiftgen.xcscheme b/SwiftGen.xcodeproj/xcshareddata/xcschemes/swiftgen.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Tests/SwiftGenKitTests/ColorsJSONFileTests.swift b/Tests/SwiftGenKitTests/ColorsJSONFileTests.swift
@@ -35,7 +35,7 @@ final class ColorsJSONFileTests: XCTestCase {
       let jsonParser = Colors.JSONFileParser(options: try ParserOptionValues(options: [:], available: []))
       _ = try jsonParser.parseFile(at: Fixtures.path(for: "bad-value.json", sub: .colors))
       XCTFail("Code did parse file successfully while it was expected to fail for bad value")
-    } catch Colors.ParserError.invalidHexColor(path: _, string: "this isn't a color", key: "ArticleTitle"?) {
+    } catch Colors.ParserError.invalidHexColor(path: _, string: "this isn't a color", key: "ArticleTitle") {
       // That's the expected exception we want to happen
     } catch let error {
       XCTFail("Unexpected error occured while parsing: \(error)")
diff --git a/Tests/SwiftGenKitTests/ColorsTextFileTests.swift b/Tests/SwiftGenKitTests/ColorsTextFileTests.swift
@@ -35,7 +35,7 @@ final class ColorsTextFileTests: XCTestCase {
       let txtParser = Colors.TextFileParser(options: try ParserOptionValues(options: [:], available: []))
       _ = try txtParser.parseFile(at: Fixtures.path(for: "bad-value.txt", sub: .colors))
       XCTFail("Code did parse file successfully while it was expected to fail for bad value")
-    } catch Colors.ParserError.invalidHexColor(path: _, string: "thisIsn'tAColor", key: "ArticleTitle"?) {
+    } catch Colors.ParserError.invalidHexColor(path: _, string: "thisIsn'tAColor", key: "ArticleTitle") {
       // That's the expected exception we want to happen
     } catch let error {
       XCTFail("Unexpected error occured while parsing: \(error)")
diff --git a/Tests/SwiftGenKitTests/ColorsXMLFileTests.swift b/Tests/SwiftGenKitTests/ColorsXMLFileTests.swift
@@ -61,7 +61,7 @@ final class ColorsXMLFileTests: XCTestCase {
       let xmlParser = Colors.XMLFileParser(options: options)
       _ = try xmlParser.parseFile(at: Fixtures.path(for: "bad-value.xml", sub: .colors))
       XCTFail("Code did parse file successfully while it was expected to fail for bad value")
-    } catch Colors.ParserError.invalidHexColor(path: _, string: "this isn't a color", key: "ArticleTitle"?) {
+    } catch Colors.ParserError.invalidHexColor(path: _, string: "this isn't a color", key: "ArticleTitle") {
       // That's the expected exception we want to happen
     } catch let error {
       XCTFail("Unexpected error occured while parsing: \(error)")
diff --git a/Tests/TemplatesTests/ColorsTests.swift b/Tests/TemplatesTests/ColorsTests.swift
@@ -13,7 +13,6 @@ final class ColorsTests: XCTestCase {
   }
 
   // generate variations to test customname generation
-  // swiftlint:disable opening_brace
   private func variations(customName: String) -> VariationGenerator {
     { name, context in
       guard name == "defaults" else { return [(context: context, suffix: "")] }
@@ -41,7 +40,6 @@ final class ColorsTests: XCTestCase {
       ]
     }
   }
-  // swiftlint:enable opening_brace
 
   func testSwift4() {
     test(

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,12 @@ import PathKit`
`9`	`9`
`10`	`10`	`// MARK: Validators`
`11`	`11`
`12`		`-// swiftlint:disable opening_brace`
`13`	`12`	`func checkPath(type: String, assertion: @escaping (Path) -> Bool) -> ((Path) throws -> Path) {`
`14`	`13`	`{ (path: Path) throws -> Path in`
`15`	`14`	`guard assertion(path) else { throw ArgumentError.invalidType(value: path.description, type: type, argument: nil) }`
`16`	`15`	`return path`
`17`	`16`	`}`
`18`	`17`	`}`
`19`		`-// swiftlint:enable opening_brace`
`20`	`18`
`21`	`19`	`typealias PathValidator = ([Path]) throws -> ([Path])`
`22`	`20`	`let pathsExist: PathValidator = { paths in try paths.map(checkPath(type: "path") { $0.exists }) }`