Skip to content

Commit 30246ce

Browse files
authored
Merge pull request #303 from AliSoftware/release/6.2.0
Preparing for release.
2 parents e2dd12e + ca9bf39 commit 30246ce

File tree

22 files changed

+846
-742
lines changed

22 files changed

+846
-742
lines changed

CHANGELOG.md

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

3-
## [Future release]
3+
## [6.2.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/6.2.0)
44
* Enabled application extension API only.
55
[@lightsprint09](https://github.com/lightsprint09)
66
* Disabled a flaky redirect test and adding the known issue with redirects to the README.

Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@
140140
098FBDCB15D704E800623941 /* Sources */,
141141
098FBDCC15D704E800623941 /* Frameworks */,
142142
098FBDCD15D704E800623941 /* Resources */,
143-
E995647606B5F88176D77469 /* [CP] Embed Pods Frameworks */,
144-
6B18D0B3FE72E104611BF67D /* [CP] Copy Pods Resources */,
145143
);
146144
buildRules = (
147145
);
@@ -216,36 +214,6 @@
216214
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
217215
showEnvVarsInLog = 0;
218216
};
219-
6B18D0B3FE72E104611BF67D /* [CP] Copy Pods Resources */ = {
220-
isa = PBXShellScriptBuildPhase;
221-
buildActionMask = 2147483647;
222-
files = (
223-
);
224-
inputPaths = (
225-
);
226-
name = "[CP] Copy Pods Resources";
227-
outputPaths = (
228-
);
229-
runOnlyForDeploymentPostprocessing = 0;
230-
shellPath = /bin/sh;
231-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-resources.sh\"\n";
232-
showEnvVarsInLog = 0;
233-
};
234-
E995647606B5F88176D77469 /* [CP] Embed Pods Frameworks */ = {
235-
isa = PBXShellScriptBuildPhase;
236-
buildActionMask = 2147483647;
237-
files = (
238-
);
239-
inputPaths = (
240-
);
241-
name = "[CP] Embed Pods Frameworks";
242-
outputPaths = (
243-
);
244-
runOnlyForDeploymentPostprocessing = 0;
245-
shellPath = /bin/sh;
246-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-frameworks.sh\"\n";
247-
showEnvVarsInLog = 0;
248-
};
249217
/* End PBXShellScriptBuildPhase section */
250218

251219
/* Begin PBXSourcesBuildPhase section */

Examples/ObjC/Podfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
PODS:
2-
- OHHTTPStubs (6.1.0):
3-
- OHHTTPStubs/Default (= 6.1.0)
4-
- OHHTTPStubs/Core (6.1.0)
5-
- OHHTTPStubs/Default (6.1.0):
2+
- OHHTTPStubs (6.2.0):
3+
- OHHTTPStubs/Default (= 6.2.0)
4+
- OHHTTPStubs/Core (6.2.0)
5+
- OHHTTPStubs/Default (6.2.0):
66
- OHHTTPStubs/Core
77
- OHHTTPStubs/JSON
88
- OHHTTPStubs/NSURLSession
99
- OHHTTPStubs/OHPathHelpers
10-
- OHHTTPStubs/JSON (6.1.0):
10+
- OHHTTPStubs/JSON (6.2.0):
1111
- OHHTTPStubs/Core
12-
- OHHTTPStubs/NSURLSession (6.1.0):
12+
- OHHTTPStubs/NSURLSession (6.2.0):
1313
- OHHTTPStubs/Core
14-
- OHHTTPStubs/OHPathHelpers (6.1.0)
14+
- OHHTTPStubs/OHPathHelpers (6.2.0)
1515

1616
DEPENDENCIES:
1717
- OHHTTPStubs (from `../..`)
1818

1919
EXTERNAL SOURCES:
2020
OHHTTPStubs:
21-
:path: ../..
21+
:path: "../.."
2222

2323
SPEC CHECKSUMS:
24-
OHHTTPStubs: 38ce37264fab97254fddb853d806b8bda9faf6d6
24+
OHHTTPStubs: 9cde8b5c0b8cc5c0f393b5e20c8efb6e05915c63
2525

2626
PODFILE CHECKSUM: cde9fecbdd4703d197e608172ad2e689548bc0ac
2727

28-
COCOAPODS: 1.3.1
28+
COCOAPODS: 1.6.0

Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/ObjC/Pods/Manifest.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)