Skip to content
This repository has been archived by the owner on Dec 3, 2019. It is now read-only.

Commit

Permalink
Merge pull request #45 from maxwellE/major_bump_to_v2
Browse files Browse the repository at this point in the history
Pod bump to v2
  • Loading branch information
maxwellE committed Mar 3, 2017
2 parents ddb00ea + a155337 commit c8bbd34
Show file tree
Hide file tree
Showing 25 changed files with 1,355 additions and 1,273 deletions.
4 changes: 2 additions & 2 deletions Example/Ohana.xcodeproj/project.pbxproj
Expand Up @@ -486,7 +486,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;
};
A45A893824C3155A483CDF3E /* [CP] Copy Pods Resources */ = {
Expand Down Expand Up @@ -516,7 +516,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;
};
AF1AAFAA8907FEDD6005967A /* [CP] Embed Pods Frameworks */ = {
Expand Down
8 changes: 4 additions & 4 deletions Example/Podfile.lock
@@ -1,7 +1,7 @@
PODS:
- libPhoneNumber-iOS (0.8.15)
- OCMock (3.3.1)
- Ohana (1.2.1):
- Ohana (2.0.0):
- libPhoneNumber-iOS (~> 0.8)
- UberSignals (~> 2.0)
- UberSignals (2.5.0)
Expand All @@ -12,14 +12,14 @@ DEPENDENCIES:

EXTERNAL SOURCES:
Ohana:
:path: "../"
:path: ../

SPEC CHECKSUMS:
libPhoneNumber-iOS: 62a740e1ea5741060f5cec0f788b52071115cf31
OCMock: f3f61e6eaa16038c30caa5798c5e49d3307b6f22
Ohana: f875bafbd933b26991af35cced6c2c119c761dd8
Ohana: 2058a644c7240026aa16304a6d8c2899f95bfc93
UberSignals: abd80d8aa926828e30b75d3bd79d6ed07e4ed08a

PODFILE CHECKSUM: 8a134e8d5b5577591197f0fade46fc02338c6f83

COCOAPODS: 1.0.1
COCOAPODS: 1.1.1
4 changes: 2 additions & 2 deletions Example/Pods/Local Podspecs/Ohana.podspec.json

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

8 changes: 4 additions & 4 deletions Example/Pods/Manifest.lock

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

2,542 changes: 1,300 additions & 1,242 deletions Example/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Example/Pods/Target Support Files/OCMock/OCMock-umbrella.h

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

2 changes: 1 addition & 1 deletion Example/Pods/Target Support Files/Ohana-iOS8.0/Info.plist

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

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

2 changes: 1 addition & 1 deletion Example/Pods/Target Support Files/Ohana-iOS8.3/Info.plist

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2 changes: 1 addition & 1 deletion Ohana.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Ohana'
s.version = '1.3.0'
s.version = '2.0.0'
s.summary = 'Contacts simplified'
s.homepage = 'https://github.com/uber/ohana-ios'
s.license = { :type => 'MIT', :file => 'LICENSE' }
Expand Down

0 comments on commit c8bbd34

Please sign in to comment.