Skip to content

Commit 3055769

Browse files
LURKS02LURKS02
committed
[CHORE]: develop rebase로 인한 git 충돌 해결
1 parent 7922d10 commit 3055769

File tree

6 files changed

+10
-98
lines changed

6 files changed

+10
-98
lines changed

‎App/App/SceneDelegate.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77

88
import UIKit
9+
import Feature
910

1011
class SceneDelegate: UIResponder, UIWindowSceneDelegate {
1112
var window: UIWindow?
@@ -14,7 +15,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
1415
guard let windowScene = (scene as? UIWindowScene) else { return }
1516

1617
let window = UIWindow(windowScene: windowScene)
17-
window.rootViewController = RootViewController()
18+
let viewModel = MultipeerVideoListViewModel()
19+
let rootViewController = VideoListViewController(viewModel: viewModel)
20+
window.rootViewController = rootViewController
1821
self.window = window
1922
window.makeKeyAndVisible()
2023
}

‎Data/Data.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,6 @@
299299
isa = PBXSourcesBuildPhase;
300300
buildActionMask = 2147483647;
301301
files = (
302-
D971E5812CE8FA140006900E /* MCPeerIDStorage.swift in Sources */,
303-
D971E5822CE8FA140006900E /* SocketPeer.swift in Sources */,
304-
D971E5832CE8FA140006900E /* SocketProvider.swift in Sources */,
305302
);
306303
runOnlyForDeploymentPostprocessing = 0;
307304
};

‎Data/Data/ConnectedUserRepository.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77

88
import Combine
9-
import Interfaces
109
import Entity
10+
import Interfaces
1111
import P2PSocket
1212

1313
public final class ConnectedUserRepository: ConnectedUserRepositoryInterface {

‎Data/Data/Data.swift‎

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

‎Domain/Interfaces/UseCaseInterface/ConnectedUserUseCaseInterface.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ public protocol ConnectedUserUseCaseInterface {
1313

1414
init(repository: ConnectedUserRepositoryInterface)
1515

16-
func fetchConnectedUser() -> [ConnectedUser]
16+
func fetchConnectedUsers() -> [ConnectedUser]
1717
}

‎Feature/Feature.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
D971E5892CE8FAD10006900E /* Interfaces.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D971E5882CE8FAD10006900E /* Interfaces.framework */; };
1111
D971E58A2CE8FAD10006900E /* Interfaces.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D971E5882CE8FAD10006900E /* Interfaces.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
12-
E4E39BA32CDBC872001E08D0 /* libFeature.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FED968172CD908B000CD445C /* libFeature.a */; platformFilter = ios; };
13-
E4E39BAE2CDBCA04001E08D0 /* libDomain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4E39BAD2CDBCA04001E08D0 /* libDomain.a */; };
1412
FE0334DA2CD9DA1100AA58C9 /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = FE0334D92CD9DA1100AA58C9 /* SnapKit */; };
1513
/* End PBXBuildFile section */
1614

@@ -40,21 +38,13 @@
4038

4139
/* Begin PBXFileReference section */
4240
D971E5882CE8FAD10006900E /* Interfaces.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Interfaces.framework; sourceTree = BUILT_PRODUCTS_DIR; };
43-
E4E39B9F2CDBC872001E08D0 /* GroupInfoTest.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GroupInfoTest.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4441
E4E39BAD2CDBCA04001E08D0 /* libDomain.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libDomain.a; sourceTree = BUILT_PRODUCTS_DIR; };
4542
FE0334EE2CD9DE4600AA58C9 /* libDomain.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libDomain.a; sourceTree = BUILT_PRODUCTS_DIR; };
4643
FED968172CD908B000CD445C /* libFeature.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFeature.a; sourceTree = BUILT_PRODUCTS_DIR; };
4744
/* End PBXFileReference section */
4845

4946
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
50-
E4E39BAA2CDBC893001E08D0 /* Exceptions for "Feature" folder in "GroupInfoTest" target */ = {
51-
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
52-
membershipExceptions = (
53-
GroupInfoView/ViewModel/GroupInfoViewModel.swift,
54-
);
55-
target = E4E39B9E2CDBC872001E08D0 /* GroupInfoTest */;
56-
};
57-
FEF778AC2CDAFB2D00FFE089 /* Exceptions for "Feature" folder in "Feature" target */ = {
47+
D9CF2EF62CEC2E3B00B1A92D /* Exceptions for "Feature" folder in "Feature" target */ = {
5848
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
5949
membershipExceptions = (
6050
"ConnectionView/CGPoint+Extension.swift",
@@ -94,6 +84,9 @@
9484
/* Begin PBXFileSystemSynchronizedRootGroup section */
9585
FE6EF3F12CD8B71E005DC39D /* Feature */ = {
9686
isa = PBXFileSystemSynchronizedRootGroup;
87+
exceptions = (
88+
D9CF2EF62CEC2E3B00B1A92D /* Exceptions for "Feature" folder in "Feature" target */,
89+
);
9790
path = Feature;
9891
sourceTree = "<group>";
9992
};
@@ -391,81 +384,6 @@
391384
};
392385
name = Release;
393386
};
394-
FEF778F92CDB227500FFE089 /* Debug */ = {
395-
isa = XCBuildConfiguration;
396-
buildSettings = {
397-
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
398-
CLANG_ENABLE_MODULES = YES;
399-
CODE_SIGN_STYLE = Automatic;
400-
CURRENT_PROJECT_VERSION = 1;
401-
DEFINES_MODULE = NO;
402-
DEVELOPMENT_TEAM = B3PWYBKFUK;
403-
DYLIB_COMPATIBILITY_VERSION = 1;
404-
DYLIB_CURRENT_VERSION = 1;
405-
DYLIB_INSTALL_NAME_BASE = "@rpath";
406-
ENABLE_MODULE_VERIFIER = YES;
407-
ENABLE_USER_SCRIPT_SANDBOXING = NO;
408-
GENERATE_INFOPLIST_FILE = YES;
409-
INFOPLIST_KEY_NSHumanReadableCopyright = "";
410-
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
411-
LD_RUNPATH_SEARCH_PATHS = (
412-
"$(inherited)",
413-
"@executable_path/Frameworks",
414-
"@loader_path/Frameworks",
415-
);
416-
MARKETING_VERSION = 1.0;
417-
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
418-
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
419-
PRODUCT_BUNDLE_IDENTIFIER = jung.FeatureInterface;
420-
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
421-
SKIP_INSTALL = YES;
422-
SWIFT_EMIT_LOC_STRINGS = YES;
423-
SWIFT_INSTALL_OBJC_HEADER = NO;
424-
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
425-
SWIFT_VERSION = 5.0;
426-
TARGETED_DEVICE_FAMILY = "1,2";
427-
VERSIONING_SYSTEM = "apple-generic";
428-
VERSION_INFO_PREFIX = "";
429-
};
430-
name = Debug;
431-
};
432-
FEF778FA2CDB227500FFE089 /* Release */ = {
433-
isa = XCBuildConfiguration;
434-
buildSettings = {
435-
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
436-
CLANG_ENABLE_MODULES = YES;
437-
CODE_SIGN_STYLE = Automatic;
438-
CURRENT_PROJECT_VERSION = 1;
439-
DEFINES_MODULE = NO;
440-
DEVELOPMENT_TEAM = B3PWYBKFUK;
441-
DYLIB_COMPATIBILITY_VERSION = 1;
442-
DYLIB_CURRENT_VERSION = 1;
443-
DYLIB_INSTALL_NAME_BASE = "@rpath";
444-
ENABLE_MODULE_VERIFIER = YES;
445-
ENABLE_USER_SCRIPT_SANDBOXING = NO;
446-
GENERATE_INFOPLIST_FILE = YES;
447-
INFOPLIST_KEY_NSHumanReadableCopyright = "";
448-
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
449-
LD_RUNPATH_SEARCH_PATHS = (
450-
"$(inherited)",
451-
"@executable_path/Frameworks",
452-
"@loader_path/Frameworks",
453-
);
454-
MARKETING_VERSION = 1.0;
455-
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
456-
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
457-
PRODUCT_BUNDLE_IDENTIFIER = jung.FeatureInterface;
458-
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
459-
SKIP_INSTALL = YES;
460-
SWIFT_EMIT_LOC_STRINGS = YES;
461-
SWIFT_INSTALL_OBJC_HEADER = NO;
462-
SWIFT_VERSION = 5.0;
463-
TARGETED_DEVICE_FAMILY = "1,2";
464-
VERSIONING_SYSTEM = "apple-generic";
465-
VERSION_INFO_PREFIX = "";
466-
};
467-
name = Release;
468-
};
469387
/* End XCBuildConfiguration section */
470388

471389
/* Begin XCConfigurationList section */

0 commit comments

Comments
 (0)