Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RxSwift, RxCocoa 추가 #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ disabled_rules:
- trailing_whitespace

line_length:
ignores_comments: true
warning: 99
error: 120

excluded:
- Pods
22 changes: 21 additions & 1 deletion MovieConnect.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 51;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -138,6 +138,7 @@
AF3CD17023C0683000DA2C45 /* Frameworks */,
AF3CD17123C0683000DA2C45 /* Resources */,
AF4A6AB323C06B5700C71FA6 /* ShellScript */,
8E3E2AA3EB3C0B3051A12B3E /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -248,6 +249,23 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
8E3E2AA3EB3C0B3051A12B3E /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MovieConnect/Pods-MovieConnect-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MovieConnect/Pods-MovieConnect-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MovieConnect/Pods-MovieConnect-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
AF4A6AB323C06B5700C71FA6 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -436,6 +454,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = YV47R3P48P;
INFOPLIST_FILE = MovieConnect/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -454,6 +473,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = YV47R3P48P;
INFOPLIST_FILE = MovieConnect/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down
29 changes: 17 additions & 12 deletions MovieConnect/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,32 @@ import UIKit
@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {



func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
func application(
_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
// Override point for customization after application launch.
return true
}

// MARK: UISceneSession Lifecycle

func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
func application(
_ application: UIApplication,
configurationForConnecting connectingSceneSession: UISceneSession,
options: UIScene.ConnectionOptions
) -> UISceneConfiguration {
// Called when a new scene session is being created.
// Use this method to select a configuration to create the new scene with.
return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
return UISceneConfiguration(
name: "Default Configuration",
sessionRole: connectingSceneSession.role
)
}

func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
// Called when the user discards a scene session.
// If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
// Use this method to release any resources that were specific to the discarded scenes, as they will not return.
func application(
_ application: UIApplication,
didDiscardSceneSessions sceneSessions: Set<UISceneSession>
) {
}


}

10 changes: 5 additions & 5 deletions MovieConnect/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {

var window: UIWindow?


func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
func scene(
_ scene: UIScene,
willConnectTo session: UISceneSession,
options connectionOptions: UIScene.ConnectionOptions
) {
// Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
// If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
// This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
Expand Down Expand Up @@ -47,7 +50,4 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
// Use this method to save data, release shared resources, and store enough scene-specific state information
// to restore the scene back to its current state.
}


}

3 changes: 0 additions & 3 deletions MovieConnect/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,4 @@ class ViewController: UIViewController {
super.viewDidLoad()
// Do any additional setup after loading the view.
}


}

2 changes: 2 additions & 0 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ target 'MovieConnect' do

# Pods for MovieConnect

pod 'RxSwift', '~> 5'
pod 'RxCocoa', '~> 5'
pod 'SwiftLint'

end
21 changes: 18 additions & 3 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
PODS:
- RxCocoa (5.0.1):
- RxRelay (~> 5)
- RxSwift (~> 5)
- RxRelay (5.0.1):
- RxSwift (~> 5)
- RxSwift (5.0.1)
- SwiftLint (0.33.1)

DEPENDENCIES:
- RxCocoa (~> 5)
- RxSwift (~> 5)
- SwiftLint

SPEC REPOS:
https://github.com/cocoapods/specs.git:
https://github.com/CocoaPods/Specs.git:
- SwiftLint
trunk:
- RxCocoa
- RxRelay
- RxSwift

SPEC CHECKSUMS:
RxCocoa: e741b9749968e8a143e2b787f1dfbff2b63d0a5c
RxRelay: 89d54507f4fd4d969e6ec1d4bd7f3673640b4640
RxSwift: e2dc62b366a3adf6a0be44ba9f405efd4c94e0c4
SwiftLint: 9fc1143bbacec37f94994a7d0d2a85b2154b6294

PODFILE CHECKSUM: e5716a2333161119f72b16ece6191a0fbd5373db
PODFILE CHECKSUM: 19b208dfa1504b1c34972ef8890979fc00160e0e

COCOAPODS: 1.6.0.rc.2
COCOAPODS: 1.8.4
21 changes: 18 additions & 3 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading