yusiboyz/platform
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

resolve pbxproj conflict

Browse Source
This commit is contained in:
Yusuf
2026-04-03 19:09:44 -05:00
parent e9373ceac3
commit 144f24b7a0
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ios/Platform/Platform.xcodeproj/project.pbxproj
View File

@@ -50,8 +50,7 @@
A10045 /* ArticleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10045 /* ArticleView.swift */; };
A10046 /* ArticleWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10046 /* ArticleWebView.swift */; };
A10047 /* FeedManagementSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10047 /* FeedManagementSheet.swift */; };
A10048 /* ScrollViewDriver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10048 /* ScrollViewDriver.swift */; };
F20549752F805F5800AE8DF5 /* ConfettiSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = F20549742F805F5800AE8DF5 /* ConfettiSwiftUI */; };
F208E18F2F8082A200333426 /* ConfettiSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = F208E18E2F8082A200333426 /* ConfettiSwiftUI */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -98,7 +97,6 @@
B10045 /* ArticleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleView.swift; sourceTree = "<group>"; };
B10046 /* ArticleWebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleWebView.swift; sourceTree = "<group>"; };
B10047 /* FeedManagementSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedManagementSheet.swift; sourceTree = "<group>"; };
B10048 /* ScrollViewDriver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollViewDriver.swift; sourceTree = "<group>"; };
C10001 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
D10001 /* Platform.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Platform.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@@ -108,7 +106,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F20549752F805F5800AE8DF5 /* ConfettiSwiftUI in Frameworks */,
F208E18F2F8082A200333426 /* ConfettiSwiftUI in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -301,7 +299,7 @@
F10031 /* Models */,
F10032 /* API */,
F10033 /* ViewModels */,
F10034R /* Views */,
F10034 /* Views */,
);
path = Reader;
sourceTree = "<group>";
@@ -330,7 +328,7 @@
path = ViewModels;
sourceTree = "<group>";
};
F10034R /* Views */ = {
F10034 /* Views */ = {
isa = PBXGroup;
children = (
B10043 /* ReaderTabView.swift */,
@@ -338,7 +336,6 @@
B10045 /* ArticleView.swift */,
B10046 /* ArticleWebView.swift */,
B10047 /* FeedManagementSheet.swift */,
B10048 /* ScrollViewDriver.swift */,
);
path = Views;
sourceTree = "<group>";
@@ -388,7 +385,7 @@
);
mainGroup = F10001;
packageReferences = (
F20549732F805F5800AE8DF5 /* XCRemoteSwiftPackageReference "ConfettiSwiftUI" */,
F208E18D2F8082A200333426 /* XCRemoteSwiftPackageReference "ConfettiSwiftUI" */,
);
productRefGroup = F10020 /* Products */;
projectDirPath = "";
@@ -457,7 +454,6 @@
A10045 /* ArticleView.swift in Sources */,
A10046 /* ArticleWebView.swift in Sources */,
A10047 /* FeedManagementSheet.swift in Sources */,
A10048 /* ScrollViewDriver.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -665,7 +661,7 @@
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
F20549732F805F5800AE8DF5 /* XCRemoteSwiftPackageReference "ConfettiSwiftUI" */ = {
F208E18D2F8082A200333426 /* XCRemoteSwiftPackageReference "ConfettiSwiftUI" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/simibac/ConfettiSwiftUI";
requirement = {
@@ -676,9 +672,9 @@
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
F20549742F805F5800AE8DF5 /* ConfettiSwiftUI */ = {
F208E18E2F8082A200333426 /* ConfettiSwiftUI */ = {
isa = XCSwiftPackageProductDependency;
package = F20549732F805F5800AE8DF5 /* XCRemoteSwiftPackageReference "ConfettiSwiftUI" */;
package = F208E18D2F8082A200333426 /* XCRemoteSwiftPackageReference "ConfettiSwiftUI" */;
productName = ConfettiSwiftUI;
};
/* End XCSwiftPackageProductDependency section */