Skip to content

C
cocoapods
Unverified Commit a2ba03f2 authored by Samuel Giddins's avatar Samuel Giddins
Browse files
Options

Merge tag '1.1.0.beta.1' 

Release 1.1.0.beta.1

# gpg: Signature made Mon Jul 11 10:36:30 2016 EDT using RSA key ID 15DDA856
# gpg: Good signature from "Samuel Giddins <segiddins@segiddins.me>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 7B19 37A9 CF66 AEF6 52C9  4090 0119 5BB3 15DD A856
parents 667c4a02 6dabe797
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 34 deletions
CHANGELOG.md
View file @ a2ba03f2
......@@ -4,7 +4,7 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
To install release candidates run `[sudo] gem install cocoapods --pre`
## Master
## 1.1.0.beta.1 (2016-07-11)
##### Enhancements
......
Gemfile.lock
View file @ a2ba03f2
......@@ -7,10 +7,10 @@ GIT
GIT
remote: https://github.com/CocoaPods/Core.git
revision: b00a9022d705e222e82892978c49e8df0fce5633
revision: db99f5e8b9385473539405a31c4a7ba3790d47f7
branch: master
specs:
cocoapods-core (1.0.1)
cocoapods-core (1.1.0.beta.1)
activesupport (>= 4.0.2)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
......@@ -94,10 +94,10 @@ GIT
PATH
remote: .
specs:
cocoapods (1.0.1)
cocoapods (1.1.0.beta.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.0, < 2.0)
cocoapods-core (= 1.0.1)
cocoapods-core (= 1.1.0.beta.1)
cocoapods-deintegrate (>= 1.0.0, < 2.0)
cocoapods-downloader (>= 1.1.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
......
examples/AFNetworking Example/AFNetworking Mac Example.xcodeproj/project.pbxproj
View file @ a2ba03f2
......@@ -214,7 +214,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
CC1632E381344B54BA63986B /* [CP] Copy Pods Resources */ = {
......
examples/AFNetworking Example/AFNetworking iOS Example.xcodeproj/project.pbxproj
View file @ a2ba03f2
......@@ -326,7 +326,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
......
examples/Alamofire Example/iOS Example.xcodeproj/project.pbxproj
View file @ a2ba03f2
......@@ -196,7 +196,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
B81850C1CB84CCCCFC8FFC52 /* [CP] Copy Pods Resources */ = {
......
examples/HeaderMappingsDir Example/HeaderMappingsDir Example.xcodeproj/project.pbxproj
View file @ a2ba03f2
......@@ -174,7 +174,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
6E2B4891468DB661A63F8065 /* [CP] Embed Pods Frameworks */ = {
......
examples/Resource Bundle Example/Resource Bundle Example.xcodeproj/project.pbxproj
View file @ a2ba03f2
......@@ -179,7 +179,7 @@
);
inputPaths = (
);
name = '[CP] Copy Pods Resources';
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -194,12 +194,12 @@
);
inputPaths = (
);
name = '[CP] Check Pods Manifest.lock';
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
E1D153F1317B0ED8A0A98DE0 /* [CP] Embed Pods Frameworks */ = {
......@@ -209,7 +209,7 @@
);
inputPaths = (
);
name = '[CP] Embed Pods Frameworks';
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......
examples/TestInclusions/TestInclusions.xcodeproj/project.pbxproj
View file @ a2ba03f2
......@@ -252,12 +252,12 @@
);
inputPaths = (
);
name = '[CP] Check Pods Manifest.lock';
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
23FBFF6CF467540E5F102610 /* [CP] Copy Pods Resources */ = {
......@@ -267,7 +267,7 @@
);
inputPaths = (
);
name = '[CP] Copy Pods Resources';
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -282,7 +282,7 @@
);
inputPaths = (
);
name = '[CP] Embed Pods Frameworks';
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -297,7 +297,7 @@
);
inputPaths = (
);
name = '[CP] Embed Pods Frameworks';
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -312,7 +312,7 @@
);
inputPaths = (
);
name = '[CP] Copy Pods Resources';
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -327,12 +327,12 @@
);
inputPaths = (
);
name = '[CP] Check Pods Manifest.lock';
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
......
examples/Vendored Framework Example/Vendored Framework Example.xcodeproj/project.pbxproj
View file @ a2ba03f2
......@@ -165,12 +165,12 @@
);
inputPaths = (
);
name = '[CP] Check Pods Manifest.lock';
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
4697BF2DD055B93C3DE0E375 /* [CP] Embed Pods Frameworks */ = {
......@@ -180,7 +180,7 @@
);
inputPaths = (
);
name = '[CP] Embed Pods Frameworks';
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -195,7 +195,7 @@
);
inputPaths = (
);
name = '[CP] Copy Pods Resources';
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......
examples/watchOS Example/watchOSsample.xcodeproj/project.pbxproj
View file @ a2ba03f2
......@@ -335,7 +335,7 @@
);
inputPaths = (
);
name = '[CP] Copy Pods Resources';
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -350,12 +350,12 @@
);
inputPaths = (
);
name = '[CP] Check Pods Manifest.lock';
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
766BB1279F3F20E30F8D82AC /* [CP] Embed Pods Frameworks */ = {
......@@ -365,7 +365,7 @@
);
inputPaths = (
);
name = '[CP] Embed Pods Frameworks';
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -380,12 +380,12 @@
);
inputPaths = (
);
name = '[CP] Check Pods Manifest.lock';
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
9404B5E651690A16E40B8F95 /* [CP] Copy Pods Resources */ = {
......@@ -395,7 +395,7 @@
);
inputPaths = (
);
name = '[CP] Copy Pods Resources';
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -410,7 +410,7 @@
);
inputPaths = (
);
name = '[CP] Embed Pods Frameworks';
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......
lib/cocoapods/gem_version.rb
View file @ a2ba03f2
module Pod
# The version of the CocoaPods command line tool.
#
VERSION = '1.0.1'.freeze unless defined? Pod::VERSION
VERSION = '1.1.0.beta.1'.freeze unless defined? Pod::VERSION
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment