Skip to content

Commit 2768be8

Browse files
mrkai77mrkai77
committed
🐞 Fix duplicate packages + package resolution
1 parent bfa3a66 commit 2768be8

1 file changed

Lines changed: 28 additions & 33 deletions

File tree

‎Loop.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
2A28492B2F22B4B700F6CE42 /* Scribe in Frameworks */ = {isa = PBXBuildFile; productRef = 2A28492A2F22B4B700F6CE42 /* Scribe */; };
1110
2A28B6292EE5050C00A1E26B /* Defaults in Frameworks */ = {isa = PBXBuildFile; productRef = 2A28B6282EE5050C00A1E26B /* Defaults */; };
1211
2A28B62C2EE5057C00A1E26B /* Luminare in Frameworks */ = {isa = PBXBuildFile; productRef = 2A28B62B2EE5057C00A1E26B /* Luminare */; };
13-
2AF9238E2F540B1300F467FD /* Scribe in Frameworks */ = {isa = PBXBuildFile; productRef = 2AF9238D2F540B1300F467FD /* Scribe */; };
14-
2AF923902F540B2200F467FD /* Scribe in Frameworks */ = {isa = PBXBuildFile; productRef = 2AF9238F2F540B2200F467FD /* Scribe */; };
15-
2A74ABA32F3E65A100EBF95C /* Subsurface in Frameworks */ = {isa = PBXBuildFile; productRef = 2A74ABA22F3E65A100EBF95C /* Subsurface */; };
12+
2A847DFC2F5E49E90099E02A /* Scribe in Frameworks */ = {isa = PBXBuildFile; productRef = 2A847DFB2F5E49E90099E02A /* Scribe */; };
13+
2A847DFF2F5E4A080099E02A /* Subsurface in Frameworks */ = {isa = PBXBuildFile; productRef = 2A847DFE2F5E4A080099E02A /* Subsurface */; };
14+
2A847E012F5E4A0E0099E02A /* Scribe in Frameworks */ = {isa = PBXBuildFile; productRef = 2A847E002F5E4A0E0099E02A /* Scribe */; };
1615
3ED0A7B92F21DF6800A58629 /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 3ED0A7B82F21DF6800A58629 /* ZIPFoundation */; };
1716
B1AA00412F30000100AABBCC /* LoopUpdaterHelper in CopyFiles */ = {isa = PBXBuildFile; fileRef = B1AA00012F30000100AABBCC /* LoopUpdaterHelper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
1817
F06D768A2DFF7A77007EEDA9 /* SkyLight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F06D76892DFF7A77007EEDA9 /* SkyLight.framework */; };
@@ -100,11 +99,10 @@
10099
isa = PBXFrameworksBuildPhase;
101100
buildActionMask = 2147483647;
102101
files = (
102+
2A847DFC2F5E49E90099E02A /* Scribe in Frameworks */,
103+
2A847DFF2F5E4A080099E02A /* Subsurface in Frameworks */,
103104
2A28B6292EE5050C00A1E26B /* Defaults in Frameworks */,
104-
2A74ABA32F3E65A100EBF95C /* Subsurface in Frameworks */,
105105
2A28B62C2EE5057C00A1E26B /* Luminare in Frameworks */,
106-
2AF9238E2F540B1300F467FD /* Scribe in Frameworks */,
107-
2A28492B2F22B4B700F6CE42 /* Scribe in Frameworks */,
108106
F06D768A2DFF7A77007EEDA9 /* SkyLight.framework in Frameworks */,
109107
3ED0A7B92F21DF6800A58629 /* ZIPFoundation in Frameworks */,
110108
);
@@ -114,7 +112,7 @@
114112
isa = PBXFrameworksBuildPhase;
115113
buildActionMask = 2147483647;
116114
files = (
117-
2AF923902F540B2200F467FD /* Scribe in Frameworks */,
115+
2A847E012F5E4A0E0099E02A /* Scribe in Frameworks */,
118116
);
119117
runOnlyForDeploymentPostprocessing = 0;
120118
};
@@ -181,9 +179,8 @@
181179
2A28B6282EE5050C00A1E26B /* Defaults */,
182180
2A28B62B2EE5057C00A1E26B /* Luminare */,
183181
3ED0A7B82F21DF6800A58629 /* ZIPFoundation */,
184-
2A28492A2F22B4B700F6CE42 /* Scribe */,
185-
2A8EDDBB2F23743B005457F8 /* Scribe */,
186-
2A74ABA22F3E65A100EBF95C /* Subsurface */
182+
2A847DFB2F5E49E90099E02A /* Scribe */,
183+
2A847DFE2F5E4A080099E02A /* Subsurface */,
187184
);
188185
productName = WindowManager;
189186
productReference = A8E59C35297F5E9A0064D4BA /* Loop.app */;
@@ -206,7 +203,7 @@
206203
);
207204
name = LoopUpdaterHelper;
208205
packageProductDependencies = (
209-
2AF9238F2F540B2200F467FD /* Scribe */,
206+
2A847E002F5E4A0E0099E02A /* Scribe */,
210207
);
211208
productName = LoopUpdaterHelper;
212209
productReference = B1AA00012F30000100AABBCC /* LoopUpdaterHelper */;
@@ -255,8 +252,8 @@
255252
2A28B6272EE5050C00A1E26B /* XCRemoteSwiftPackageReference "Defaults" */,
256253
2A28B62A2EE5057C00A1E26B /* XCRemoteSwiftPackageReference "luminare" */,
257254
3ED0A7B72F21DF6800A58629 /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
258-
2A0EEE832F381A3A00C40CF4 /* XCLocalSwiftPackageReference "../Subtrack" */,
259-
2A8EDDBA2F23743B005457F8 /* XCRemoteSwiftPackageReference "Scribe" */,
255+
2A847DFA2F5E49E90099E02A /* XCRemoteSwiftPackageReference "Scribe" */,
256+
2A847DFD2F5E4A080099E02A /* XCRemoteSwiftPackageReference "Subsurface" */,
260257
);
261258
productRefGroup = A8E59C36297F5E9A0064D4BA /* Products */;
262259
projectDirPath = "";
@@ -752,13 +749,6 @@
752749
};
753750
/* End XCConfigurationList section */
754751

755-
/* Begin XCLocalSwiftPackageReference section */
756-
2A74ABA12F3E65A100EBF95C /* XCLocalSwiftPackageReference "../Subsurface" */ = {
757-
isa = XCLocalSwiftPackageReference;
758-
relativePath = ../Subsurface;
759-
};
760-
/* End XCLocalSwiftPackageReference section */
761-
762752
/* Begin XCRemoteSwiftPackageReference section */
763753
2A28B6272EE5050C00A1E26B /* XCRemoteSwiftPackageReference "Defaults" */ = {
764754
isa = XCRemoteSwiftPackageReference;
@@ -776,14 +766,22 @@
776766
kind = branch;
777767
};
778768
};
779-
2AF9238C2F540B1300F467FD /* XCRemoteSwiftPackageReference "Scribe" */ = {
769+
2A847DFA2F5E49E90099E02A /* XCRemoteSwiftPackageReference "Scribe" */ = {
780770
isa = XCRemoteSwiftPackageReference;
781771
repositoryURL = "https://github.com/SenpaiHunters/Scribe";
782772
requirement = {
783773
branch = main;
784774
kind = branch;
785775
};
786776
};
777+
2A847DFD2F5E4A080099E02A /* XCRemoteSwiftPackageReference "Subsurface" */ = {
778+
isa = XCRemoteSwiftPackageReference;
779+
repositoryURL = "https://github.com/MrKai77/Subsurface";
780+
requirement = {
781+
branch = main;
782+
kind = branch;
783+
};
784+
};
787785
3ED0A7B72F21DF6800A58629 /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = {
788786
isa = XCRemoteSwiftPackageReference;
789787
repositoryURL = "https://github.com/weichsel/ZIPFoundation";
@@ -795,10 +793,6 @@
795793
/* End XCRemoteSwiftPackageReference section */
796794

797795
/* Begin XCSwiftPackageProductDependency section */
798-
2A28492A2F22B4B700F6CE42 /* Scribe */ = {
799-
isa = XCSwiftPackageProductDependency;
800-
productName = Scribe;
801-
};
802796
2A28B6282EE5050C00A1E26B /* Defaults */ = {
803797
isa = XCSwiftPackageProductDependency;
804798
package = 2A28B6272EE5050C00A1E26B /* XCRemoteSwiftPackageReference "Defaults" */;
@@ -809,18 +803,19 @@
809803
package = 2A28B62A2EE5057C00A1E26B /* XCRemoteSwiftPackageReference "luminare" */;
810804
productName = Luminare;
811805
};
812-
2A74ABA22F3E65A100EBF95C /* Subsurface */ = {
806+
2A847DFB2F5E49E90099E02A /* Scribe */ = {
813807
isa = XCSwiftPackageProductDependency;
814-
productName = Subsurface;
808+
package = 2A847DFA2F5E49E90099E02A /* XCRemoteSwiftPackageReference "Scribe" */;
809+
productName = Scribe;
815810
};
816-
2AF9238D2F540B1300F467FD /* Scribe */ = {
811+
2A847DFE2F5E4A080099E02A /* Subsurface */ = {
817812
isa = XCSwiftPackageProductDependency;
818-
package = 2AF9238C2F540B1300F467FD /* XCRemoteSwiftPackageReference "Scribe" */;
819-
productName = Scribe;
813+
package = 2A847DFD2F5E4A080099E02A /* XCRemoteSwiftPackageReference "Subsurface" */;
814+
productName = Subsurface;
820815
};
821-
2AF9238F2F540B2200F467FD /* Scribe */ = {
816+
2A847E002F5E4A0E0099E02A /* Scribe */ = {
822817
isa = XCSwiftPackageProductDependency;
823-
package = 2AF9238C2F540B1300F467FD /* XCRemoteSwiftPackageReference "Scribe" */;
818+
package = 2A847DFA2F5E49E90099E02A /* XCRemoteSwiftPackageReference "Scribe" */;
824819
productName = Scribe;
825820
};
826821
3ED0A7B82F21DF6800A58629 /* ZIPFoundation */ = {

0 commit comments

Comments
 (0)