Add Type converter to registry.

appsquickly · Nov 29, 2013 · c0163e4 · c0163e4
1 parent 4023374
commit c0163e4
Show file tree

Hide file tree

Showing 7 changed files with 2,448 additions and 2,438 deletions.
diff --git a/Source/TypeConversion/TyphoonTypeConverterRegistry.m b/Source/TypeConversion/TyphoonTypeConverterRegistry.m
@@ -21,6 +21,7 @@
 #if TARGET_OS_IPHONE
 
 #import "TyphoonUIColorTypeConverter.h"
+#import "TyphoonBundledImageTypeConverter.h"
 
 #endif
 
@@ -113,6 +114,7 @@ - (void)registerPlatformConverters
 #if TARGET_OS_IPHONE
     {
         [self register:[[TyphoonUIColorTypeConverter alloc] init] forClassOrProtocol:NSClassFromString(@"UIColor")];
+        [self register:[[TyphoonBundledImageTypeConverter alloc] init] forClassOrProtocol:NSClassFromString(@"UIImage")];
     }
 #else
     {

diff --git a/Tests/Podfile.lock b/Tests/Podfile.lock
@@ -2,7 +2,7 @@ PODS:
   - OCHamcrest (1.9)
   - OCMockito (0.23):
     - OCHamcrest
-  - Typhoon (1.5.7)
+  - Typhoon (1.5.8)
 
 DEPENDENCIES:
   - OCHamcrest (~> 1.9)
@@ -16,6 +16,6 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   OCHamcrest: f8393efd5a49d91879be573635d6183effacc0ab
   OCMockito: 01560fd24319b85c223e10f52e2e41fbe2c6d434
-  Typhoon: 99fca282d720c449f7e02946b42ea9cd8bf57ce8
+  Typhoon: bb902448b9d10bd4182e5984c44b0e3c393d908d
 
 COCOAPODS: 0.28.0
diff --git a/Tests/Pods/Local Podspecs/Typhoon.podspec b/Tests/Pods/Local Podspecs/Typhoon.podspec
diff --git a/Tests/Pods/Manifest.lock b/Tests/Pods/Manifest.lock
diff --git a/Tests/Pods/Pods-iOS Tests (Cocoapods)-environment.h b/Tests/Pods/Pods-iOS Tests (Cocoapods)-environment.h
diff --git a/Tests/Pods/Pods-osx-environment.h b/Tests/Pods/Pods-osx-environment.h
diff --git a/Tests/Pods/Pods.xcodeproj/project.pbxproj b/Tests/Pods/Pods.xcodeproj/project.pbxproj