Skip to content

Commit 5b2cdfc

Browse files
committed
Merge pull request #39 from hyperoslo/fix/framework-targets
Fix Carthage copy frameworks script
2 parents a4a8d4a + f3a5035 commit 5b2cdfc

File tree

2 files changed

+39
-7
lines changed

2 files changed

+39
-7
lines changed

Cache.xcodeproj/project.pbxproj

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
9ABAE0371CCF8FF7009477CF /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ABAE0361CCF8FF7009477CF /* CryptoSwift.framework */; };
11-
9AFE68041CCF982800B7C6AC /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AFE68031CCF982800B7C6AC /* Quick.framework */; };
1211
9AFE68071CCF994A00B7C6AC /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AFE68051CCF986C00B7C6AC /* CryptoSwift.framework */; };
1312
D5291C291C28220B00B702C9 /* UIImage+Cache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5291C0D1C28220B00B702C9 /* UIImage+Cache.swift */; };
1413
D5291C2D1C28220B00B702C9 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5291C151C28220B00B702C9 /* Config.swift */; };
@@ -78,9 +77,11 @@
7877
D5ACACCD1CD0207300567809 /* SyncHybridCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5ACACCB1CD0207300567809 /* SyncHybridCache.swift */; };
7978
D5ACACD11CD0228400567809 /* SyncCacheSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5ACACCE1CD0227200567809 /* SyncCacheSpec.swift */; };
8079
D5ACACD51CD0256700567809 /* SyncHybridCacheSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5ACACD21CD0254300567809 /* SyncHybridCacheSpec.swift */; };
81-
D5ACACD61CD0256700567809 /* SyncHybridCacheSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5ACACD21CD0254300567809 /* SyncHybridCacheSpec.swift */; };
8280
D5ACACDE1CD0272600567809 /* Cache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5ACACDD1CD0272600567809 /* Cache.swift */; };
8381
D5ACACDF1CD0272600567809 /* Cache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5ACACDD1CD0272600567809 /* Cache.swift */; };
82+
D5BAEBF31CD1F4B70003E865 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AFE68031CCF982800B7C6AC /* Quick.framework */; };
83+
D5BAEBF51CD1F57D0003E865 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ABAE0361CCF8FF7009477CF /* CryptoSwift.framework */; };
84+
D5BAEBF61CD1F6250003E865 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AFE68051CCF986C00B7C6AC /* CryptoSwift.framework */; };
8485
/* End PBXBuildFile section */
8586

8687
/* Begin PBXContainerItemProxy section */
@@ -169,9 +170,10 @@
169170
isa = PBXFrameworksBuildPhase;
170171
buildActionMask = 2147483647;
171172
files = (
173+
D5291D1D1C2837DB00B702C9 /* Cache.framework in Frameworks */,
174+
D5BAEBF51CD1F57D0003E865 /* CryptoSwift.framework in Frameworks */,
172175
D5291D571C283A4200B702C9 /* Quick.framework in Frameworks */,
173176
D5291D581C283A4200B702C9 /* Nimble.framework in Frameworks */,
174-
D5291D1D1C2837DB00B702C9 /* Cache.framework in Frameworks */,
175177
);
176178
runOnlyForDeploymentPostprocessing = 0;
177179
};
@@ -187,8 +189,10 @@
187189
isa = PBXFrameworksBuildPhase;
188190
buildActionMask = 2147483647;
189191
files = (
190-
D5291D9E1C283EC000B702C9 /* Nimble.framework in Frameworks */,
191192
D5291D6A1C283B5400B702C9 /* Cache.framework in Frameworks */,
193+
D5BAEBF61CD1F6250003E865 /* CryptoSwift.framework in Frameworks */,
194+
D5BAEBF31CD1F4B70003E865 /* Quick.framework in Frameworks */,
195+
D5291D9E1C283EC000B702C9 /* Nimble.framework in Frameworks */,
192196
);
193197
runOnlyForDeploymentPostprocessing = 0;
194198
};
@@ -197,7 +201,6 @@
197201
buildActionMask = 2147483647;
198202
files = (
199203
9ABAE0371CCF8FF7009477CF /* CryptoSwift.framework in Frameworks */,
200-
9AFE68041CCF982800B7C6AC /* Quick.framework in Frameworks */,
201204
);
202205
runOnlyForDeploymentPostprocessing = 0;
203206
};
@@ -542,6 +545,7 @@
542545
D5291D5C1C283B5300B702C9 /* Frameworks */,
543546
D5291D5D1C283B5300B702C9 /* Headers */,
544547
D5291D5E1C283B5300B702C9 /* Resources */,
548+
D5BAEBF41CD1F4D30003E865 /* ShellScript */,
545549
);
546550
buildRules = (
547551
);
@@ -579,6 +583,7 @@
579583
D5DC59DC1C20593E003BD79B /* Frameworks */,
580584
D5DC59DD1C20593E003BD79B /* Headers */,
581585
D5DC59DE1C20593E003BD79B /* Resources */,
586+
D5BAEBF21CD1F4490003E865 /* ShellScript */,
582587
);
583588
buildRules = (
584589
);
@@ -697,6 +702,34 @@
697702
shellPath = /bin/sh;
698703
shellScript = "/usr/local/bin/carthage copy-frameworks";
699704
};
705+
D5BAEBF21CD1F4490003E865 /* ShellScript */ = {
706+
isa = PBXShellScriptBuildPhase;
707+
buildActionMask = 2147483647;
708+
files = (
709+
);
710+
inputPaths = (
711+
"$(SRCROOT)/Carthage/Build/iOS/CryptoSwift.framework",
712+
);
713+
outputPaths = (
714+
);
715+
runOnlyForDeploymentPostprocessing = 0;
716+
shellPath = /bin/sh;
717+
shellScript = "/usr/local/bin/carthage copy-frameworks";
718+
};
719+
D5BAEBF41CD1F4D30003E865 /* ShellScript */ = {
720+
isa = PBXShellScriptBuildPhase;
721+
buildActionMask = 2147483647;
722+
files = (
723+
);
724+
inputPaths = (
725+
"$(SRCROOT)/Carthage/Build/Mac/CryptoSwift.framework",
726+
);
727+
outputPaths = (
728+
);
729+
runOnlyForDeploymentPostprocessing = 0;
730+
shellPath = /bin/sh;
731+
shellScript = "/usr/local/bin/carthage copy-frameworks";
732+
};
700733
/* End PBXShellScriptBuildPhase section */
701734

702735
/* Begin PBXSourcesBuildPhase section */
@@ -761,7 +794,6 @@
761794
files = (
762795
D5291D9C1C283DD900B702C9 /* NSImage+CacheSpec.swift in Sources */,
763796
D5291D851C283C7C00B702C9 /* SpecHelper+OSX.swift in Sources */,
764-
D5ACACD61CD0256700567809 /* SyncHybridCacheSpec.swift in Sources */,
765797
D5291DA31C2841D200B702C9 /* NSImage+CacheTests.swift in Sources */,
766798
);
767799
runOnlyForDeploymentPostprocessing = 0;

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "krzyzanowskim/CryptoSwift" "3f9ca1c1980fdc8e5c719d48ab81ae421b0497ee"
1+
github "krzyzanowskim/CryptoSwift" "3a0c3153717070a42971c30cd73d67f6f832f4bc"
22
github "Quick/Nimble" "v4.0.1"
33
github "Quick/Quick" "v0.9.2"

0 commit comments

Comments
 (0)