Merge pull request #52 from zenangst/improve/not-loading-injection-in…

…-release

Add extra constraint to not load injection unless the main bundle is in derived data

Source/Shared/Injection.swift

@@ -86,6 +86,10 @@ public class Injection {
       return true
     }
 
+    if !Bundle.main.bundlePath.lowercased().contains("products/debug") {
+      return true
+    }
+
     // Search for injection in the loaded bundles.
     var result: Bool = false
     for bundle in Bundle.allBundles {
@@ -116,6 +120,7 @@ public class Injection {
   @discardableResult public static func load(then handler: (() -> Void)? = nil,
                                              swizzling: Bool = true,
                                              animations: Bool = true) -> Injection.Type {
+    defer { handler?() }
     guard !Injection.isLoaded else { return self }
 
     #if targetEnvironment(simulator) || os(macOS)
@@ -131,7 +136,6 @@ public class Injection {
     swizzleCollectionViews = swizzling
     swizzleCollectionViewLayouts = swizzling
     self.animations = animations
-    handler?()
     return self
   }
 

Tests/iOS+tvOS/UIApplicationDelegateTests.swift

@@ -21,6 +21,6 @@ class UIApplicationDelegateTests: XCTestCase {
     Injection.load(then: applicationDelegate.loadInitialState)
     applicationDelegate.addInjection(with: #selector(ApplicationDelegateMock.injected(_:)))
     utilities.triggerInjection()
-    XCTAssertEqual(applicationDelegate.timesInvoked, 1)
+    XCTAssertEqual(applicationDelegate.timesInvoked, 2)
   }
 }

Tests/macOS/NSApplicationDelegateTests.swift

@@ -21,6 +21,6 @@ class NSApplicationDelegateTests: XCTestCase {
     Injection.load(then: { applicationDelegate.loadInitialState() })
     applicationDelegate.addInjection(with: #selector(ApplicationDelegateMock.injected(_:)))
     utilities.triggerInjection()
-    XCTAssertEqual(applicationDelegate.timesInvoked, 1)
+    XCTAssertEqual(applicationDelegate.timesInvoked, 2)
   }
 }

Vaccine.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "Vaccine"
   s.summary          = "Make your apps immune to recompile-disease."
-  s.version          = "0.14.0"
+  s.version          = "0.14.1"
   s.homepage         = "https://github.com/zenangst/Vaccine"
   s.license          = 'MIT'
   s.author           = { "Christoffer Winterkvist" => "christoffer@winterkvist.com" }