Move SwiftTryCatch into this repo directly (#737)

* Move SwiftTryCatch into this repo directly

This is to avoid possible issues with incompatible dependencies, and the library is very simple to incorporate directly

* Amended changelog

CHANGELOG.md

@@ -8,6 +8,10 @@
 - Fix missing folder error that could happen when running a Swift template with existing cache
 - Don't add indentation to empty line when using inline generated code.
 
+### Internal Changes
+
+- Removed dependency on SwiftTryCatch pod in order to avoid Swift Package Manager errors.
+
 ## 0.16.0
 
 - Replaces environment variables inside .yml configurations (like ${PROJECT_NAME}), if a value is set.

Package.resolved

@@ -33,8 +33,8 @@
         "repositoryURL": "https://github.com/Quick/Nimble.git",
         "state": {
           "branch": null,
-          "revision": "cd6dfb86f496fcd96ce0bc6da962cd936bf41903",
-          "version": "7.3.1"
+          "revision": "e9d769113660769a4d9dd3afb855562c0b7ae7b0",
+          "version": "7.3.4"
         }
       },
       {
@@ -51,26 +51,26 @@
         "repositoryURL": "https://github.com/Quick/Quick.git",
         "state": {
           "branch": null,
-          "revision": "5fbf13871d185526993130c3a1fad0b70bfe37ce",
-          "version": "1.3.2"
+          "revision": "f2b5a06440ea87eba1a167cab37bf6496646c52e",
+          "version": "1.3.4"
         }
       },
       {
         "package": "Result",
         "repositoryURL": "https://github.com/antitypical/Result.git",
         "state": {
           "branch": null,
-          "revision": "8fc088dcf72802801efeecba76ea8fb041fb773d",
-          "version": "4.0.0"
+          "revision": "2ca499ba456795616fbc471561ff1d963e6ae160",
+          "version": "4.1.0"
         }
       },
       {
         "package": "ShellOut",
         "repositoryURL": "https://github.com/JohnSundell/ShellOut.git",
         "state": {
           "branch": null,
-          "revision": "f1c253a34a40df4bfd268b09fdb101b059f6d52d",
-          "version": "2.1.0"
+          "revision": "d3d54ce662dfee7fef619330b71d251b8d4869f9",
+          "version": "2.2.0"
         }
       },
       {
@@ -109,22 +109,13 @@
           "version": "2.7.0"
         }
       },
-      {
-        "package": "SwiftTryCatch",
-        "repositoryURL": "https://github.com/seanparsons/SwiftTryCatch.git",
-        "state": {
-          "branch": null,
-          "revision": "e7074a72e4d4dc516f391bc4d4afd8ca6a845b4b",
-          "version": null
-        }
-      },
       {
         "package": "SWXMLHash",
         "repositoryURL": "https://github.com/drmohundro/SWXMLHash.git",
         "state": {
           "branch": null,
-          "revision": "0ce63a93a455adb3cd5e4c55f78f1232a590a5a5",
-          "version": "4.7.2"
+          "revision": "0d6bb315528888edde0dafe93564f074669c44e9",
+          "version": "4.8.0"
         }
       },
       {

Package.swift

@@ -17,7 +17,6 @@ let package = Package(
         .package(url: "https://github.com/jpsim/SourceKitten.git", .exact("0.21.2")),
         .package(url: "https://github.com/kylef/Stencil.git", .exact("0.13.1")),
         .package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", .exact("2.7.0")),
-        .package(url: "https://github.com/seanparsons/SwiftTryCatch.git", .revision("6a177252cfa2ef649b0aa7b2d16ab221386ca51c")),
         .package(url: "https://github.com/tuist/xcodeproj", .exact("4.3.1")),
         .package(url: "https://github.com/tadija/AEXML.git", .exact("4.3.3")),
     ],
@@ -32,7 +31,7 @@ let package = Package(
             "SourceKittenFramework",
             "StencilSwiftKit",
             "xcproj",
-            "SwiftTryCatch",
+            "TryCatch",
         ]),
         .target(name: "SourceryRuntime"),
         .target(name: "SourceryUtils", dependencies: [
@@ -50,6 +49,7 @@ let package = Package(
           "PathKit",
           "SourceryRuntime",
           "SourceryUtils"
-        ])
+        ]),
+        .target(name: "TryCatch", path: "TryCatch"),
     ]
 )

Podfile

@@ -36,7 +36,6 @@ target 'Sourcery' do
   pathkit
   pod "xcproj", :git =>'git@github.com:tuist/xcodeproj.git', :tag => '4.3.1'
   pod 'SourceKittenFramework', '0.21.2'
-  pod 'SwiftTryCatch', :git => 'git@github.com:seanparsons/SwiftTryCatch', :commit => '798c512'
   pod 'Yams', '1.0.1'
 
   target 'SourceryTests' do

Podfile.lock

@@ -12,7 +12,6 @@ PODS:
   - StencilSwiftKit (2.7.0):
     - Stencil (~> 0.13.0)
   - SwiftLint (0.27.0)
-  - SwiftTryCatch (1.0.0)
   - SWXMLHash (4.7.2)
   - xcproj (4.3.0):
     - AEXML (~> 4.3)
@@ -28,7 +27,6 @@ DEPENDENCIES:
   - Stencil (= 0.13.1)
   - StencilSwiftKit (= 2.7.0)
   - SwiftLint
-  - "SwiftTryCatch (from `git@github.com:seanparsons/SwiftTryCatch`, commit `798c512`)"
   - "xcproj (from `git@github.com:tuist/xcodeproj.git`, tag `4.3.1`)"
   - Yams (= 1.0.1)
 
@@ -47,17 +45,11 @@ SPEC REPOS:
     - Yams
 
 EXTERNAL SOURCES:
-  SwiftTryCatch:
-    :commit: 798c512
-    :git: "git@github.com:seanparsons/SwiftTryCatch"
   xcproj:
     :git: "git@github.com:tuist/xcodeproj.git"
     :tag: 4.3.1
 
 CHECKOUT OPTIONS:
-  SwiftTryCatch:
-    :commit: 798c512
-    :git: "git@github.com:seanparsons/SwiftTryCatch"
   xcproj:
     :git: "git@github.com:tuist/xcodeproj.git"
     :tag: 4.3.1
@@ -72,11 +64,10 @@ SPEC CHECKSUMS:
   Stencil: b5128a0a43ece9225db5cbd94d6569fe6fba609b
   StencilSwiftKit: ccc2fb75e4fc74759e02ed516ca6e27adc921f83
   SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
-  SwiftTryCatch: 8dec58919b07ddba4f23c80e814f7e49f05da548
   SWXMLHash: f0761e5c5d1a49f6553609bd0f5696a61738c5b9
   xcproj: 7a9fe0c5f00617c0fa306b37858f157c786aff42
   Yams: 572f625a8b719b73e0b57fd313c680f3e2161fe9
 
-PODFILE CHECKSUM: debe5f008be5738ff15464e280d4cc70c89ea3b1
+PODFILE CHECKSUM: 2768dab77b8dff8877674f3a81053e20c3957369
 
-COCOAPODS: 1.6.0.beta.1
+COCOAPODS: 1.6.1