Merge pull request #314 from AliSoftware/feature/spm-support

Adding Swift Package Manager Support

.gitignore

@@ -1,5 +1,6 @@
 # Xcode
 build/
+.build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -18,3 +19,9 @@ IDEWorkspaceChecks.plist
 # Carthage
 Carthage/
 OHHTTPStubs.framework.zip
+
+# Rubymine
+.idea/
+
+# SPM
+.swiftpm/

.travis.yml

@@ -10,29 +10,69 @@ before_install:
 matrix:
   include:
     - osx_image: xcode9.1
-      env: RAKETASK="ios[iOS StaticLib,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.0]"
+      env: RAKETASK="ios[iOS StaticLib,iPhone 7,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.0]"
     - osx_image: xcode9.1
-      env: RAKETASK="ios[iOS Framework,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.0]"
+      env: RAKETASK="ios[iOS Framework,iPhone 7,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.0]"
     - osx_image: xcode9.1
       env: RAKETASK="osx[Mac Framework,x86_64,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.0]"
     - osx_image: xcode9.1
       env: RAKETASK="tvos[tvOS Framework,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.0]"
+    - osx_image: xcode9.1
+      env: RAKETASK="build_carthage_frameworks[iOS,3.2]"
+    - osx_image: xcode9.1
+      env: RAKETASK="build_carthage_frameworks[tvOS,3.2]"
+    - osx_image: xcode9.1
+      env: RAKETASK="build_carthage_frameworks[MacOS,4.0]"
     - osx_image: xcode10.1
-      env: RAKETASK="ios[iOS StaticLib,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.2]"
+      env: RAKETASK="ios[iOS StaticLib,iPhone 7,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.2]"
     - osx_image: xcode10.1
-      env: RAKETASK="ios[iOS Framework,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.2]"
+      env: RAKETASK="ios[iOS Framework,iPhone 7,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.2]"
     - osx_image: xcode10.1
       env: RAKETASK="tvos[tvOS Framework,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.2]"
     - osx_image: xcode10.1
       env: RAKETASK="osx[Mac Framework,x86_64,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.2]"
+    - osx_image: xcode10.1
+      env: RAKETASK="spm_test"
+    - osx_image: xcode10.1
+      env: RAKETASK="build_carthage_frameworks[iOS,4.1]"
+    - osx_image: xcode10.1
+      env: RAKETASK="build_carthage_frameworks[tvOS,4.2]"
+    - osx_image: xcode10.1
+      env: RAKETASK="build_carthage_frameworks[MacOS,4.2]"
     - osx_image: xcode10.2
-      env: RAKETASK="ios[iOS StaticLib,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
+      env: RAKETASK="ios[iOS StaticLib,iPhone 7,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
     - osx_image: xcode10.2
-      env: RAKETASK="ios[iOS Framework,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
+      env: RAKETASK="ios[iOS Framework,iPhone 7,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
     - osx_image: xcode10.2
       env: RAKETASK="tvos[tvOS Framework,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
     - osx_image: xcode10.2
       env: RAKETASK="osx[Mac Framework,x86_64,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
+    - osx_image: xcode10.2
+      env: RAKETASK="spm_test"
+    - osx_image: xcode10.2
+      env: RAKETASK="build_carthage_frameworks[iOS,5.0]"
+    - osx_image: xcode10.2
+      env: RAKETASK="build_carthage_frameworks[tvOS,5.0]"
+    - osx_image: xcode10.2
+      env: RAKETASK="build_carthage_frameworks[MacOS,5.0]"
+    - osx_image: xcode11
+      env: RAKETASK="ios[iOS StaticLib,iPhone 8,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
+    - osx_image: xcode11
+      env: RAKETASK="ios[iOS Framework,iPhone 8,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
+    - osx_image: xcode11
+      env: RAKETASK="tvos[tvOS Framework,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
+    - osx_image: xcode11
+      env: RAKETASK="osx[Mac Framework,x86_64,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
+    - osx_image: xcode11
+      env: RAKETASK="spm_test"
+    - osx_image: xcode11
+      env: RAKETASK="build_carthage_frameworks[iOS,5.1]"
+    - osx_image: xcode11
+      env: RAKETASK="build_carthage_frameworks[tvOS,5.1]"
+    - osx_image: xcode11
+      env: RAKETASK="build_carthage_frameworks[MacOS,5.1]"
+    - osx_image: xcode11
+      env: RAKETASK="build_example_apps"
 
 
 script:

CHANGELOG.md

@@ -1,6 +1,13 @@
 # OHHTTPStubs — CHANGELOG
 
-## [8.0.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/7.0.0)
+
+## [9.0.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/9.0.0)
+
+* Added support for Swift Package Manager and dropped OH from all class names.    
+  [@jeffctown](https://github.com/jeffctown)
+
+
+## [8.0.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/8.0.0)
 
 * Update default Swift Version to 5.0
 [@croig](https://github.com/CRoig)
@@ -214,7 +221,7 @@ _Note that this last change also changed the signature of the `onStubActivation:
 * Fixed issue with Umbrella Headers.  
   [#127](https://github.com/AliSoftware/OHHTTPStubs/issues/127)
   [#131](https://github.com/AliSoftware/OHHTTPStubs/pull/131)
-* Added methods for creating `OHHTTPStubsResponse`s from `NSURL`s that represent file system resources.  
+* Added methods for creating `HTTPStubsResponse`s from `NSURL`s that represent file system resources.  
   [@MaxGabriel](https://github.com/MaxGabriel)
   [#129](https://github.com/AliSoftware/OHHTTPStubs/pull/129)
 * Bumped Swift subspec compatibility to OSX 10.9 instead of 10.7.
@@ -343,7 +350,7 @@ _(I also moved [Travis-CI build system](https://travis-ci.org/AliSoftware/OHHTTP
 
 ## [3.1.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.0)
 
-* The `OHHTTPStubsDescriptor` protocol now inherits from the `NSObject` protocol
+* The `HTTPStubsDescriptor` protocol now inherits from the `NSObject` protocol
 
 ## [3.0.4](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.0.4)
 
@@ -383,11 +390,11 @@ Note: **If you have already removed the calls to all `OHHTTPStubs` deprecated AP
 
 ## [2.3.1](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/2.3.1)
 
-* Fixed bug with OHHTTPStubsResponse+JSON when `nil` headers dictionary
+* Fixed bug with HTTPStubsResponse+JSON when `nil` headers dictionary
 
 ## [2.3.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/2.3.0)
 
-* Added the ability to give a name to a stub, for debugging purposes (property `name` of `id<OHHTTPStubsDescriptor>`)
+* Added the ability to give a name to a stub, for debugging purposes (property `name` of `id<HTTPStubsDescriptor>`)
 * Added `allStubs` method to list all installed stubs (with their name if they have one, see previous point)
 * Added `+[OHHTTPStubs onStubActivation:]` method to execute arbitrary code each time a stub is activated. Useful to log which stub is used for each request for example.
 
@@ -398,7 +405,7 @@ Note: **If you have already removed the calls to all `OHHTTPStubs` deprecated AP
 * Some API changes to make `OHHTTPStubs` to fit the new possibility of setting both `requestTime` and `responseTime`.
   * Old API is still there but deprecated, and will be removed in next major version
   * To convert to the new API, you will mainly simply:
-     * extract the `responseTime:` parameter to a method call of its own (`return [OHHTTPStubsResponse responseWithData:data statusCode:code responseTime:time headers:header];` will become `return [[OHHTTPStubsResponse responseWithData:data statusCode:code headers:headers] responseTime:time];` etc.)
+     * extract the `responseTime:` parameter to a method call of its own (`return [HTTPStubsResponse responseWithData:data statusCode:code responseTime:time headers:header];` will become `return [[HTTPStubsResponse responseWithData:data statusCode:code headers:headers] responseTime:time];` etc.)
      * convert `responseWithFile:filename` to `responseWithFileAtPath:OHPathForFileInBundle(filename,nil)`
 
 > Note: version `2.1.0-RC`, `2.1.0-rc.1`, `2.2.0-RC` and `2.2.1-RC` were intermediate Release Candidate versions during the big refactoring and migration to `2.2.1`, with the same new features as listed above basicaly, but without the last-minute bugfixes before official release.

Examples/ObjC/MainViewController.m

@@ -7,8 +7,8 @@
 //
 
 #import "MainViewController.h"
-#import <OHHTTPStubs/OHHTTPStubs.h>
-#import <OHHTTPStubs/OHPathHelpers.h>
+#import <OHHTTPStubs/HTTPStubs.h>
+#import <OHHTTPStubs/HTTPStubsPathHelpers.h>
 
 
 @interface MainViewController ()
@@ -31,7 +31,7 @@ - (void)viewDidLoad
 
     [self installTextStub:self.installTextStubSwitch];
     [self installImageStub:self.installImageStubSwitch];
-    [OHHTTPStubs onStubActivation:^(NSURLRequest * _Nonnull request, id<OHHTTPStubsDescriptor>  _Nonnull stub, OHHTTPStubsResponse * _Nonnull responseStub) {
+    [HTTPStubs onStubActivation:^(NSURLRequest * _Nonnull request, id<HTTPStubsDescriptor>  _Nonnull stub, HTTPStubsResponse * _Nonnull responseStub) {
         NSLog(@"[OHHTTPStubs] Request to %@ has been stubbed with %@", request.URL, stub.name);
     }];
 }
@@ -49,12 +49,12 @@ - (BOOL)shouldUseDelay {
 
 - (IBAction)toggleStubs:(UISwitch *)sender
 {
-    [OHHTTPStubs setEnabled:sender.on];
+    [HTTPStubs setEnabled:sender.on];
     self.delaySwitch.enabled = sender.on;
     self.installTextStubSwitch.enabled = sender.on;
     self.installImageStubSwitch.enabled = sender.on;
 
-    NSLog(@"Installed (%@) stubs: %@", (sender.on?@"and enabled":@"but disabled"), OHHTTPStubs.allStubs);
+    NSLog(@"Installed (%@) stubs: %@", (sender.on?@"and enabled":@"but disabled"), HTTPStubs.allStubs);
 }
 
 
@@ -88,16 +88,16 @@ - (IBAction)downloadText:(UIButton*)sender
 
 - (IBAction)installTextStub:(UISwitch *)sender
 {
-    static id<OHHTTPStubsDescriptor> textStub = nil; // Note: no need to retain this value, it is retained by the OHHTTPStubs itself already
+    static id<HTTPStubsDescriptor> textStub = nil; // Note: no need to retain this value, it is retained by the OHHTTPStubs itself already
     if (sender.on)
     {
         // Install
-        textStub = [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        textStub = [HTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
             // This stub will only configure stub requests for "*.txt" files
             return [request.URL.pathExtension isEqualToString:@"txt"];
-        } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        } withStubResponse:^HTTPStubsResponse *(NSURLRequest *request) {
             // Stub txt files with this
-            return [[OHHTTPStubsResponse responseWithFileAtPath:OHPathForFile(@"stub.txt", self.class)
+            return [[HTTPStubsResponse responseWithFileAtPath:OHPathForFile(@"stub.txt", self.class)
                                                      statusCode:200
                                                         headers:@{@"Content-Type":@"text/plain"}]
                     requestTime:[self shouldUseDelay] ? 2.f: 0.f
@@ -108,7 +108,7 @@ - (IBAction)installTextStub:(UISwitch *)sender
     else
     {
         // Uninstall
-        [OHHTTPStubs removeStub:textStub];
+        [HTTPStubs removeStub:textStub];
     }
 }
 
@@ -128,23 +128,25 @@ - (IBAction)downloadImage:(UIButton*)sender
                                        queue:[NSOperationQueue mainQueue]
                            completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
      {
-         sender.enabled = YES;
-         self.imageView.image = [UIImage imageWithData:data];
+         dispatch_async(dispatch_get_main_queue(), ^{
+            sender.enabled = YES;
+            self.imageView.image = [UIImage imageWithData:data];
+         });
      }];
 }
 
 - (IBAction)installImageStub:(UISwitch *)sender
 {
-    static id<OHHTTPStubsDescriptor> imageStub = nil; // Note: no need to retain this value, it is retained by the OHHTTPStubs itself already :)
+    static id<HTTPStubsDescriptor> imageStub = nil; // Note: no need to retain this value, it is retained by the OHHTTPStubs itself already :)
     if (sender.on)
     {
         // Install
-        imageStub = [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        imageStub = [HTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
             // This stub will only configure stub requests for "*.png" files
             return [request.URL.pathExtension isEqualToString:@"png"];
-        } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
+        } withStubResponse:^HTTPStubsResponse *(NSURLRequest *request) {
             // Stub jpg files with this
-            return [[OHHTTPStubsResponse responseWithFileAtPath:OHPathForFile(@"stub.jpg", self.class)
+            return [[HTTPStubsResponse responseWithFileAtPath:OHPathForFile(@"stub.jpg", self.class)
                                                      statusCode:200
                                                         headers:@{@"Content-Type":@"image/jpeg"}]
                     requestTime:[self shouldUseDelay] ? 2.f: 0.f
@@ -155,7 +157,7 @@ - (IBAction)installImageStub:(UISwitch *)sender
     else
     {
         // Uninstall
-        [OHHTTPStubs removeStub:imageStub];
+        [HTTPStubs removeStub:imageStub];
     }
 }
 
@@ -169,3 +171,4 @@ - (IBAction)clearResults
 }
 
 @end
+

Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj

@@ -14,9 +14,9 @@
 		098FBDE015D704E800623941 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 098FBDDF15D704E800623941 /* main.m */; };
 		098FBDED15D7056200623941 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 098FBDEB15D7056200623941 /* MainViewController.m */; };
 		098FBDEE15D7056200623941 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 098FBDEC15D7056200623941 /* MainViewController.xib */; };
-		098FBDF815D70E2600623941 /* stub.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 098FBDF615D70E2600623941 /* stub.jpg */; };
-		098FBDF915D70E2600623941 /* stub.txt in Resources */ = {isa = PBXBuildFile; fileRef = 098FBDF715D70E2600623941 /* stub.txt */; };
 		099C7343169016D800239880 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 099C7342169016D800239880 /* [email protected] */; };
+		1F9ADC8C230037EE00F87660 /* stub.txt in Resources */ = {isa = PBXBuildFile; fileRef = 1F9ADC8A230037EE00F87660 /* stub.txt */; };
+		1F9ADC8D230037EE00F87660 /* stub.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 1F9ADC8B230037EE00F87660 /* stub.jpg */; };
 		E8C65A455EC5B63D1737AF29 /* libPods-OHHTTPStubsDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F2958101F89CBC90FC44F99 /* libPods-OHHTTPStubsDemo.a */; };
 /* End PBXBuildFile section */
 
@@ -32,9 +32,9 @@
 		098FBDEA15D7056200623941 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = "<group>"; };
 		098FBDEB15D7056200623941 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = "<group>"; };
 		098FBDEC15D7056200623941 /* MainViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainViewController.xib; sourceTree = "<group>"; };
-		098FBDF615D70E2600623941 /* stub.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = stub.jpg; sourceTree = "<group>"; };
-		098FBDF715D70E2600623941 /* stub.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stub.txt; sourceTree = "<group>"; };
 		099C7342169016D800239880 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		1F9ADC8A230037EE00F87660 /* stub.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stub.txt; sourceTree = "<group>"; };
+		1F9ADC8B230037EE00F87660 /* stub.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = stub.jpg; sourceTree = "<group>"; };
 		48556A011AA6E9FD0074B154 /* libPods-OHHTTPStubs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libPods-OHHTTPStubs.a"; path = "Pods/../build/Debug-iphoneos/libPods-OHHTTPStubs.a"; sourceTree = "<group>"; };
 		6F2958101F89CBC90FC44F99 /* libPods-OHHTTPStubsDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OHHTTPStubsDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		801E977139BBDAC0CC11ECAC /* Pods-OHHTTPStubsDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OHHTTPStubsDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.debug.xcconfig"; sourceTree = "<group>"; };
@@ -94,7 +94,7 @@
 				098FBDEA15D7056200623941 /* MainViewController.h */,
 				098FBDEB15D7056200623941 /* MainViewController.m */,
 				098FBDEC15D7056200623941 /* MainViewController.xib */,
-				098FBDFA15D70E2F00623941 /* Stubs */,
+				1F9ADC89230037EE00F87660 /* Stubs */,
 				098FBDDA15D704E800623941 /* Supporting Files */,
 			);
 			name = OHHTTPStubsDemo;
@@ -111,22 +111,23 @@
 			path = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		098FBDFA15D70E2F00623941 /* Stubs */ = {
+		1B8830D2F747CB6ADB7875D1 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				098FBDF615D70E2600623941 /* stub.jpg */,
-				098FBDF715D70E2600623941 /* stub.txt */,
+				801E977139BBDAC0CC11ECAC /* Pods-OHHTTPStubsDemo.debug.xcconfig */,
+				B6814E1693353E0AADB9895C /* Pods-OHHTTPStubsDemo.release.xcconfig */,
 			);
-			path = Stubs;
+			name = Pods;
 			sourceTree = "<group>";
 		};
-		1B8830D2F747CB6ADB7875D1 /* Pods */ = {
+		1F9ADC89230037EE00F87660 /* Stubs */ = {
 			isa = PBXGroup;
 			children = (
-				801E977139BBDAC0CC11ECAC /* Pods-OHHTTPStubsDemo.debug.xcconfig */,
-				B6814E1693353E0AADB9895C /* Pods-OHHTTPStubsDemo.release.xcconfig */,
+				1F9ADC8A230037EE00F87660 /* stub.txt */,
+				1F9ADC8B230037EE00F87660 /* stub.jpg */,
 			);
-			name = Pods;
+			name = Stubs;
+			path = ../Stubs;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -188,8 +189,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				098FBDEE15D7056200623941 /* MainViewController.xib in Resources */,
-				098FBDF815D70E2600623941 /* stub.jpg in Resources */,
-				098FBDF915D70E2600623941 /* stub.txt in Resources */,
+				1F9ADC8D230037EE00F87660 /* stub.jpg in Resources */,
+				1F9ADC8C230037EE00F87660 /* stub.txt in Resources */,
 				099C7343169016D800239880 /* [email protected] in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;