Don't reset generated projects for non-Carthage compatible frameworks

Fixes #35.
JamitLabs · Apr 26, 2019 · 779e3fc · 779e3fc
1 parent 746ba2a
commit 779e3fc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/Sources/AccioKit/Services/CachedBuilderService.swift b/Sources/AccioKit/Services/CachedBuilderService.swift
@@ -19,10 +19,22 @@ final class CachedBuilderService {
                 switch try InstallationTypeDetectorService.shared.detectInstallationType(for: framework) {
                 case .swiftPackageManager:
                     try XcodeProjectGeneratorService.shared.generateXcodeProject(framework: framework)
-                    fallthrough
+                    let frameworkProduct = try carthageBuilderService.build(
+                        framework: framework,
+                        platform: platform,
+                        alreadyBuiltFrameworkProducts: frameworkProducts
+                    )
+                    frameworkProducts.append(frameworkProduct)
 
                 case .carthage:
-                    let frameworkProduct = try carthageBuilderService.build(framework: framework, platform: platform, alreadyBuiltFrameworkProducts: frameworkProducts)
+                    try bash("git -C '\(framework.projectDirectory)' reset HEAD --hard --quiet")
+                    try bash("git -C '\(framework.projectDirectory)' clean -fd --quiet")
+
+                    let frameworkProduct = try carthageBuilderService.build(
+                        framework: framework,
+                        platform: platform,
+                        alreadyBuiltFrameworkProducts: frameworkProducts
+                    )
                     frameworkProducts.append(frameworkProduct)
                 }
             }

diff --git a/Sources/AccioKit/Services/CarthageBuilderService.swift b/Sources/AccioKit/Services/CarthageBuilderService.swift
@@ -15,9 +15,6 @@ final class CarthageBuilderService {
     func build(framework: Framework, platform: Platform, alreadyBuiltFrameworkProducts: [FrameworkProduct]) throws -> FrameworkProduct {
         print("Building library \(framework.libraryName) with Carthage ...", level: .info)
 
-        try bash("git -C '\(framework.projectDirectory)' reset HEAD --hard --quiet")
-        try bash("git -C '\(framework.projectDirectory)' clean -fd --quiet")
-
         // link already built subdependencies from previous calls of this method
         for requiredFramework in framework.requiredFrameworks.flattenedDeepFirstOrder() {
             guard let requiredFrameworkProduct = alreadyBuiltFrameworkProducts.first(where: { $0.libraryName == requiredFramework.libraryName }) else {