Skip to content
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

Jump to bottom

改善 Demo、增加网页登录 #9

Merged
merged 9 commits into from
Jul 29, 2015
Merged

改善 Demo、增加网页登录 #9

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a6033a8
remove .m in public header in podspec
lzwjava Jul 27, 2015
1bae192
delete Podfile.lock
lzwjava Jul 27, 2015
533a5cd
remove socail.xcworkspace, integrate to socailDemo.xcworkspace
lzwjava Jul 27, 2015
d29ee3a
add wechat login
lzwjava Jul 28, 2015
ce586ad
Merge branch 'master' of github.com:lzwjava/leancloud-social-ios
lzwjava Jul 29, 2015
1cb2dee
delete Podfile.lock
lzwjava Jul 29, 2015
e8e22da
add consistent login succeed logic
lzwjava Jul 29, 2015
8f41c32
modify example
lzwjava Jul 29, 2015
05c4b06
fix position
lzwjava Jul 29, 2015
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
Prev Previous commit
Next Next commit
remove socail.xcworkspace, integrate to socailDemo.xcworkspace
  • Loading branch information
@lzwjava
lzwjava committed Jul 27, 2015
commit 533a5cd1f38727e511f7a6c9e3348b8f45f21d51
32 changes: 7 additions & 25 deletions LeanCloudSocial.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,13 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
0C92CDB73C81797BB67BBC2A /* Pods-LeanCloudSocial.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LeanCloudSocial.release.xcconfig"; path = "LeanCloudSocialDemo/Pods/Target Support Files/Pods-LeanCloudSocial/Pods-LeanCloudSocial.release.xcconfig"; sourceTree = "<group>"; };
40595F669DA649C66885DC13 /* Pods-LeanCloudSocial.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LeanCloudSocial.debug.xcconfig"; path = "LeanCloudSocialDemo/Pods/Target Support Files/Pods-LeanCloudSocial/Pods-LeanCloudSocial.debug.xcconfig"; sourceTree = "<group>"; };
5CC504411B0EC5B8004D0CB1 /* LeanCloudSocial.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LeanCloudSocial.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5CC504451B0EC5B8004D0CB1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5CC5044C1B0EC5B9004D0CB1 /* LeanCloudSocialTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LeanCloudSocialTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5CC504521B0EC5B9004D0CB1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5CC504531B0EC5B9004D0CB1 /* LeanCloudSocialTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LeanCloudSocialTests.m; sourceTree = "<group>"; };
5CC5048B1B0EF3A4004D0CB1 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
5CC5048D1B0EF3B3004D0CB1 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
5CC5048F1B0EF3BC004D0CB1 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
5CC504911B0EF3C7004D0CB1 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
5CC504931B0EF3D0004D0CB1 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
70A6A14C1B661BA6005C2D21 /* AVOSCloudSNS_.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVOSCloudSNS_.h; sourceTree = "<group>"; };
70A6A14D1B661BA6005C2D21 /* AVOSCloudSNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVOSCloudSNS.h; sourceTree = "<group>"; };
70A6A14E1B661BA6005C2D21 /* AVOSCloudSNS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AVOSCloudSNS.m; sourceTree = "<group>"; };
Expand All @@ -81,9 +78,7 @@
70A6A15A1B661BA6005C2D21 /* LCHttpClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCHttpClient.m; sourceTree = "<group>"; };
70A6A15B1B661BA6005C2D21 /* NSURL+AVAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+AVAdditions.h"; sourceTree = "<group>"; };
70A6A15C1B661BA6005C2D21 /* NSURL+AVAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+AVAdditions.m"; sourceTree = "<group>"; };
9AFDD10493E1E4CF996AF646 /* Pods-LeanCloudSocial.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LeanCloudSocial.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LeanCloudSocial/Pods-LeanCloudSocial.debug.xcconfig"; sourceTree = "<group>"; };
C904EA0C993C8E9F1446505C /* libPods-LeanCloudSocial.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-LeanCloudSocial.a"; sourceTree = BUILT_PRODUCTS_DIR; };
C930D00C225985DBCDB35DE5 /* Pods-LeanCloudSocial.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LeanCloudSocial.release.xcconfig"; path = "Pods/Target Support Files/Pods-LeanCloudSocial/Pods-LeanCloudSocial.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -109,7 +104,6 @@
5CC504371B0EC5B8004D0CB1 = {
isa = PBXGroup;
children = (
5CC504621B0EC9E7004D0CB1 /* frameworks */,
5CC504431B0EC5B8004D0CB1 /* LeanCloudSocial */,
5CC504501B0EC5B9004D0CB1 /* LeanCloudSocialTests */,
5CC504421B0EC5B8004D0CB1 /* Products */,
Expand Down Expand Up @@ -177,23 +171,11 @@
name = "Supporting Files";
sourceTree = "<group>";
};
5CC504621B0EC9E7004D0CB1 /* frameworks */ = {
isa = PBXGroup;
children = (
5CC504931B0EF3D0004D0CB1 /* SystemConfiguration.framework */,
5CC504911B0EF3C7004D0CB1 /* MobileCoreServices.framework */,
5CC5048F1B0EF3BC004D0CB1 /* CoreTelephony.framework */,
5CC5048D1B0EF3B3004D0CB1 /* CoreLocation.framework */,
5CC5048B1B0EF3A4004D0CB1 /* libicucore.dylib */,
);
name = frameworks;
sourceTree = "<group>";
};
5D1E654D59321818BE3C9B78 /* Pods */ = {
isa = PBXGroup;
children = (
9AFDD10493E1E4CF996AF646 /* Pods-LeanCloudSocial.debug.xcconfig */,
C930D00C225985DBCDB35DE5 /* Pods-LeanCloudSocial.release.xcconfig */,
40595F669DA649C66885DC13 /* Pods-LeanCloudSocial.debug.xcconfig */,
0C92CDB73C81797BB67BBC2A /* Pods-LeanCloudSocial.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand Down Expand Up @@ -363,7 +345,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LeanCloudSocial/Pods-LeanCloudSocial-resources.sh\"\n";
shellScript = "\"${SRCROOT}/LeanCloudSocialDemo/Pods/Target Support Files/Pods-LeanCloudSocial/Pods-LeanCloudSocial-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -493,7 +475,7 @@
};
5CC504581B0EC5B9004D0CB1 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9AFDD10493E1E4CF996AF646 /* Pods-LeanCloudSocial.debug.xcconfig */;
baseConfigurationReference = 40595F669DA649C66885DC13 /* Pods-LeanCloudSocial.debug.xcconfig */;
buildSettings = {
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -515,7 +497,7 @@
};
5CC504591B0EC5B9004D0CB1 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C930D00C225985DBCDB35DE5 /* Pods-LeanCloudSocial.release.xcconfig */;
baseConfigurationReference = 0C92CDB73C81797BB67BBC2A /* Pods-LeanCloudSocial.release.xcconfig */;
buildSettings = {
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand Down
10 changes: 0 additions & 10 deletions LeanCloudSocial.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions LeanCloudSocialDemo/LeanCloudSocialDemo.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

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

16 changes: 15 additions & 1 deletion LeanCloudSocialDemo/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '6.0'

workspace 'LeanCloudSocialDemo.xcworkspace'

target 'LeanCloudSocial' do
xcodeproj '../LeanCloudSocial.xcodeproj'
pod 'AVOSCloud', '~> 3.1'
pod 'AFNetworking', '~> 1.0'
end

target 'LeanCloudSocialTests' do
xcodeproj '../LeanCloudSocial.xcodeproj'
end


target 'LeanCloudSocialDemo' do
xcodeproj 'LeanCloudSocialDemo.xcodeproj'
pod 'LeanCloudSocial', :path => '../'
end

target 'LeanCloudSocialDemoTests' do

xcodeproj 'LeanCloudSocialDemo.xcodeproj'
end

6 changes: 4 additions & 2 deletions LeanCloudSocialDemo/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ PODS:
- AVOSCloud (~> 3.1)

DEPENDENCIES:
- AFNetworking (~> 1.0)
- AVOSCloud (~> 3.1)
- LeanCloudSocial (from `../`)

EXTERNAL SOURCES:
Expand All @@ -15,6 +17,6 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
AFNetworking: cf8e418e16f0c9c7e5c3150d019a3c679d015018
AVOSCloud: 534bef9ffbf9d9acd7e96f74ca6faf590f4acf28
LeanCloudSocial: 1eba6715c1fb830d474370126047319d02e8aae5
LeanCloudSocial: 564d0e5ab0eef8351e68da9b0ebc233f1e97943e

COCOAPODS: 0.37.2
COCOAPODS: 0.38.2
11 changes: 0 additions & 11 deletions Podfile
View file
Open in desktop

This file was deleted.