Skip to content

Commit 3c5ef9d

Browse files
3lvis3lvis
committed
Fix project
1 parent 538c175 commit 3c5ef9d

File tree

4 files changed

+26
-72
lines changed

4 files changed

+26
-72
lines changed

‎Imaginary.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
63CFCF47233F76770040A04F /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 63CFCF46233F76770040A04F /* SwiftPackageProductDependency */; };
11-
63CFCF49233F76B70040A04F /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 63CFCF48233F76B70040A04F /* SwiftPackageProductDependency */; };
12-
63CFCF4B233F76BC0040A04F /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 63CFCF4A233F76BC0040A04F /* SwiftPackageProductDependency */; };
10+
63CFCF47233F76770040A04F /* Cache in Frameworks */ = {isa = PBXBuildFile; productRef = 63CFCF46233F76770040A04F /* Cache */; };
11+
63CFCF49233F76B70040A04F /* Cache in Frameworks */ = {isa = PBXBuildFile; productRef = 63CFCF48233F76B70040A04F /* Cache */; };
12+
63CFCF4B233F76BC0040A04F /* Cache in Frameworks */ = {isa = PBXBuildFile; productRef = 63CFCF4A233F76BC0040A04F /* Cache */; };
1313
D21352B51F7523BF00B5375B /* View+Imaginary.swift in Sources */ = {isa = PBXBuildFile; fileRef = D21352B41F7523BF00B5375B /* View+Imaginary.swift */; };
1414
D21352B61F7523BF00B5375B /* View+Imaginary.swift in Sources */ = {isa = PBXBuildFile; fileRef = D21352B41F7523BF00B5375B /* View+Imaginary.swift */; };
1515
D21352B81F75266200B5375B /* ButtonDisplayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D21352B71F75266200B5375B /* ButtonDisplayer.swift */; };
@@ -38,10 +38,8 @@
3838
D21352FF1F75427000B5375B /* ImageView+ImaginaryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2AFA1CC1F726F15001963ED /* ImageView+ImaginaryTests.swift */; };
3939
D21353001F75427000B5375B /* Button+ImaginaryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D21352BB1F7527F700B5375B /* Button+ImaginaryTests.swift */; };
4040
D21353011F75429B00B5375B /* Imaginary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D21352C21F7540E400B5375B /* Imaginary.framework */; };
41-
D21353021F7542C800B5375B /* Cache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D21352E91F7541D300B5375B /* Cache.framework */; };
4241
D273452B1F71448000BF063D /* DecompressorUIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = D273451B1F71448000BF063D /* DecompressorUIKit.swift */; };
4342
D27345381F71448900BF063D /* DecompressorCocoa.swift in Sources */ = {isa = PBXBuildFile; fileRef = D27345201F71448000BF063D /* DecompressorCocoa.swift */; };
44-
D273453A1F7147BE00BF063D /* Cache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D5DF75B11C403FBF00BF1AB6 /* Cache.framework */; };
4543
D273453C1F7148C100BF063D /* TestHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D273453B1F7148C100BF063D /* TestHelper.swift */; };
4644
D27345411F71619800BF063D /* MultipleImageFetcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D27345401F71619800BF063D /* MultipleImageFetcherTests.swift */; };
4745
D2AFA1C51F7259F4001963ED /* ImageViewDisplayerUIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2AFA1C41F7259F4001963ED /* ImageViewDisplayerUIKit.swift */; };
@@ -135,23 +133,22 @@
135133
isa = PBXFrameworksBuildPhase;
136134
buildActionMask = 2147483647;
137135
files = (
138-
63CFCF49233F76B70040A04F /* BuildFile in Frameworks */,
136+
63CFCF49233F76B70040A04F /* Cache in Frameworks */,
139137
);
140138
runOnlyForDeploymentPostprocessing = 0;
141139
};
142140
D21352BE1F7540E400B5375B /* Frameworks */ = {
143141
isa = PBXFrameworksBuildPhase;
144142
buildActionMask = 2147483647;
145143
files = (
146-
63CFCF4B233F76BC0040A04F /* BuildFile in Frameworks */,
144+
63CFCF4B233F76BC0040A04F /* Cache in Frameworks */,
147145
);
148146
runOnlyForDeploymentPostprocessing = 0;
149147
};
150148
D21352EC1F75423700B5375B /* Frameworks */ = {
151149
isa = PBXFrameworksBuildPhase;
152150
buildActionMask = 2147483647;
153151
files = (
154-
D21353021F7542C800B5375B /* Cache.framework in Frameworks */,
155152
D21353011F75429B00B5375B /* Imaginary.framework in Frameworks */,
156153
);
157154
runOnlyForDeploymentPostprocessing = 0;
@@ -160,7 +157,6 @@
160157
isa = PBXFrameworksBuildPhase;
161158
buildActionMask = 2147483647;
162159
files = (
163-
D273453A1F7147BE00BF063D /* Cache.framework in Frameworks */,
164160
D2E2E9851F7112CF001B4251 /* Imaginary.framework in Frameworks */,
165161
);
166162
runOnlyForDeploymentPostprocessing = 0;
@@ -169,7 +165,7 @@
169165
isa = PBXFrameworksBuildPhase;
170166
buildActionMask = 2147483647;
171167
files = (
172-
63CFCF47233F76770040A04F /* BuildFile in Frameworks */,
168+
63CFCF47233F76770040A04F /* Cache in Frameworks */,
173169
);
174170
runOnlyForDeploymentPostprocessing = 0;
175171
};
@@ -384,7 +380,7 @@
384380
);
385381
name = "Imaginary-Mac";
386382
packageProductDependencies = (
387-
63CFCF48233F76B70040A04F /* SwiftPackageProductDependency */,
383+
63CFCF48233F76B70040A04F /* Cache */,
388384
);
389385
productName = "Imaginary-Mac";
390386
productReference = BDE8FBE91D1BFB9F00C5A212 /* Imaginary.framework */;
@@ -405,7 +401,7 @@
405401
);
406402
name = "Imaginary-tvOS";
407403
packageProductDependencies = (
408-
63CFCF4A233F76BC0040A04F /* SwiftPackageProductDependency */,
404+
63CFCF4A233F76BC0040A04F /* Cache */,
409405
);
410406
productName = "Imaginary-tvOS";
411407
productReference = D21352C21F7540E400B5375B /* Imaginary.framework */;
@@ -418,14 +414,15 @@
418414
D21352EB1F75423700B5375B /* Sources */,
419415
D21352EC1F75423700B5375B /* Frameworks */,
420416
D21352ED1F75423700B5375B /* Resources */,
421-
D21352FA1F75425600B5375B /* ShellScript */,
422417
);
423418
buildRules = (
424419
);
425420
dependencies = (
426421
D21352F61F75423700B5375B /* PBXTargetDependency */,
427422
);
428423
name = Imaginary_tvOSTests;
424+
packageProductDependencies = (
425+
);
429426
productName = Imaginary_tvOSTests;
430427
productReference = D21352EF1F75423700B5375B /* Imaginary_tvOSTests.xctest */;
431428
productType = "com.apple.product-type.bundle.unit-test";
@@ -437,14 +434,15 @@
437434
D2E2E97C1F7112CF001B4251 /* Sources */,
438435
D2E2E97D1F7112CF001B4251 /* Frameworks */,
439436
D2E2E97E1F7112CF001B4251 /* Resources */,
440-
D27344E31F71148300BF063D /* ShellScript */,
441437
);
442438
buildRules = (
443439
);
444440
dependencies = (
445441
D2E2E9871F7112CF001B4251 /* PBXTargetDependency */,
446442
);
447443
name = "ImaginaryTests-iOS";
444+
packageProductDependencies = (
445+
);
448446
productName = "ImaginaryTests-iOS";
449447
productReference = D2E2E9801F7112CF001B4251 /* ImaginaryTests-iOS.xctest */;
450448
productType = "com.apple.product-type.bundle.unit-test";
@@ -464,7 +462,7 @@
464462
);
465463
name = "Imaginary-iOS";
466464
packageProductDependencies = (
467-
63CFCF46233F76770040A04F /* SwiftPackageProductDependency */,
465+
63CFCF46233F76770040A04F /* Cache */,
468466
);
469467
productName = Imaginary;
470468
productReference = D5DF75911C403D8200BF1AB6 /* Imaginary.framework */;
@@ -514,16 +512,16 @@
514512
);
515513
mainGroup = D5DF75871C403D8200BF1AB6;
516514
packageReferences = (
517-
63CFCF45233F76770040A04F /* RemoteSwiftPackageReference */,
515+
63CFCF45233F76770040A04F /* XCRemoteSwiftPackageReference "Cache" */,
518516
);
519517
productRefGroup = D5DF75921C403D8200BF1AB6 /* Products */;
520518
projectDirPath = "";
521519
projectRoot = "";
522520
targets = (
523521
D5DF75901C403D8200BF1AB6 /* Imaginary-iOS */,
524522
BDE8FBE81D1BFB9F00C5A212 /* Imaginary-Mac */,
525-
D2E2E97F1F7112CF001B4251 /* ImaginaryTests-iOS */,
526523
D21352C11F7540E400B5375B /* Imaginary-tvOS */,
524+
D2E2E97F1F7112CF001B4251 /* ImaginaryTests-iOS */,
527525
D21352EE1F75423700B5375B /* Imaginary_tvOSTests */,
528526
);
529527
};
@@ -583,34 +581,6 @@
583581
shellPath = /bin/sh;
584582
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
585583
};
586-
D21352FA1F75425600B5375B /* ShellScript */ = {
587-
isa = PBXShellScriptBuildPhase;
588-
buildActionMask = 2147483647;
589-
files = (
590-
);
591-
inputPaths = (
592-
"$(SRCROOT)/Carthage/Build/tvOS/Cache.framework",
593-
);
594-
outputPaths = (
595-
);
596-
runOnlyForDeploymentPostprocessing = 0;
597-
shellPath = /bin/sh;
598-
shellScript = "/usr/local/bin/carthage copy-frameworks";
599-
};
600-
D27344E31F71148300BF063D /* ShellScript */ = {
601-
isa = PBXShellScriptBuildPhase;
602-
buildActionMask = 2147483647;
603-
files = (
604-
);
605-
inputPaths = (
606-
"$(SRCROOT)/Carthage/Build/iOS/Cache.framework",
607-
);
608-
outputPaths = (
609-
);
610-
runOnlyForDeploymentPostprocessing = 0;
611-
shellPath = /bin/sh;
612-
shellScript = "/usr/local/bin/carthage copy-frameworks";
613-
};
614584
/* End PBXShellScriptBuildPhase section */
615585

616586
/* Begin PBXSourcesBuildPhase section */
@@ -1184,9 +1154,9 @@
11841154
/* End XCConfigurationList section */
11851155

11861156
/* Begin XCRemoteSwiftPackageReference section */
1187-
63CFCF45233F76770040A04F /* RemoteSwiftPackageReference */ = {
1157+
63CFCF45233F76770040A04F /* XCRemoteSwiftPackageReference "Cache" */ = {
11881158
isa = XCRemoteSwiftPackageReference;
1189-
repositoryURL = "https://github.com/fassko/Cache.git";
1159+
repositoryURL = "https://github.com/hyperoslo/Cache.git";
11901160
requirement = {
11911161
branch = master;
11921162
kind = branch;
@@ -1195,19 +1165,19 @@
11951165
/* End XCRemoteSwiftPackageReference section */
11961166

11971167
/* Begin XCSwiftPackageProductDependency section */
1198-
63CFCF46233F76770040A04F /* SwiftPackageProductDependency */ = {
1168+
63CFCF46233F76770040A04F /* Cache */ = {
11991169
isa = XCSwiftPackageProductDependency;
1200-
package = 63CFCF45233F76770040A04F /* RemoteSwiftPackageReference */;
1170+
package = 63CFCF45233F76770040A04F /* XCRemoteSwiftPackageReference "Cache" */;
12011171
productName = Cache;
12021172
};
1203-
63CFCF48233F76B70040A04F /* SwiftPackageProductDependency */ = {
1173+
63CFCF48233F76B70040A04F /* Cache */ = {
12041174
isa = XCSwiftPackageProductDependency;
1205-
package = 63CFCF45233F76770040A04F /* RemoteSwiftPackageReference */;
1175+
package = 63CFCF45233F76770040A04F /* XCRemoteSwiftPackageReference "Cache" */;
12061176
productName = Cache;
12071177
};
1208-
63CFCF4A233F76BC0040A04F /* SwiftPackageProductDependency */ = {
1178+
63CFCF4A233F76BC0040A04F /* Cache */ = {
12091179
isa = XCSwiftPackageProductDependency;
1210-
package = 63CFCF45233F76770040A04F /* RemoteSwiftPackageReference */;
1180+
package = 63CFCF45233F76770040A04F /* XCRemoteSwiftPackageReference "Cache" */;
12111181
productName = Cache;
12121182
};
12131183
/* End XCSwiftPackageProductDependency section */

‎Imaginary.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.resolved‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
targets: ["Imaginary"]),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/hyperoslo/Cache", .tag("5.3.0"))
13+
.package(url: "https://github.com/hyperoslo/Cache", .branch("master"))
1414
],
1515
targets: [
1616
.target(

0 commit comments

Comments
 (0)