Skip to content

Update lock file to prevent version conflict #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hokster7 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update lock file to prevent version conflict #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions Example/Example.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
5747BB097CE79720A908BC02 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
60467ADBA8D6440FB494AD8D /* libPods-Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6D2E24F7B8214E388DD9EC53 /* Pods-Example.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.xcconfig"; path = "Pods/Pods-Example.xcconfig"; sourceTree = "<group>"; };
6E57ADAE7452348B889D674E /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
D8327E8A18AD18CB00EE1F3D /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
D8327E8D18AD18CB00EE1F3D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
D8327E8F18AD18CB00EE1F3D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -87,13 +88,22 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
2E4BF53EDDC909BEF2CD864F /* Pods */ = {
isa = PBXGroup;
children = (
5747BB097CE79720A908BC02 /* Pods-Example.debug.xcconfig */,
6E57ADAE7452348B889D674E /* Pods-Example.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
D8327E8118AD18CB00EE1F3D = {
isa = PBXGroup;
children = (
D8327E9318AD18CB00EE1F3D /* Example */,
D8327E8C18AD18CB00EE1F3D /* Frameworks */,
D8327E8B18AD18CB00EE1F3D /* Products */,
6D2E24F7B8214E388DD9EC53 /* Pods-Example.xcconfig */,
2E4BF53EDDC909BEF2CD864F /* Pods */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -271,7 +281,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Pods-Example-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -401,7 +411,7 @@
};
D8327EBD18AD18CB00EE1F3D /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 6D2E24F7B8214E388DD9EC53 /* Pods-Example.xcconfig */;
baseConfigurationReference = 5747BB097CE79720A908BC02 /* Pods-Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand All @@ -415,7 +425,7 @@
};
D8327EBE18AD18CB00EE1F3D /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 6D2E24F7B8214E388DD9EC53 /* Pods-Example.xcconfig */;
baseConfigurationReference = 6E57ADAE7452348B889D674E /* Pods-Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand Down
26 changes: 13 additions & 13 deletions Example/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
PODS:
- AFNetworking (2.1.0):
- AFNetworking/NSURLConnection
- AFNetworking/NSURLSession
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/UIKit
- AFNetworking/NSURLConnection (= 2.1.0)
- AFNetworking/NSURLSession (= 2.1.0)
- AFNetworking/Reachability (= 2.1.0)
- AFNetworking/Security (= 2.1.0)
- AFNetworking/Serialization (= 2.1.0)
- AFNetworking/UIKit (= 2.1.0)
- AFNetworking/NSURLConnection (2.1.0):
- AFNetworking/Reachability
- AFNetworking/Security
Expand All @@ -17,23 +17,23 @@ PODS:
- AFNetworking/Serialization (2.1.0)
- AFNetworking/UIKit (2.1.0):
- AFNetworking/NSURLConnection
- GoogleDocsBackend (0.1.1):
- GoogleDocsBackend (0.1.2):
- AFNetworking (~> 2.1.0)
- Mantle (~> 1.3.1)
- Mantle (1.3.1):
- Mantle/extobjc
- Mantle/extobjc (= 1.3.1)
- Mantle/extobjc (1.3.1)

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

EXTERNAL SOURCES:
GoogleDocsBackend:
:path: ../
:path: "../"

SPEC CHECKSUMS:
AFNetworking: c7d7901a83f631414c7eda1737261f696101a5cd
GoogleDocsBackend: afb4531b8dabdc510dfcf872c8b37196cce0d2eb
Mantle: abc3b0c81bc66eb624cf9cebb8640e377d5a44ae
AFNetworking: d397c9a76a60c670cbcd33f3ff2c5f961f724cbc
GoogleDocsBackend: ed7ca396c31fbac6977da2a98f5181ef95e23418
Mantle: a516570b84c3cefb34b02647a6588a087dddc490

COCOAPODS: 0.32.1
COCOAPODS: 0.37.1