Skip to content

Commit

Permalink
Merge branch 'develop' into feat/#73
Browse files Browse the repository at this point in the history
  • Loading branch information
@00yhsp
00yhsp authored Feb 19, 2024
2 parents a26a686 + 6dd6fa4 commit 337e3a3
Show file tree
Hide file tree
Showing 3 changed files with 175 additions and 152 deletions.
11 changes: 5 additions & 6 deletions Spon-us.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
100D38B82B4EF54100498977 /* CategoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100D38B72B4EF54100498977 /* CategoryView.swift */; };
100D38BA2B4EF54C00498977 /* MyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100D38B92B4EF54C00498977 /* MyView.swift */; };
1031EC7C2B68B9F20016655B /* AnnouncementView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1031EC7B2B68B9F20016655B /* AnnouncementView.swift */; };
105A46CD2B826DC70039FD70 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 105A46CC2B826DC70039FD70 /* GoogleService-Info.plist */; };
106720022B5835FA00493354 /* SendOfferView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 106720012B5835FA00493354 /* SendOfferView.swift */; };
107D6E692B7A8273005B6261 /* OrganizationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 107D6E682B7A8273005B6261 /* OrganizationModel.swift */; };
107D6E6B2B7A83AB005B6261 /* MyOrganizationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 107D6E6A2B7A83AB005B6261 /* MyOrganizationViewModel.swift */; };
Expand Down Expand Up @@ -83,7 +82,7 @@
806AF8732B7B8504008F7F62 /* AnnouncementViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 806AF8722B7B8504008F7F62 /* AnnouncementViewModel.swift */; };
806AF8752B7B8595008F7F62 /* AnnouncementModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 806AF8742B7B8595008F7F62 /* AnnouncementModel.swift */; };
807BF83F2B51BCD400A659B9 /* SearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 807BF83E2B51BCD400A659B9 /* SearchView.swift */; };
80A25CAA2B828E6800BDDDE4 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 80A25CA92B828E6800BDDDE4 /* GoogleService-Info.plist */; };
80A25CB02B82D1A700BDDDE4 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 80A25CAF2B82D1A700BDDDE4 /* GoogleService-Info.plist */; };
80B41FFE2B77CCA40021DD90 /* NotificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80B41FFD2B77CCA40021DD90 /* NotificationView.swift */; };
80B420022B77F2030021DD90 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 80B420012B77F2030021DD90 /* FirebaseAnalytics */; };
80B420042B77F2030021DD90 /* FirebaseAnalyticsOnDeviceConversion in Frameworks */ = {isa = PBXBuildFile; productRef = 80B420032B77F2030021DD90 /* FirebaseAnalyticsOnDeviceConversion */; };
Expand Down Expand Up @@ -182,7 +181,6 @@
100D38B92B4EF54C00498977 /* MyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyView.swift; sourceTree = "<group>"; };
1031EC7B2B68B9F20016655B /* AnnouncementView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnouncementView.swift; sourceTree = "<group>"; };
10584CBF2B81EE84007F7A3F /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; name = "GoogleService-Info.plist"; path = "/Desktop/GoogleService-Info.plist"; sourceTree = "<absolute>"; };
105A46CC2B826DC70039FD70 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../Desktop/GoogleService-Info.plist"; sourceTree = "<group>"; };
106720012B5835FA00493354 /* SendOfferView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendOfferView.swift; sourceTree = "<group>"; };
107D6E682B7A8273005B6261 /* OrganizationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrganizationModel.swift; sourceTree = "<group>"; };
107D6E6A2B7A83AB005B6261 /* MyOrganizationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyOrganizationViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -229,7 +227,7 @@
806AF8722B7B8504008F7F62 /* AnnouncementViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnouncementViewModel.swift; sourceTree = "<group>"; };
806AF8742B7B8595008F7F62 /* AnnouncementModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnouncementModel.swift; sourceTree = "<group>"; };
807BF83E2B51BCD400A659B9 /* SearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchView.swift; sourceTree = "<group>"; };
80A25CA92B828E6800BDDDE4 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../GoogleService-Info.plist"; sourceTree = "<group>"; };
80A25CAF2B82D1A700BDDDE4 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../스포너스 배포버전-iOS/GoogleService-Info.plist"; sourceTree = "<group>"; };
80B41FFD2B77CCA40021DD90 /* NotificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationView.swift; sourceTree = "<group>"; };
80B41FFF2B77F0DF0021DD90 /* Spon-us.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Spon-us.entitlements"; sourceTree = "<group>"; };
80FA31682B5EB9490076453B /* NewPostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewPostView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -393,7 +391,7 @@
100D387F2B44826500498977 /* Spon-us */ = {
isa = PBXGroup;
children = (
80A25CA92B828E6800BDDDE4 /* GoogleService-Info.plist */,
80A25CAF2B82D1A700BDDDE4 /* GoogleService-Info.plist */,
80B41FFF2B77F0DF0021DD90 /* Spon-us.entitlements */,
100D389F2B44833F00498977 /* Info.plist */,
3B36F09F2B6FEBCB0000ACFB /* PortOne */,
Expand Down Expand Up @@ -687,6 +685,7 @@
isa = PBXGroup;
children = (
10584CBF2B81EE84007F7A3F /* GoogleService-Info.plist */,
3BA7C09D2B82BCFD00654B62 /* GoogleService-Info.plist */,
);
name = "Recovered References";
sourceTree = "<group>";
Expand Down Expand Up @@ -801,7 +800,7 @@
3B81BCC02B6231680067E9CB /* ProductList.plist in Resources */,
100D389C2B44833500498977 /* SUIT-Medium.otf in Resources */,
80A25CAA2B828E6800BDDDE4 /* GoogleService-Info.plist in Resources */,
DFC5901C2B82D3D700A5B61D /* GoogleService-Info.plist in Resources */,
80A25CB02B82D1A700BDDDE4 /* GoogleService-Info.plist in Resources */,
3B81BCBE2B62312C0067E9CB /* Product.storekit in Resources */,
100D38A32B44834700498977 /* Preview Assets.xcassets in Resources */,
100D389E2B44833500498977 /* Pretendard-SemiBold.otf in Resources */,
Expand Down
Loading

0 comments on commit 337e3a3

Please sign in to comment.