Skip to content

Commit

Permalink
Merge pull request #303 from AliSoftware/release/6.2.0
Browse files Browse the repository at this point in the history
Preparing for release.
  • Loading branch information
jeffctown authored Mar 9, 2019
2 parents e2dd12e + ca9bf39 commit 30246ce
Show file tree
Hide file tree
Showing 22 changed files with 846 additions and 742 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OHHTTPStubs — CHANGELOG

## [Future release]
## [6.2.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/6.2.0)
* Enabled application extension API only.
[@lightsprint09](https://github.com/lightsprint09)
* Disabled a flaky redirect test and adding the known issue with redirects to the README.
Expand Down
32 changes: 0 additions & 32 deletions Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@
098FBDCB15D704E800623941 /* Sources */,
098FBDCC15D704E800623941 /* Frameworks */,
098FBDCD15D704E800623941 /* Resources */,
E995647606B5F88176D77469 /* [CP] Embed Pods Frameworks */,
6B18D0B3FE72E104611BF67D /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -216,36 +214,6 @@
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";
showEnvVarsInLog = 0;
};
6B18D0B3FE72E104611BF67D /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
E995647606B5F88176D77469 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down
20 changes: 10 additions & 10 deletions Examples/ObjC/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
PODS:
- OHHTTPStubs (6.1.0):
- OHHTTPStubs/Default (= 6.1.0)
- OHHTTPStubs/Core (6.1.0)
- OHHTTPStubs/Default (6.1.0):
- OHHTTPStubs (6.2.0):
- OHHTTPStubs/Default (= 6.2.0)
- OHHTTPStubs/Core (6.2.0)
- OHHTTPStubs/Default (6.2.0):
- OHHTTPStubs/Core
- OHHTTPStubs/JSON
- OHHTTPStubs/NSURLSession
- OHHTTPStubs/OHPathHelpers
- OHHTTPStubs/JSON (6.1.0):
- OHHTTPStubs/JSON (6.2.0):
- OHHTTPStubs/Core
- OHHTTPStubs/NSURLSession (6.1.0):
- OHHTTPStubs/NSURLSession (6.2.0):
- OHHTTPStubs/Core
- OHHTTPStubs/OHPathHelpers (6.1.0)
- OHHTTPStubs/OHPathHelpers (6.2.0)

DEPENDENCIES:
- OHHTTPStubs (from `../..`)

EXTERNAL SOURCES:
OHHTTPStubs:
:path: ../..
:path: "../.."

SPEC CHECKSUMS:
OHHTTPStubs: 38ce37264fab97254fddb853d806b8bda9faf6d6
OHHTTPStubs: 9cde8b5c0b8cc5c0f393b5e20c8efb6e05915c63

PODFILE CHECKSUM: cde9fecbdd4703d197e608172ad2e689548bc0ac

COCOAPODS: 1.3.1
COCOAPODS: 1.6.0
4 changes: 2 additions & 2 deletions Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions Examples/ObjC/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 30246ce

Please sign in to comment.