Skip to content

Commit e92b5a5

Browse files
jeffctownjeffctown
authored
Merge pull request #314 from AliSoftware/feature/spm-support
Adding Swift Package Manager Support
2 parents 455f575 + f158eec commit e92b5a5

File tree

226 files changed

+2794
-1510
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+2794
-1510
lines changed

‎.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Xcode
22
build/
3+
.build/
34
*.pbxuser
45
!default.pbxuser
56
*.mode1v3
@@ -18,3 +19,9 @@ IDEWorkspaceChecks.plist
1819
# Carthage
1920
Carthage/
2021
OHHTTPStubs.framework.zip
22+
23+
# Rubymine
24+
.idea/
25+
26+
# SPM
27+
.swiftpm/

‎.travis.yml

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,69 @@ before_install:
1010
matrix:
1111
include:
1212
- osx_image: xcode9.1
13-
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]"
13+
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]"
1414
- osx_image: xcode9.1
15-
env: RAKETASK="ios[iOS Framework,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.0]"
15+
env: RAKETASK="ios[iOS Framework,iPhone 7,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.0]"
1616
- osx_image: xcode9.1
1717
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]"
1818
- osx_image: xcode9.1
1919
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]"
20+
- osx_image: xcode9.1
21+
env: RAKETASK="build_carthage_frameworks[iOS,3.2]"
22+
- osx_image: xcode9.1
23+
env: RAKETASK="build_carthage_frameworks[tvOS,3.2]"
24+
- osx_image: xcode9.1
25+
env: RAKETASK="build_carthage_frameworks[MacOS,4.0]"
2026
- osx_image: xcode10.1
21-
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]"
27+
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]"
2228
- osx_image: xcode10.1
23-
env: RAKETASK="ios[iOS Framework,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.2]"
29+
env: RAKETASK="ios[iOS Framework,iPhone 7,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1 SWIFT_VERSION=4.2]"
2430
- osx_image: xcode10.1
2531
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]"
2632
- osx_image: xcode10.1
2733
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]"
34+
- osx_image: xcode10.1
35+
env: RAKETASK="spm_test"
36+
- osx_image: xcode10.1
37+
env: RAKETASK="build_carthage_frameworks[iOS,4.1]"
38+
- osx_image: xcode10.1
39+
env: RAKETASK="build_carthage_frameworks[tvOS,4.2]"
40+
- osx_image: xcode10.1
41+
env: RAKETASK="build_carthage_frameworks[MacOS,4.2]"
2842
- osx_image: xcode10.2
29-
env: RAKETASK="ios[iOS StaticLib,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
43+
env: RAKETASK="ios[iOS StaticLib,iPhone 7,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
3044
- osx_image: xcode10.2
31-
env: RAKETASK="ios[iOS Framework,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
45+
env: RAKETASK="ios[iOS Framework,iPhone 7,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
3246
- osx_image: xcode10.2
3347
env: RAKETASK="tvos[tvOS Framework,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
3448
- osx_image: xcode10.2
3549
env: RAKETASK="osx[Mac Framework,x86_64,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
50+
- osx_image: xcode10.2
51+
env: RAKETASK="spm_test"
52+
- osx_image: xcode10.2
53+
env: RAKETASK="build_carthage_frameworks[iOS,5.0]"
54+
- osx_image: xcode10.2
55+
env: RAKETASK="build_carthage_frameworks[tvOS,5.0]"
56+
- osx_image: xcode10.2
57+
env: RAKETASK="build_carthage_frameworks[MacOS,5.0]"
58+
- osx_image: xcode11
59+
env: RAKETASK="ios[iOS StaticLib,iPhone 8,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
60+
- osx_image: xcode11
61+
env: RAKETASK="ios[iOS Framework,iPhone 8,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
62+
- osx_image: xcode11
63+
env: RAKETASK="tvos[tvOS Framework,latest,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
64+
- osx_image: xcode11
65+
env: RAKETASK="osx[Mac Framework,x86_64,build-for-testing test-without-building,OHHTTPSTUBS_SKIP_TIMING_TESTS=1 OHHTTPSTUBS_SKIP_REDIRECT_TESTS=1]"
66+
- osx_image: xcode11
67+
env: RAKETASK="spm_test"
68+
- osx_image: xcode11
69+
env: RAKETASK="build_carthage_frameworks[iOS,5.1]"
70+
- osx_image: xcode11
71+
env: RAKETASK="build_carthage_frameworks[tvOS,5.1]"
72+
- osx_image: xcode11
73+
env: RAKETASK="build_carthage_frameworks[MacOS,5.1]"
74+
- osx_image: xcode11
75+
env: RAKETASK="build_example_apps"
3676

3777

3878
script:

‎CHANGELOG.md

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# OHHTTPStubs — CHANGELOG
22

3-
## [8.0.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/7.0.0)
3+
4+
## [9.0.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/9.0.0)
5+
6+
* Added support for Swift Package Manager and dropped OH from all class names.
7+
[@jeffctown](https://github.com/jeffctown)
8+
9+
10+
## [8.0.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/8.0.0)
411

512
* Update default Swift Version to 5.0
613
[@croig](https://github.com/CRoig)
@@ -214,7 +221,7 @@ _Note that this last change also changed the signature of the `onStubActivation:
214221
* Fixed issue with Umbrella Headers.
215222
[#127](https://github.com/AliSoftware/OHHTTPStubs/issues/127)
216223
[#131](https://github.com/AliSoftware/OHHTTPStubs/pull/131)
217-
* Added methods for creating `OHHTTPStubsResponse`s from `NSURL`s that represent file system resources.
224+
* Added methods for creating `HTTPStubsResponse`s from `NSURL`s that represent file system resources.
218225
[@MaxGabriel](https://github.com/MaxGabriel)
219226
[#129](https://github.com/AliSoftware/OHHTTPStubs/pull/129)
220227
* 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
343350

344351
## [3.1.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.0)
345352

346-
* The `OHHTTPStubsDescriptor` protocol now inherits from the `NSObject` protocol
353+
* The `HTTPStubsDescriptor` protocol now inherits from the `NSObject` protocol
347354

348355
## [3.0.4](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.0.4)
349356

@@ -383,11 +390,11 @@ Note: **If you have already removed the calls to all `OHHTTPStubs` deprecated AP
383390

384391
## [2.3.1](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/2.3.1)
385392

386-
* Fixed bug with OHHTTPStubsResponse+JSON when `nil` headers dictionary
393+
* Fixed bug with HTTPStubsResponse+JSON when `nil` headers dictionary
387394

388395
## [2.3.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/2.3.0)
389396

390-
* Added the ability to give a name to a stub, for debugging purposes (property `name` of `id<OHHTTPStubsDescriptor>`)
397+
* Added the ability to give a name to a stub, for debugging purposes (property `name` of `id<HTTPStubsDescriptor>`)
391398
* Added `allStubs` method to list all installed stubs (with their name if they have one, see previous point)
392399
* 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.
393400

@@ -398,7 +405,7 @@ Note: **If you have already removed the calls to all `OHHTTPStubs` deprecated AP
398405
* Some API changes to make `OHHTTPStubs` to fit the new possibility of setting both `requestTime` and `responseTime`.
399406
* Old API is still there but deprecated, and will be removed in next major version
400407
* To convert to the new API, you will mainly simply:
401-
* 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.)
408+
* 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.)
402409
* convert `responseWithFile:filename` to `responseWithFileAtPath:OHPathForFileInBundle(filename,nil)`
403410

404411
> 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

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//
88

99
#import "MainViewController.h"
10-
#import <OHHTTPStubs/OHHTTPStubs.h>
11-
#import <OHHTTPStubs/OHPathHelpers.h>
10+
#import <OHHTTPStubs/HTTPStubs.h>
11+
#import <OHHTTPStubs/HTTPStubsPathHelpers.h>
1212

1313

1414
@interface MainViewController ()
@@ -31,7 +31,7 @@ - (void)viewDidLoad
3131

3232
[self installTextStub:self.installTextStubSwitch];
3333
[self installImageStub:self.installImageStubSwitch];
34-
[OHHTTPStubs onStubActivation:^(NSURLRequest * _Nonnull request, id<OHHTTPStubsDescriptor> _Nonnull stub, OHHTTPStubsResponse * _Nonnull responseStub) {
34+
[HTTPStubs onStubActivation:^(NSURLRequest * _Nonnull request, id<HTTPStubsDescriptor> _Nonnull stub, HTTPStubsResponse * _Nonnull responseStub) {
3535
NSLog(@"[OHHTTPStubs] Request to %@ has been stubbed with %@", request.URL, stub.name);
3636
}];
3737
}
@@ -49,12 +49,12 @@ - (BOOL)shouldUseDelay {
4949

5050
- (IBAction)toggleStubs:(UISwitch *)sender
5151
{
52-
[OHHTTPStubs setEnabled:sender.on];
52+
[HTTPStubs setEnabled:sender.on];
5353
self.delaySwitch.enabled = sender.on;
5454
self.installTextStubSwitch.enabled = sender.on;
5555
self.installImageStubSwitch.enabled = sender.on;
5656

57-
NSLog(@"Installed (%@) stubs: %@", (sender.on?@"and enabled":@"but disabled"), OHHTTPStubs.allStubs);
57+
NSLog(@"Installed (%@) stubs: %@", (sender.on?@"and enabled":@"but disabled"), HTTPStubs.allStubs);
5858
}
5959

6060

@@ -88,16 +88,16 @@ - (IBAction)downloadText:(UIButton*)sender
8888

8989
- (IBAction)installTextStub:(UISwitch *)sender
9090
{
91-
static id<OHHTTPStubsDescriptor> textStub = nil; // Note: no need to retain this value, it is retained by the OHHTTPStubs itself already
91+
static id<HTTPStubsDescriptor> textStub = nil; // Note: no need to retain this value, it is retained by the OHHTTPStubs itself already
9292
if (sender.on)
9393
{
9494
// Install
95-
textStub = [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
95+
textStub = [HTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
9696
// This stub will only configure stub requests for "*.txt" files
9797
return [request.URL.pathExtension isEqualToString:@"txt"];
98-
} withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
98+
} withStubResponse:^HTTPStubsResponse *(NSURLRequest *request) {
9999
// Stub txt files with this
100-
return [[OHHTTPStubsResponse responseWithFileAtPath:OHPathForFile(@"stub.txt", self.class)
100+
return [[HTTPStubsResponse responseWithFileAtPath:OHPathForFile(@"stub.txt", self.class)
101101
statusCode:200
102102
headers:@{@"Content-Type":@"text/plain"}]
103103
requestTime:[self shouldUseDelay] ? 2.f: 0.f
@@ -108,7 +108,7 @@ - (IBAction)installTextStub:(UISwitch *)sender
108108
else
109109
{
110110
// Uninstall
111-
[OHHTTPStubs removeStub:textStub];
111+
[HTTPStubs removeStub:textStub];
112112
}
113113
}
114114

@@ -128,23 +128,25 @@ - (IBAction)downloadImage:(UIButton*)sender
128128
queue:[NSOperationQueue mainQueue]
129129
completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
130130
{
131-
sender.enabled = YES;
132-
self.imageView.image = [UIImage imageWithData:data];
131+
dispatch_async(dispatch_get_main_queue(), ^{
132+
sender.enabled = YES;
133+
self.imageView.image = [UIImage imageWithData:data];
134+
});
133135
}];
134136
}
135137

136138
- (IBAction)installImageStub:(UISwitch *)sender
137139
{
138-
static id<OHHTTPStubsDescriptor> imageStub = nil; // Note: no need to retain this value, it is retained by the OHHTTPStubs itself already :)
140+
static id<HTTPStubsDescriptor> imageStub = nil; // Note: no need to retain this value, it is retained by the OHHTTPStubs itself already :)
139141
if (sender.on)
140142
{
141143
// Install
142-
imageStub = [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
144+
imageStub = [HTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
143145
// This stub will only configure stub requests for "*.png" files
144146
return [request.URL.pathExtension isEqualToString:@"png"];
145-
} withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
147+
} withStubResponse:^HTTPStubsResponse *(NSURLRequest *request) {
146148
// Stub jpg files with this
147-
return [[OHHTTPStubsResponse responseWithFileAtPath:OHPathForFile(@"stub.jpg", self.class)
149+
return [[HTTPStubsResponse responseWithFileAtPath:OHPathForFile(@"stub.jpg", self.class)
148150
statusCode:200
149151
headers:@{@"Content-Type":@"image/jpeg"}]
150152
requestTime:[self shouldUseDelay] ? 2.f: 0.f
@@ -155,7 +157,7 @@ - (IBAction)installImageStub:(UISwitch *)sender
155157
else
156158
{
157159
// Uninstall
158-
[OHHTTPStubs removeStub:imageStub];
160+
[HTTPStubs removeStub:imageStub];
159161
}
160162
}
161163

@@ -169,3 +171,4 @@ - (IBAction)clearResults
169171
}
170172

171173
@end
174+

‎Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
098FBDE015D704E800623941 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 098FBDDF15D704E800623941 /* main.m */; };
1515
098FBDED15D7056200623941 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 098FBDEB15D7056200623941 /* MainViewController.m */; };
1616
098FBDEE15D7056200623941 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 098FBDEC15D7056200623941 /* MainViewController.xib */; };
17-
098FBDF815D70E2600623941 /* stub.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 098FBDF615D70E2600623941 /* stub.jpg */; };
18-
098FBDF915D70E2600623941 /* stub.txt in Resources */ = {isa = PBXBuildFile; fileRef = 098FBDF715D70E2600623941 /* stub.txt */; };
1917
099C7343169016D800239880 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 099C7342169016D800239880 /* Default-568h@2x.png */; };
18+
1F9ADC8C230037EE00F87660 /* stub.txt in Resources */ = {isa = PBXBuildFile; fileRef = 1F9ADC8A230037EE00F87660 /* stub.txt */; };
19+
1F9ADC8D230037EE00F87660 /* stub.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 1F9ADC8B230037EE00F87660 /* stub.jpg */; };
2020
E8C65A455EC5B63D1737AF29 /* libPods-OHHTTPStubsDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F2958101F89CBC90FC44F99 /* libPods-OHHTTPStubsDemo.a */; };
2121
/* End PBXBuildFile section */
2222

@@ -32,9 +32,9 @@
3232
098FBDEA15D7056200623941 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = "<group>"; };
3333
098FBDEB15D7056200623941 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = "<group>"; };
3434
098FBDEC15D7056200623941 /* MainViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainViewController.xib; sourceTree = "<group>"; };
35-
098FBDF615D70E2600623941 /* stub.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = stub.jpg; sourceTree = "<group>"; };
36-
098FBDF715D70E2600623941 /* stub.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stub.txt; sourceTree = "<group>"; };
3735
099C7342169016D800239880 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
36+
1F9ADC8A230037EE00F87660 /* stub.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stub.txt; sourceTree = "<group>"; };
37+
1F9ADC8B230037EE00F87660 /* stub.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = stub.jpg; sourceTree = "<group>"; };
3838
48556A011AA6E9FD0074B154 /* libPods-OHHTTPStubs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libPods-OHHTTPStubs.a"; path = "Pods/../build/Debug-iphoneos/libPods-OHHTTPStubs.a"; sourceTree = "<group>"; };
3939
6F2958101F89CBC90FC44F99 /* libPods-OHHTTPStubsDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OHHTTPStubsDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4040
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 @@
9494
098FBDEA15D7056200623941 /* MainViewController.h */,
9595
098FBDEB15D7056200623941 /* MainViewController.m */,
9696
098FBDEC15D7056200623941 /* MainViewController.xib */,
97-
098FBDFA15D70E2F00623941 /* Stubs */,
97+
1F9ADC89230037EE00F87660 /* Stubs */,
9898
098FBDDA15D704E800623941 /* Supporting Files */,
9999
);
100100
name = OHHTTPStubsDemo;
@@ -111,22 +111,23 @@
111111
path = "Supporting Files";
112112
sourceTree = "<group>";
113113
};
114-
098FBDFA15D70E2F00623941 /* Stubs */ = {
114+
1B8830D2F747CB6ADB7875D1 /* Pods */ = {
115115
isa = PBXGroup;
116116
children = (
117-
098FBDF615D70E2600623941 /* stub.jpg */,
118-
098FBDF715D70E2600623941 /* stub.txt */,
117+
801E977139BBDAC0CC11ECAC /* Pods-OHHTTPStubsDemo.debug.xcconfig */,
118+
B6814E1693353E0AADB9895C /* Pods-OHHTTPStubsDemo.release.xcconfig */,
119119
);
120-
path = Stubs;
120+
name = Pods;
121121
sourceTree = "<group>";
122122
};
123-
1B8830D2F747CB6ADB7875D1 /* Pods */ = {
123+
1F9ADC89230037EE00F87660 /* Stubs */ = {
124124
isa = PBXGroup;
125125
children = (
126-
801E977139BBDAC0CC11ECAC /* Pods-OHHTTPStubsDemo.debug.xcconfig */,
127-
B6814E1693353E0AADB9895C /* Pods-OHHTTPStubsDemo.release.xcconfig */,
126+
1F9ADC8A230037EE00F87660 /* stub.txt */,
127+
1F9ADC8B230037EE00F87660 /* stub.jpg */,
128128
);
129-
name = Pods;
129+
name = Stubs;
130+
path = ../Stubs;
130131
sourceTree = "<group>";
131132
};
132133
/* End PBXGroup section */
@@ -188,8 +189,8 @@
188189
buildActionMask = 2147483647;
189190
files = (
190191
098FBDEE15D7056200623941 /* MainViewController.xib in Resources */,
191-
098FBDF815D70E2600623941 /* stub.jpg in Resources */,
192-
098FBDF915D70E2600623941 /* stub.txt in Resources */,
192+
1F9ADC8D230037EE00F87660 /* stub.jpg in Resources */,
193+
1F9ADC8C230037EE00F87660 /* stub.txt in Resources */,
193194
099C7343169016D800239880 /* Default-568h@2x.png in Resources */,
194195
);
195196
runOnlyForDeploymentPostprocessing = 0;

0 commit comments

Comments
 (0)