Skip to content
This repository was archived by the owner on Apr 7, 2021. It is now read-only.

Commit a6a943e

Browse files
Merge pull request #1 from studyplus/support_carthage
support carthage
2 parents be3ad1d + e57b35b commit a6a943e

File tree

6 files changed

+29
-0
lines changed

6 files changed

+29
-0
lines changed

Cartfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "kishikawakatsumi/KeychainAccess" == 3.0.2

Cartfile.resolved

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "kishikawakatsumi/KeychainAccess" "v3.0.2"

StudyplusSDK.xcodeproj/project.pbxproj

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
183FDAB51E7584C50085589F /* StudyplusRecordAmount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB41E7584C50085589F /* StudyplusRecordAmount.swift */; };
2525
183FDAB91E759E0F0085589F /* StudyplusSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 183FDA671E7510920085589F /* StudyplusSDK.framework */; };
2626
183FDABA1E759E0F0085589F /* StudyplusSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 183FDA671E7510920085589F /* StudyplusSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
27+
486C64C31E94E3BD00FCFE74 /* KeychainAccess.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 486C64C21E94E3BD00FCFE74 /* KeychainAccess.framework */; };
2728
879C2B31A68B2AB725BEC317 /* Pods_Demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F2BF8D56E016A5AA66C8A96 /* Pods_Demo.framework */; };
2829
BDBFEE69E47477456F843718 /* Pods_StudyplusSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59FC3B183C486D0A5FD847AF /* Pods_StudyplusSDK.framework */; };
2930
/* End PBXBuildFile section */
@@ -89,6 +90,7 @@
8990
183FDAB01E754DCB0085589F /* StudyplusAPIRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StudyplusAPIRequest.swift; sourceTree = "<group>"; };
9091
183FDAB21E7561B90085589F /* StudyplusRecord.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StudyplusRecord.swift; sourceTree = "<group>"; };
9192
183FDAB41E7584C50085589F /* StudyplusRecordAmount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StudyplusRecordAmount.swift; sourceTree = "<group>"; };
93+
486C64C21E94E3BD00FCFE74 /* KeychainAccess.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = KeychainAccess.framework; path = Carthage/Build/iOS/KeychainAccess.framework; sourceTree = "<group>"; };
9294
4F2BF8D56E016A5AA66C8A96 /* Pods_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9395
59FC3B183C486D0A5FD847AF /* Pods_StudyplusSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_StudyplusSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9496
617BD1B3D302AA6EB05AD450 /* Pods-Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Demo.release.xcconfig"; path = "Pods/Target Support Files/Pods-Demo/Pods-Demo.release.xcconfig"; sourceTree = "<group>"; };
@@ -102,6 +104,7 @@
102104
isa = PBXFrameworksBuildPhase;
103105
buildActionMask = 2147483647;
104106
files = (
107+
486C64C31E94E3BD00FCFE74 /* KeychainAccess.framework in Frameworks */,
105108
BDBFEE69E47477456F843718 /* Pods_StudyplusSDK.framework in Frameworks */,
106109
);
107110
runOnlyForDeploymentPostprocessing = 0;
@@ -206,6 +209,7 @@
206209
635554EA6F25FEF4335DFACB /* Frameworks */ = {
207210
isa = PBXGroup;
208211
children = (
212+
486C64C21E94E3BD00FCFE74 /* KeychainAccess.framework */,
209213
59FC3B183C486D0A5FD847AF /* Pods_StudyplusSDK.framework */,
210214
4F2BF8D56E016A5AA66C8A96 /* Pods_Demo.framework */,
211215
);
@@ -247,6 +251,7 @@
247251
183FDA641E7510920085589F /* Headers */,
248252
183FDA651E7510920085589F /* Resources */,
249253
DCC0618C6BB864758280C6CD /* [CP] Copy Pods Resources */,
254+
486C64C41E94E3D100FCFE74 /* carthage */,
250255
);
251256
buildRules = (
252257
);
@@ -416,6 +421,20 @@
416421
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-resources.sh\"\n";
417422
showEnvVarsInLog = 0;
418423
};
424+
486C64C41E94E3D100FCFE74 /* carthage */ = {
425+
isa = PBXShellScriptBuildPhase;
426+
buildActionMask = 2147483647;
427+
files = (
428+
);
429+
inputPaths = (
430+
);
431+
name = carthage;
432+
outputPaths = (
433+
);
434+
runOnlyForDeploymentPostprocessing = 0;
435+
shellPath = /bin/sh;
436+
shellScript = "/usr/local/bin/carthage copy-frameworks";
437+
};
419438
764BEF1941D689B54DF91C96 /* [CP] Embed Pods Frameworks */ = {
420439
isa = PBXShellScriptBuildPhase;
421440
buildActionMask = 2147483647;
@@ -670,6 +689,10 @@
670689
DYLIB_COMPATIBILITY_VERSION = 1;
671690
DYLIB_CURRENT_VERSION = 1;
672691
DYLIB_INSTALL_NAME_BASE = "@rpath";
692+
FRAMEWORK_SEARCH_PATHS = (
693+
"$(inherited)",
694+
"$(PROJECT_DIR)/Carthage/Build/iOS",
695+
);
673696
INFOPLIST_FILE = StudyplusSDK/Info.plist;
674697
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
675698
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -693,6 +716,10 @@
693716
DYLIB_COMPATIBILITY_VERSION = 1;
694717
DYLIB_CURRENT_VERSION = 1;
695718
DYLIB_INSTALL_NAME_BASE = "@rpath";
719+
FRAMEWORK_SEARCH_PATHS = (
720+
"$(inherited)",
721+
"$(PROJECT_DIR)/Carthage/Build/iOS",
722+
);
696723
INFOPLIST_FILE = StudyplusSDK/Info.plist;
697724
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
698725
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)