diff --git a/.gitignore b/.gitignore index 7489e264..36a5bd3e 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,5 @@ fastlane/screenshots .idea/workspace.xml .idea/tasks.xml +cpd-output.xml + diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..53b16c01 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "code-quality"] + path = code-quality + url = https://github.com/TouchInstinct/code-quality-ios diff --git a/.swiftlint.yml b/.swiftlint.yml new file mode 120000 index 00000000..0add564e --- /dev/null +++ b/.swiftlint.yml @@ -0,0 +1 @@ +code-quality/.swiftlint.yml \ No newline at end of file diff --git a/.tailor.yml b/.tailor.yml new file mode 120000 index 00000000..73afece8 --- /dev/null +++ b/.tailor.yml @@ -0,0 +1 @@ +code-quality/.tailor.yml \ No newline at end of file diff --git a/LeadKit.podspec b/LeadKit.podspec index 794d590e..95c7f537 100644 --- a/LeadKit.podspec +++ b/LeadKit.podspec @@ -13,7 +13,7 @@ Pod::Spec.new do |s| ss.tvos.deployment_target = '9.0' ss.watchos.deployment_target = '2.0' - ss.source_files = "LeadKit/Sources/Extensions/UIColor/UIColor+Hex.swift" + ss.source_files = "Sources/Extensions/UIColor/UIColor+Hex.swift" end s.subspec 'Drawing' do |ss| @@ -22,14 +22,14 @@ Pod::Spec.new do |s| ss.watchos.deployment_target = '2.0' ss.source_files = [ - "LeadKit/Sources/Enums/ResizeContentMode.swift", - "LeadKit/Sources/Extensions/{CGContext,CGImage,CGSize,UIImage}/*", - "LeadKit/Sources/Protocols/{DrawingOperation,SupportProtocol}.swift", - "LeadKit/Sources/Structures/Drawing/*", + "Sources/Enums/ResizeContentMode.swift", + "Sources/Extensions/{CGContext,CGImage,CGSize,UIImage}/*", + "Sources/Protocols/{DrawingOperation,SupportProtocol}.swift", + "Sources/Structures/Drawing/*", ] ss.watchos.exclude_files = [ - "LeadKit/Sources/Structures/Drawing/CALayerDrawingOperation.swift", - "LeadKit/Sources/Extensions/UIImage/*", + "Sources/Structures/Drawing/CALayerDrawingOperation.swift", + "Sources/Extensions/UIImage/*", ] end @@ -38,42 +38,42 @@ Pod::Spec.new do |s| ss.tvos.deployment_target = '9.0' ss.watchos.deployment_target = '2.0' - ss.source_files = "LeadKit/Sources/**/*.swift" + ss.source_files = "Sources/**/*.swift" ss.watchos.exclude_files = [ - "LeadKit/Sources/Classes/Pagination/PaginationTableViewWrapper.swift", - "LeadKit/Sources/Classes/Views/XibView.swift", - "LeadKit/Sources/Classes/Views/SpinnerView.swift", - "LeadKit/Sources/Extensions/CABasicAnimation/*", - "LeadKit/Sources/Extensions/CGFloat/CGFloat+Pixels.swift", - "LeadKit/Sources/Extensions/NetworkService/NetworkService+ActivityIndicator.swift", - "LeadKit/Sources/Extensions/NetworkService/NetworkService+RxLoadImage.swift", - "LeadKit/Sources/Extensions/PaginationTableViewWrapperDelegate/PaginationTableViewWrapperDelegate+DefaultImplementation.swift", - "LeadKit/Sources/Extensions/StoryboardProtocol/*", - "LeadKit/Sources/Extensions/Support/UIScrollView+Support.swift", - "LeadKit/Sources/Extensions/TableDirector/TableDirector+Extensions.swift", - "LeadKit/Sources/Extensions/UIActivityIndicatorView/*", - "LeadKit/Sources/Extensions/UIAlertcontroller/*", - "LeadKit/Sources/Extensions/UICollectionView/*", - "LeadKit/Sources/Extensions/UIDevice/*", - "LeadKit/Sources/Extensions/UIImage/*", - "LeadKit/Sources/Extensions/UIStoryboard/*", - "LeadKit/Sources/Extensions/UIView/*", - "LeadKit/Sources/Extensions/UIViewController/*", - "LeadKit/Sources/Extensions/UIWindow/*", - "LeadKit/Sources/Protocols/LoadingIndicator.swift", - "LeadKit/Sources/Protocols/StoryboardProtocol.swift", - "LeadKit/Sources/Structures/Views/AnyLoadingIndicator.swift", - "LeadKit/Sources/Structures/DrawingOperations/CALayerDrawingOperation.swift", - "LeadKit/Sources/Structures/DrawingOperations/RoundDrawingOperation.swift", - "LeadKit/Sources/Structures/DrawingOperations/BorderDrawingOperation.swift", + "Sources/Classes/Pagination/PaginationTableViewWrapper.swift", + "Sources/Classes/Views/XibView.swift", + "Sources/Classes/Views/SpinnerView.swift", + "Sources/Extensions/CABasicAnimation/*", + "Sources/Extensions/CGFloat/CGFloat+Pixels.swift", + "Sources/Extensions/NetworkService/NetworkService+ActivityIndicator.swift", + "Sources/Extensions/NetworkService/NetworkService+RxLoadImage.swift", + "Sources/Extensions/PaginationTableViewWrapperDelegate/PaginationTableViewWrapperDelegate+DefaultImplementation.swift", + "Sources/Extensions/StoryboardProtocol/*", + "Sources/Extensions/Support/UIScrollView+Support.swift", + "Sources/Extensions/TableDirector/TableDirector+Extensions.swift", + "Sources/Extensions/UIActivityIndicatorView/*", + "Sources/Extensions/UIAlertcontroller/*", + "Sources/Extensions/UICollectionView/*", + "Sources/Extensions/UIDevice/*", + "Sources/Extensions/UIImage/*", + "Sources/Extensions/UIStoryboard/*", + "Sources/Extensions/UIView/*", + "Sources/Extensions/UIViewController/*", + "Sources/Extensions/UIWindow/*", + "Sources/Protocols/LoadingIndicator.swift", + "Sources/Protocols/StoryboardProtocol.swift", + "Sources/Structures/Views/AnyLoadingIndicator.swift", + "Sources/Structures/DrawingOperations/CALayerDrawingOperation.swift", + "Sources/Structures/DrawingOperations/RoundDrawingOperation.swift", + "Sources/Structures/DrawingOperations/BorderDrawingOperation.swift", ] ss.tvos.exclude_files = [ - "LeadKit/Sources/Classes/Pagination/PaginationTableViewWrapper.swift", - "LeadKit/Sources/Structures/Drawing/CALayerDrawingOperation.swift", - "LeadKit/Sources/Extensions/NetworkService/NetworkService+ActivityIndicator.swift", - "LeadKit/Sources/Extensions/PaginationTableViewWrapperDelegate/PaginationTableViewWrapperDelegate+DefaultImplementation.swift", - "LeadKit/Sources/Extensions/Support/UIScrollView+Support.swift", - "LeadKit/Sources/Extensions/TableDirector/TableDirector+Extensions.swift", + "Sources/Classes/Pagination/PaginationTableViewWrapper.swift", + "Sources/Structures/Drawing/CALayerDrawingOperation.swift", + "Sources/Extensions/NetworkService/NetworkService+ActivityIndicator.swift", + "Sources/Extensions/PaginationTableViewWrapperDelegate/PaginationTableViewWrapperDelegate+DefaultImplementation.swift", + "Sources/Extensions/Support/UIScrollView+Support.swift", + "Sources/Extensions/TableDirector/TableDirector+Extensions.swift", ] ss.dependency "CocoaLumberjack/Swift", '~> 3.1.0' @@ -89,13 +89,13 @@ Pod::Spec.new do |s| s.subspec 'Core-iOS-Extension' do |ss| ss.platform = :ios, '9.0' - ss.source_files = "LeadKit/Sources/**/*.swift" + ss.source_files = "Sources/**/*.swift" ss.exclude_files = [ - "LeadKit/Sources/Classes/Pagination/PaginationTableViewWrapper.swift", - "LeadKit/Sources/Extensions/NetworkService/NetworkService+ActivityIndicator.swift", - "LeadKit/Sources/Extensions/PaginationTableViewWrapperDelegate/PaginationTableViewWrapperDelegate+DefaultImplementation.swift", - "LeadKit/Sources/Extensions/TableDirector/TableDirector+Extensions.swift", + "Sources/Classes/Pagination/PaginationTableViewWrapper.swift", + "Sources/Extensions/NetworkService/NetworkService+ActivityIndicator.swift", + "Sources/Extensions/PaginationTableViewWrapperDelegate/PaginationTableViewWrapperDelegate+DefaultImplementation.swift", + "Sources/Extensions/TableDirector/TableDirector+Extensions.swift", ] ss.dependency "CocoaLumberjack/Swift", '~> 3.1.0' diff --git a/LeadKit/LeadKit.xcodeproj/project.pbxproj b/LeadKit.xcodeproj/project.pbxproj similarity index 99% rename from LeadKit/LeadKit.xcodeproj/project.pbxproj rename to LeadKit.xcodeproj/project.pbxproj index 8886bb93..6ba7d0e8 100644 --- a/LeadKit/LeadKit.xcodeproj/project.pbxproj +++ b/LeadKit.xcodeproj/project.pbxproj @@ -1252,6 +1252,7 @@ buildConfigurationList = 67186B391EB248F100CFAFFB /* Build configuration list for PBXNativeTarget "LeadKit iOS" */; buildPhases = ( 8AB4AD16371A6CA62765A6E7 /* [CP] Check Pods Manifest.lock */, + 67887A0E1ECC856F008A9E1D /* CopyPaste Detection */, 67186C2D1EB2537A00CFAFFB /* Tailor */, 67186C2E1EB2538E00CFAFFB /* SwiftLint */, 67186B231EB248F100CFAFFB /* Sources */, @@ -1698,6 +1699,20 @@ shellPath = /bin/sh; shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi"; }; + 67887A0E1ECC856F008A9E1D /* CopyPaste Detection */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "CopyPaste Detection"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Running CPD\npmd cpd --files Sources --minimum-tokens 50 --language swift --encoding UTF-8 --format net.sourceforge.pmd.cpd.XMLRenderer > cpd-output.xml --failOnViolation true\n\n# Running script\nphp ./cpd_script.php -cpd-xml cpd-output.xml"; + }; 6C0CE35AC797D005DF06F7D5 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/LeadKit/LeadKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/LeadKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from LeadKit/LeadKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to LeadKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/LeadKit/LeadKit.xcworkspace/contents.xcworkspacedata b/LeadKit.xcworkspace/contents.xcworkspacedata similarity index 100% rename from LeadKit/LeadKit.xcworkspace/contents.xcworkspacedata rename to LeadKit.xcworkspace/contents.xcworkspacedata diff --git a/LeadKit/.swiftlint.yml b/LeadKit/.swiftlint.yml deleted file mode 100644 index 307a6eac..00000000 --- a/LeadKit/.swiftlint.yml +++ /dev/null @@ -1,21 +0,0 @@ -disabled_rules: - - variable_name -excluded: - - Carthage - - Pods -line_length: 128 -type_body_length: - - 500 # warning - - 700 # error -file_length: - warning: 500 - error: 1200 -warning_threshold: 1 - -custom_rules: - uiwebview_disabled: - included: ".*.swift" - name: "UIWebView Usage Disabled" - regex: "(UIWebView)" - message: "Do not use UIWebView. Use WKWebView Instead. https://developer.apple.com/reference/uikit/uiwebview" - severity: error \ No newline at end of file diff --git a/LeadKit/.tailor.yml b/LeadKit/.tailor.yml deleted file mode 100644 index 1bee5185..00000000 --- a/LeadKit/.tailor.yml +++ /dev/null @@ -1,4 +0,0 @@ -exclude: - - 'Pods' - - 'Carthage' - - 'RxAlamofire' diff --git a/LeadKit/Podfile b/Podfile similarity index 100% rename from LeadKit/Podfile rename to Podfile diff --git a/LeadKit/Podfile.lock b/Podfile.lock similarity index 87% rename from LeadKit/Podfile.lock rename to Podfile.lock index 39e2a76d..02faff1c 100644 --- a/LeadKit/Podfile.lock +++ b/Podfile.lock @@ -13,7 +13,6 @@ PODS: - RxSwift (~> 3.4) - RxSwift (3.4.0) - TableKit (2.3.1) - - Toast-Swift (2.0.0) - UIScrollView-InfiniteScroll (1.0.1) DEPENDENCIES: @@ -23,7 +22,6 @@ DEPENDENCIES: - RxCocoa (= 3.4.0) - RxSwift (= 3.4.0) - TableKit (~> 2.3.1) - - Toast-Swift (~> 2.0.0) - UIScrollView-InfiniteScroll (~> 1.0.0) SPEC CHECKSUMS: @@ -34,9 +32,8 @@ SPEC CHECKSUMS: RxCocoa: d14ef6b6029e1ddc6e966508c09289090de68ff9 RxSwift: 3789a1af753002a14edecdb698a2424624296a9c TableKit: 02e041b443f75fa3e9f1ee6024d4b256305bd904 - Toast-Swift: 5b2f8f720f7e78e48511f693df1f9c9a6e38a25a UIScrollView-InfiniteScroll: a90df4ba4a7ca1926128ade34a850ddbdf74c564 -PODFILE CHECKSUM: cf6dcd073cc362b0d897b5b68e5c2c16c982d072 +PODFILE CHECKSUM: 911be4683d2ba9315350d42e9576f7517da3f756 COCOAPODS: 1.2.1 diff --git a/LeadKit/Sources/Classes/Concurrency/Mutex.swift b/Sources/Classes/Concurrency/Mutex.swift similarity index 100% rename from LeadKit/Sources/Classes/Concurrency/Mutex.swift rename to Sources/Classes/Concurrency/Mutex.swift diff --git a/LeadKit/Sources/Classes/Cursors/FixedPageCursor.swift b/Sources/Classes/Cursors/FixedPageCursor.swift similarity index 100% rename from LeadKit/Sources/Classes/Cursors/FixedPageCursor.swift rename to Sources/Classes/Cursors/FixedPageCursor.swift diff --git a/LeadKit/Sources/Classes/Cursors/MapCursor.swift b/Sources/Classes/Cursors/MapCursor.swift similarity index 100% rename from LeadKit/Sources/Classes/Cursors/MapCursor.swift rename to Sources/Classes/Cursors/MapCursor.swift diff --git a/LeadKit/Sources/Classes/Cursors/SingleLoadCursor.swift b/Sources/Classes/Cursors/SingleLoadCursor.swift similarity index 100% rename from LeadKit/Sources/Classes/Cursors/SingleLoadCursor.swift rename to Sources/Classes/Cursors/SingleLoadCursor.swift diff --git a/LeadKit/Sources/Classes/Cursors/StaticCursor.swift b/Sources/Classes/Cursors/StaticCursor.swift similarity index 100% rename from LeadKit/Sources/Classes/Cursors/StaticCursor.swift rename to Sources/Classes/Cursors/StaticCursor.swift diff --git a/LeadKit/Sources/Classes/Logging/App.swift b/Sources/Classes/Logging/App.swift similarity index 100% rename from LeadKit/Sources/Classes/Logging/App.swift rename to Sources/Classes/Logging/App.swift diff --git a/LeadKit/Sources/Classes/Logging/Log.swift b/Sources/Classes/Logging/Log.swift similarity index 100% rename from LeadKit/Sources/Classes/Logging/Log.swift rename to Sources/Classes/Logging/Log.swift diff --git a/LeadKit/Sources/Classes/Logging/LogFormatter.swift b/Sources/Classes/Logging/LogFormatter.swift similarity index 100% rename from LeadKit/Sources/Classes/Logging/LogFormatter.swift rename to Sources/Classes/Logging/LogFormatter.swift diff --git a/LeadKit/Sources/Classes/Pagination/PaginationTableViewWrapper.swift b/Sources/Classes/Pagination/PaginationTableViewWrapper.swift similarity index 99% rename from LeadKit/Sources/Classes/Pagination/PaginationTableViewWrapper.swift rename to Sources/Classes/Pagination/PaginationTableViewWrapper.swift index 393fdfe9..f8821b54 100644 --- a/LeadKit/Sources/Classes/Pagination/PaginationTableViewWrapper.swift +++ b/Sources/Classes/Pagination/PaginationTableViewWrapper.swift @@ -152,7 +152,7 @@ where Delegate.Cursor == Cursor { .addDisposableTo(disposeBag) } - // MARK: States handling + // MARK - States handling private func onInitialState() { // @@ -255,7 +255,7 @@ where Delegate.Cursor == Cursor { currentPlaceholderView = emptyView } - // MARK: private stuff + // MARK - private stuff private func onExhaustedState() { removeInfiniteScroll() diff --git a/LeadKit/Sources/Classes/Pagination/PaginationViewModel.swift b/Sources/Classes/Pagination/PaginationViewModel.swift similarity index 100% rename from LeadKit/Sources/Classes/Pagination/PaginationViewModel.swift rename to Sources/Classes/Pagination/PaginationViewModel.swift diff --git a/LeadKit/Sources/Classes/Services/NetworkService.swift b/Sources/Classes/Services/NetworkService.swift similarity index 99% rename from LeadKit/Sources/Classes/Services/NetworkService.swift rename to Sources/Classes/Services/NetworkService.swift index fcd5fa50..b62970c1 100644 --- a/LeadKit/Sources/Classes/Services/NetworkService.swift +++ b/Sources/Classes/Services/NetworkService.swift @@ -28,7 +28,6 @@ import RxAlamofire /// Base network service implementation build on top of LeadKit extensions for Alamofire. /// Has an ability to automatically show / hide network activity indicator -/// and shows errors in DEBUG mode open class NetworkService { private let requestCountVariable = Variable(0) diff --git a/LeadKit/Sources/Classes/Views/SpinnerView.swift b/Sources/Classes/Views/SpinnerView.swift similarity index 98% rename from LeadKit/Sources/Classes/Views/SpinnerView.swift rename to Sources/Classes/Views/SpinnerView.swift index c3bfe043..480a2b61 100644 --- a/LeadKit/Sources/Classes/Views/SpinnerView.swift +++ b/Sources/Classes/Views/SpinnerView.swift @@ -80,7 +80,7 @@ class SpinnerView: UIView, Animatable, LoadingIndicator { } } - // MARK: Animatable + // MARK - Animatable func startAnimating() { guard !animating else { @@ -106,7 +106,7 @@ class SpinnerView: UIView, Animatable, LoadingIndicator { removeAnimation() } - // MARK: private stuff + // MARK - private stuff private func addAnimation() { guard let imageView = imageView else { diff --git a/LeadKit/Sources/Classes/Views/XibView.swift b/Sources/Classes/Views/XibView.swift similarity index 95% rename from LeadKit/Sources/Classes/Views/XibView.swift rename to Sources/Classes/Views/XibView.swift index 083210dc..6f0dfd6b 100644 --- a/LeadKit/Sources/Classes/Views/XibView.swift +++ b/Sources/Classes/Views/XibView.swift @@ -45,7 +45,7 @@ open class XibView: UIView { } private func setupView() { - let view: UIView = UIView.loadFromNib(named: innerViewNibName, owner: self) + let view = UIView.loadFromNib(named: innerViewNibName, owner: self) as UIView // Make frame size match the size of the content view in the xib frame = CGRect(origin: frame.origin, size: view.frame.size) diff --git a/LeadKit/Sources/Enums/CursorError.swift b/Sources/Enums/CursorError.swift similarity index 100% rename from LeadKit/Sources/Enums/CursorError.swift rename to Sources/Enums/CursorError.swift diff --git a/LeadKit/Sources/Enums/LeadKitError.swift b/Sources/Enums/LeadKitError.swift similarity index 100% rename from LeadKit/Sources/Enums/LeadKitError.swift rename to Sources/Enums/LeadKitError.swift diff --git a/LeadKit/Sources/Enums/ResizeContentMode.swift b/Sources/Enums/ResizeContentMode.swift similarity index 100% rename from LeadKit/Sources/Enums/ResizeContentMode.swift rename to Sources/Enums/ResizeContentMode.swift diff --git a/LeadKit/Sources/Extensions/Alamofire/AlamofireManager+Extensions.swift b/Sources/Extensions/Alamofire/AlamofireManager+Extensions.swift similarity index 93% rename from LeadKit/Sources/Extensions/Alamofire/AlamofireManager+Extensions.swift rename to Sources/Extensions/Alamofire/AlamofireManager+Extensions.swift index 5d6d3226..fa741fbc 100644 --- a/LeadKit/Sources/Extensions/Alamofire/AlamofireManager+Extensions.swift +++ b/Sources/Extensions/Alamofire/AlamofireManager+Extensions.swift @@ -45,7 +45,7 @@ public extension Reactive where Base: Alamofire.SessionManager { /// - Parameter mappingQueue: The dispatch queue to use for mapping /// - Returns: Observable with HTTP URL Response and target object func responseModel(requestParameters: ApiRequestParameters, - mappingQueue: DispatchQueue = DispatchQueue.global()) + mappingQueue: DispatchQueue = .global()) -> Observable<(response: HTTPURLResponse, model: T)> { return apiRequest(requestParameters: requestParameters) @@ -58,7 +58,7 @@ public extension Reactive where Base: Alamofire.SessionManager { /// - Parameter mappingQueue: The dispatch queue to use for mapping /// - Returns: Observable with HTTP URL Response and array of target objects func responseModel(requestParameters: ApiRequestParameters, - mappingQueue: DispatchQueue = DispatchQueue.global()) + mappingQueue: DispatchQueue = .global()) -> Observable<(response: HTTPURLResponse, models: [T])> { return apiRequest(requestParameters: requestParameters) @@ -71,11 +71,11 @@ public extension Reactive where Base: Alamofire.SessionManager { /// - Parameter mappingQueue: The dispatch queue to use for mapping /// - Returns: Observable with HTTP URL Response and target object func responseObservableModel(requestParameters: ApiRequestParameters, - mappingQueue: DispatchQueue = DispatchQueue.global()) + mappingQueue: DispatchQueue = .global()) -> Observable<(response: HTTPURLResponse, model: T)> where T.ModelType == T { return apiRequest(requestParameters: requestParameters) - .flatMap { $0.validate().rx.apiResponse(mappingQueue: mappingQueue) } + .flatMap { $0.validate().rx.observableApiResponse(mappingQueue: mappingQueue) } } /// Method which executes request and serializes response into array of target objects @@ -84,11 +84,11 @@ public extension Reactive where Base: Alamofire.SessionManager { /// - Parameter mappingQueue: The dispatch queue to use for mapping /// - Returns: Observable with HTTP URL Response and array of target objects func responseObservableModel(requestParameters: ApiRequestParameters, - mappingQueue: DispatchQueue = DispatchQueue.global()) + mappingQueue: DispatchQueue = .global()) -> Observable<(response: HTTPURLResponse, models: [T])> where T.ModelType == T { return apiRequest(requestParameters: requestParameters) - .flatMap { $0.validate().rx.apiResponse(mappingQueue: mappingQueue) } + .flatMap { $0.validate().rx.observableApiResponse(mappingQueue: mappingQueue) } } } diff --git a/LeadKit/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift b/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift similarity index 95% rename from LeadKit/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift rename to Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift index 3c3f8407..88416dfa 100644 --- a/LeadKit/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift +++ b/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift @@ -61,7 +61,7 @@ public extension Reactive where Base: DataRequest { /// /// - Parameter mappingQueue: The dispatch queue to use for mapping /// - Returns: Observable with HTTP URL Response and target object - func apiResponse(mappingQueue: DispatchQueue = .global()) + func observableApiResponse(mappingQueue: DispatchQueue = .global()) -> Observable<(response: HTTPURLResponse, model: T)> where T.ModelType == T { return responseJSONOnQueue(mappingQueue) @@ -77,7 +77,7 @@ public extension Reactive where Base: DataRequest { /// /// - Parameter mappingQueue: The dispatch queue to use for mapping /// - Returns: Observable with HTTP URL Response and array of target objects - func apiResponse(mappingQueue: DispatchQueue = .global()) + func observableApiResponse(mappingQueue: DispatchQueue = .global()) -> Observable<(response: HTTPURLResponse, models: [T])> where T.ModelType == T { return responseJSONOnQueue(mappingQueue) diff --git a/LeadKit/Sources/Extensions/Array/Array+Extensions.swift b/Sources/Extensions/Array/Array+Extensions.swift similarity index 100% rename from LeadKit/Sources/Extensions/Array/Array+Extensions.swift rename to Sources/Extensions/Array/Array+Extensions.swift diff --git a/LeadKit/Sources/Extensions/CABasicAnimation/CABasicAnimation+Rotation.swift b/Sources/Extensions/CABasicAnimation/CABasicAnimation+Rotation.swift similarity index 100% rename from LeadKit/Sources/Extensions/CABasicAnimation/CABasicAnimation+Rotation.swift rename to Sources/Extensions/CABasicAnimation/CABasicAnimation+Rotation.swift diff --git a/LeadKit/Sources/Extensions/CGContext/CGContext+Initializers.swift b/Sources/Extensions/CGContext/CGContext+Initializers.swift similarity index 100% rename from LeadKit/Sources/Extensions/CGContext/CGContext+Initializers.swift rename to Sources/Extensions/CGContext/CGContext+Initializers.swift diff --git a/LeadKit/Sources/Extensions/CGFloat/CGFloat+Pixels.swift b/Sources/Extensions/CGFloat/CGFloat+Pixels.swift similarity index 100% rename from LeadKit/Sources/Extensions/CGFloat/CGFloat+Pixels.swift rename to Sources/Extensions/CGFloat/CGFloat+Pixels.swift diff --git a/LeadKit/Sources/Extensions/CGImage/CGImage+Alpha.swift b/Sources/Extensions/CGImage/CGImage+Alpha.swift similarity index 100% rename from LeadKit/Sources/Extensions/CGImage/CGImage+Alpha.swift rename to Sources/Extensions/CGImage/CGImage+Alpha.swift diff --git a/LeadKit/Sources/Extensions/CGImage/CGImage+Crop.swift b/Sources/Extensions/CGImage/CGImage+Crop.swift similarity index 100% rename from LeadKit/Sources/Extensions/CGImage/CGImage+Crop.swift rename to Sources/Extensions/CGImage/CGImage+Crop.swift diff --git a/LeadKit/Sources/Extensions/CGSize/CGSize+CGContextSize.swift b/Sources/Extensions/CGSize/CGSize+CGContextSize.swift similarity index 100% rename from LeadKit/Sources/Extensions/CGSize/CGSize+CGContextSize.swift rename to Sources/Extensions/CGSize/CGSize+CGContextSize.swift diff --git a/LeadKit/Sources/Extensions/CGSize/CGSize+Resize.swift b/Sources/Extensions/CGSize/CGSize+Resize.swift similarity index 100% rename from LeadKit/Sources/Extensions/CGSize/CGSize+Resize.swift rename to Sources/Extensions/CGSize/CGSize+Resize.swift diff --git a/LeadKit/Sources/Extensions/CursorType/CursorType+Slice.swift b/Sources/Extensions/CursorType/CursorType+Slice.swift similarity index 100% rename from LeadKit/Sources/Extensions/CursorType/CursorType+Slice.swift rename to Sources/Extensions/CursorType/CursorType+Slice.swift diff --git a/LeadKit/Sources/Extensions/Double/Double+Rounding.swift b/Sources/Extensions/Double/Double+Rounding.swift similarity index 100% rename from LeadKit/Sources/Extensions/Double/Double+Rounding.swift rename to Sources/Extensions/Double/Double+Rounding.swift diff --git a/LeadKit/Sources/Extensions/IndexPath/IndexPath+ImmutableIndexPath.swift b/Sources/Extensions/IndexPath/IndexPath+ImmutableIndexPath.swift similarity index 100% rename from LeadKit/Sources/Extensions/IndexPath/IndexPath+ImmutableIndexPath.swift rename to Sources/Extensions/IndexPath/IndexPath+ImmutableIndexPath.swift diff --git a/LeadKit/Sources/Extensions/NetworkService/NetworkService+ActivityIndicator.swift b/Sources/Extensions/NetworkService/NetworkService+ActivityIndicator.swift similarity index 100% rename from LeadKit/Sources/Extensions/NetworkService/NetworkService+ActivityIndicator.swift rename to Sources/Extensions/NetworkService/NetworkService+ActivityIndicator.swift diff --git a/LeadKit/Sources/Extensions/NetworkService/NetworkService+RxLoadImage.swift b/Sources/Extensions/NetworkService/NetworkService+RxLoadImage.swift similarity index 100% rename from LeadKit/Sources/Extensions/NetworkService/NetworkService+RxLoadImage.swift rename to Sources/Extensions/NetworkService/NetworkService+RxLoadImage.swift diff --git a/LeadKit/Sources/Extensions/ObjectMapper/ImmutableMappable+ObservableMappable.swift b/Sources/Extensions/ObjectMapper/ImmutableMappable+ObservableMappable.swift similarity index 100% rename from LeadKit/Sources/Extensions/ObjectMapper/ImmutableMappable+ObservableMappable.swift rename to Sources/Extensions/ObjectMapper/ImmutableMappable+ObservableMappable.swift diff --git a/LeadKit/Sources/Extensions/Observable/Observable+DeferredJust.swift b/Sources/Extensions/Observable/Observable+DeferredJust.swift similarity index 100% rename from LeadKit/Sources/Extensions/Observable/Observable+DeferredJust.swift rename to Sources/Extensions/Observable/Observable+DeferredJust.swift diff --git a/LeadKit/Sources/Extensions/PaginationTableViewWrapperDelegate/PaginationTableViewWrapperDelegate+DefaultImplementation.swift b/Sources/Extensions/PaginationTableViewWrapperDelegate/PaginationTableViewWrapperDelegate+DefaultImplementation.swift similarity index 100% rename from LeadKit/Sources/Extensions/PaginationTableViewWrapperDelegate/PaginationTableViewWrapperDelegate+DefaultImplementation.swift rename to Sources/Extensions/PaginationTableViewWrapperDelegate/PaginationTableViewWrapperDelegate+DefaultImplementation.swift diff --git a/LeadKit/Sources/Extensions/Sequence/Sequence+ConcurrentMap.swift b/Sources/Extensions/Sequence/Sequence+ConcurrentMap.swift similarity index 100% rename from LeadKit/Sources/Extensions/Sequence/Sequence+ConcurrentMap.swift rename to Sources/Extensions/Sequence/Sequence+ConcurrentMap.swift diff --git a/LeadKit/Sources/Extensions/StoryboardProtocol/StoryboardProtocol+DefaultBundle.swift b/Sources/Extensions/StoryboardProtocol/StoryboardProtocol+DefaultBundle.swift similarity index 100% rename from LeadKit/Sources/Extensions/StoryboardProtocol/StoryboardProtocol+DefaultBundle.swift rename to Sources/Extensions/StoryboardProtocol/StoryboardProtocol+DefaultBundle.swift diff --git a/LeadKit/Sources/Extensions/StoryboardProtocol/StoryboardProtocol+Extensions.swift b/Sources/Extensions/StoryboardProtocol/StoryboardProtocol+Extensions.swift similarity index 100% rename from LeadKit/Sources/Extensions/StoryboardProtocol/StoryboardProtocol+Extensions.swift rename to Sources/Extensions/StoryboardProtocol/StoryboardProtocol+Extensions.swift diff --git a/LeadKit/Sources/Extensions/String/String+Extensions.swift b/Sources/Extensions/String/String+Extensions.swift similarity index 100% rename from LeadKit/Sources/Extensions/String/String+Extensions.swift rename to Sources/Extensions/String/String+Extensions.swift diff --git a/LeadKit/Sources/Extensions/String/String+Localization.swift b/Sources/Extensions/String/String+Localization.swift similarity index 100% rename from LeadKit/Sources/Extensions/String/String+Localization.swift rename to Sources/Extensions/String/String+Localization.swift diff --git a/LeadKit/Sources/Extensions/String/String+SizeCalculation.swift b/Sources/Extensions/String/String+SizeCalculation.swift similarity index 100% rename from LeadKit/Sources/Extensions/String/String+SizeCalculation.swift rename to Sources/Extensions/String/String+SizeCalculation.swift diff --git a/LeadKit/Sources/Extensions/Support/UIScrollView+Support.swift b/Sources/Extensions/Support/UIScrollView+Support.swift similarity index 100% rename from LeadKit/Sources/Extensions/Support/UIScrollView+Support.swift rename to Sources/Extensions/Support/UIScrollView+Support.swift diff --git a/LeadKit/Sources/Extensions/TableDirector/TableDirector+Extensions.swift b/Sources/Extensions/TableDirector/TableDirector+Extensions.swift similarity index 100% rename from LeadKit/Sources/Extensions/TableDirector/TableDirector+Extensions.swift rename to Sources/Extensions/TableDirector/TableDirector+Extensions.swift diff --git a/LeadKit/Sources/Extensions/TimeInterval/TimeInterval+DateComponents.swift b/Sources/Extensions/TimeInterval/TimeInterval+DateComponents.swift similarity index 100% rename from LeadKit/Sources/Extensions/TimeInterval/TimeInterval+DateComponents.swift rename to Sources/Extensions/TimeInterval/TimeInterval+DateComponents.swift diff --git a/LeadKit/Sources/Extensions/UIActivityIndicatorView/UIActivityIndicatorView+LoadingIndicator.swift b/Sources/Extensions/UIActivityIndicatorView/UIActivityIndicatorView+LoadingIndicator.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIActivityIndicatorView/UIActivityIndicatorView+LoadingIndicator.swift rename to Sources/Extensions/UIActivityIndicatorView/UIActivityIndicatorView+LoadingIndicator.swift diff --git a/LeadKit/Sources/Extensions/UIAlertController/UIAlertController+Extensions.swift b/Sources/Extensions/UIAlertController/UIAlertController+Extensions.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIAlertController/UIAlertController+Extensions.swift rename to Sources/Extensions/UIAlertController/UIAlertController+Extensions.swift diff --git a/LeadKit/Sources/Extensions/UICollectionView/UICollectionView+CellRegistration.swift b/Sources/Extensions/UICollectionView/UICollectionView+CellRegistration.swift similarity index 100% rename from LeadKit/Sources/Extensions/UICollectionView/UICollectionView+CellRegistration.swift rename to Sources/Extensions/UICollectionView/UICollectionView+CellRegistration.swift diff --git a/LeadKit/Sources/Extensions/UIColor/UIColor+Hex.swift b/Sources/Extensions/UIColor/UIColor+Hex.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIColor/UIColor+Hex.swift rename to Sources/Extensions/UIColor/UIColor+Hex.swift diff --git a/LeadKit/Sources/Extensions/UIDevice/UIDevice+Extensions.swift b/Sources/Extensions/UIDevice/UIDevice+Extensions.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIDevice/UIDevice+Extensions.swift rename to Sources/Extensions/UIDevice/UIDevice+Extensions.swift diff --git a/LeadKit/Sources/Extensions/UIImage/UIImage+Extensions.swift b/Sources/Extensions/UIImage/UIImage+Extensions.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIImage/UIImage+Extensions.swift rename to Sources/Extensions/UIImage/UIImage+Extensions.swift diff --git a/LeadKit/Sources/Extensions/UIImage/UIImage+Spinner.swift b/Sources/Extensions/UIImage/UIImage+Spinner.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIImage/UIImage+Spinner.swift rename to Sources/Extensions/UIImage/UIImage+Spinner.swift diff --git a/LeadKit/Sources/Extensions/UIImage/UIImage+SupportExtensions.swift b/Sources/Extensions/UIImage/UIImage+SupportExtensions.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIImage/UIImage+SupportExtensions.swift rename to Sources/Extensions/UIImage/UIImage+SupportExtensions.swift diff --git a/LeadKit/Sources/Extensions/UIStoryboard/UIStoryboard+InstantiateViewController.swift b/Sources/Extensions/UIStoryboard/UIStoryboard+InstantiateViewController.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIStoryboard/UIStoryboard+InstantiateViewController.swift rename to Sources/Extensions/UIStoryboard/UIStoryboard+InstantiateViewController.swift diff --git a/LeadKit/Sources/Extensions/UIView/UIView+DefaultReuseIdentifier.swift b/Sources/Extensions/UIView/UIView+DefaultReuseIdentifier.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIView/UIView+DefaultReuseIdentifier.swift rename to Sources/Extensions/UIView/UIView+DefaultReuseIdentifier.swift diff --git a/LeadKit/Sources/Extensions/UIView/UIView+DefaultXibName.swift b/Sources/Extensions/UIView/UIView+DefaultXibName.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIView/UIView+DefaultXibName.swift rename to Sources/Extensions/UIView/UIView+DefaultXibName.swift diff --git a/LeadKit/Sources/Extensions/UIView/UIView+Layout.swift b/Sources/Extensions/UIView/UIView+Layout.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIView/UIView+Layout.swift rename to Sources/Extensions/UIView/UIView+Layout.swift diff --git a/LeadKit/Sources/Extensions/UIView/UIView+LoadFromNib.swift b/Sources/Extensions/UIView/UIView+LoadFromNib.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIView/UIView+LoadFromNib.swift rename to Sources/Extensions/UIView/UIView+LoadFromNib.swift diff --git a/LeadKit/Sources/Extensions/UIView/UIView+LoadingIndicator.swift b/Sources/Extensions/UIView/UIView+LoadingIndicator.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIView/UIView+LoadingIndicator.swift rename to Sources/Extensions/UIView/UIView+LoadingIndicator.swift diff --git a/LeadKit/Sources/Extensions/UIView/UIView+Rotation.swift b/Sources/Extensions/UIView/UIView+Rotation.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIView/UIView+Rotation.swift rename to Sources/Extensions/UIView/UIView+Rotation.swift diff --git a/LeadKit/Sources/Extensions/UIViewController/UIViewController+ConfigurableController.swift b/Sources/Extensions/UIViewController/UIViewController+ConfigurableController.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIViewController/UIViewController+ConfigurableController.swift rename to Sources/Extensions/UIViewController/UIViewController+ConfigurableController.swift diff --git a/LeadKit/Sources/Extensions/UIViewController/UIViewController+DefaultStoryboardIdentifier.swift b/Sources/Extensions/UIViewController/UIViewController+DefaultStoryboardIdentifier.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIViewController/UIViewController+DefaultStoryboardIdentifier.swift rename to Sources/Extensions/UIViewController/UIViewController+DefaultStoryboardIdentifier.swift diff --git a/LeadKit/Sources/Extensions/UIViewController/UIViewController+DefaultXibName.swift b/Sources/Extensions/UIViewController/UIViewController+DefaultXibName.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIViewController/UIViewController+DefaultXibName.swift rename to Sources/Extensions/UIViewController/UIViewController+DefaultXibName.swift diff --git a/LeadKit/Sources/Extensions/UIViewController/UIViewController+TopVisibleViewController.swift b/Sources/Extensions/UIViewController/UIViewController+TopVisibleViewController.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIViewController/UIViewController+TopVisibleViewController.swift rename to Sources/Extensions/UIViewController/UIViewController+TopVisibleViewController.swift diff --git a/LeadKit/Sources/Extensions/UIWindow/UIWindow+Extensions.swift b/Sources/Extensions/UIWindow/UIWindow+Extensions.swift similarity index 100% rename from LeadKit/Sources/Extensions/UIWindow/UIWindow+Extensions.swift rename to Sources/Extensions/UIWindow/UIWindow+Extensions.swift diff --git a/LeadKit/Sources/Extensions/UserDefaults/UserDefaults+MappableDataTypes.swift b/Sources/Extensions/UserDefaults/UserDefaults+MappableDataTypes.swift similarity index 100% rename from LeadKit/Sources/Extensions/UserDefaults/UserDefaults+MappableDataTypes.swift rename to Sources/Extensions/UserDefaults/UserDefaults+MappableDataTypes.swift diff --git a/LeadKit/Sources/Functions/Any+Cast.swift b/Sources/Functions/Any+Cast.swift similarity index 100% rename from LeadKit/Sources/Functions/Any+Cast.swift rename to Sources/Functions/Any+Cast.swift diff --git a/LeadKit/Sources/Functions/Any+TypeName.swift b/Sources/Functions/Any+TypeName.swift similarity index 100% rename from LeadKit/Sources/Functions/Any+TypeName.swift rename to Sources/Functions/Any+TypeName.swift diff --git a/LeadKit/Sources/Info-iOS-Extensions.plist b/Sources/Info-iOS-Extensions.plist similarity index 100% rename from LeadKit/Sources/Info-iOS-Extensions.plist rename to Sources/Info-iOS-Extensions.plist diff --git a/LeadKit/Sources/Info-iOS.plist b/Sources/Info-iOS.plist similarity index 100% rename from LeadKit/Sources/Info-iOS.plist rename to Sources/Info-iOS.plist diff --git a/LeadKit/Sources/Info-tvOS.plist b/Sources/Info-tvOS.plist similarity index 100% rename from LeadKit/Sources/Info-tvOS.plist rename to Sources/Info-tvOS.plist diff --git a/LeadKit/Sources/Info-watchOS.plist b/Sources/Info-watchOS.plist similarity index 100% rename from LeadKit/Sources/Info-watchOS.plist rename to Sources/Info-watchOS.plist diff --git a/LeadKit/Sources/LeadKit.h b/Sources/LeadKit.h similarity index 100% rename from LeadKit/Sources/LeadKit.h rename to Sources/LeadKit.h diff --git a/LeadKit/Sources/Protocols/AlertRepresentable.swift b/Sources/Protocols/AlertRepresentable.swift similarity index 100% rename from LeadKit/Sources/Protocols/AlertRepresentable.swift rename to Sources/Protocols/AlertRepresentable.swift diff --git a/LeadKit/Sources/Protocols/Animatable.swift b/Sources/Protocols/Animatable.swift similarity index 100% rename from LeadKit/Sources/Protocols/Animatable.swift rename to Sources/Protocols/Animatable.swift diff --git a/LeadKit/Sources/Protocols/BaseViewModel.swift b/Sources/Protocols/BaseViewModel.swift similarity index 100% rename from LeadKit/Sources/Protocols/BaseViewModel.swift rename to Sources/Protocols/BaseViewModel.swift diff --git a/LeadKit/Sources/Protocols/ConfigurableController.swift b/Sources/Protocols/ConfigurableController.swift similarity index 100% rename from LeadKit/Sources/Protocols/ConfigurableController.swift rename to Sources/Protocols/ConfigurableController.swift diff --git a/LeadKit/Sources/Protocols/CursorType.swift b/Sources/Protocols/CursorType.swift similarity index 100% rename from LeadKit/Sources/Protocols/CursorType.swift rename to Sources/Protocols/CursorType.swift diff --git a/LeadKit/Sources/Protocols/DrawingOperation.swift b/Sources/Protocols/DrawingOperation.swift similarity index 100% rename from LeadKit/Sources/Protocols/DrawingOperation.swift rename to Sources/Protocols/DrawingOperation.swift diff --git a/LeadKit/Sources/Protocols/EstimatedViewHeightProtocol.swift b/Sources/Protocols/EstimatedViewHeightProtocol.swift similarity index 100% rename from LeadKit/Sources/Protocols/EstimatedViewHeightProtocol.swift rename to Sources/Protocols/EstimatedViewHeightProtocol.swift diff --git a/LeadKit/Sources/Protocols/LoadingIndicator.swift b/Sources/Protocols/LoadingIndicator.swift similarity index 100% rename from LeadKit/Sources/Protocols/LoadingIndicator.swift rename to Sources/Protocols/LoadingIndicator.swift diff --git a/LeadKit/Sources/Protocols/ModuleConfigurator.swift b/Sources/Protocols/ModuleConfigurator.swift similarity index 100% rename from LeadKit/Sources/Protocols/ModuleConfigurator.swift rename to Sources/Protocols/ModuleConfigurator.swift diff --git a/LeadKit/Sources/Protocols/ObservableMappable.swift b/Sources/Protocols/ObservableMappable.swift similarity index 100% rename from LeadKit/Sources/Protocols/ObservableMappable.swift rename to Sources/Protocols/ObservableMappable.swift diff --git a/LeadKit/Sources/Protocols/ResettableType.swift b/Sources/Protocols/ResettableType.swift similarity index 100% rename from LeadKit/Sources/Protocols/ResettableType.swift rename to Sources/Protocols/ResettableType.swift diff --git a/LeadKit/Sources/Protocols/ReuseIdentifierProtocol.swift b/Sources/Protocols/ReuseIdentifierProtocol.swift similarity index 100% rename from LeadKit/Sources/Protocols/ReuseIdentifierProtocol.swift rename to Sources/Protocols/ReuseIdentifierProtocol.swift diff --git a/LeadKit/Sources/Protocols/StaticEstimatedViewHeightProtocol.swift b/Sources/Protocols/StaticEstimatedViewHeightProtocol.swift similarity index 100% rename from LeadKit/Sources/Protocols/StaticEstimatedViewHeightProtocol.swift rename to Sources/Protocols/StaticEstimatedViewHeightProtocol.swift diff --git a/LeadKit/Sources/Protocols/StaticViewHeightProtocol.swift b/Sources/Protocols/StaticViewHeightProtocol.swift similarity index 100% rename from LeadKit/Sources/Protocols/StaticViewHeightProtocol.swift rename to Sources/Protocols/StaticViewHeightProtocol.swift diff --git a/LeadKit/Sources/Protocols/StoryboardIdentifierProtocol.swift b/Sources/Protocols/StoryboardIdentifierProtocol.swift similarity index 100% rename from LeadKit/Sources/Protocols/StoryboardIdentifierProtocol.swift rename to Sources/Protocols/StoryboardIdentifierProtocol.swift diff --git a/LeadKit/Sources/Protocols/StoryboardProtocol.swift b/Sources/Protocols/StoryboardProtocol.swift similarity index 100% rename from LeadKit/Sources/Protocols/StoryboardProtocol.swift rename to Sources/Protocols/StoryboardProtocol.swift diff --git a/LeadKit/Sources/Protocols/SupportProtocol.swift b/Sources/Protocols/SupportProtocol.swift similarity index 100% rename from LeadKit/Sources/Protocols/SupportProtocol.swift rename to Sources/Protocols/SupportProtocol.swift diff --git a/LeadKit/Sources/Protocols/ViewHeightProtocol.swift b/Sources/Protocols/ViewHeightProtocol.swift similarity index 100% rename from LeadKit/Sources/Protocols/ViewHeightProtocol.swift rename to Sources/Protocols/ViewHeightProtocol.swift diff --git a/LeadKit/Sources/Protocols/ViewModelProtocol.swift b/Sources/Protocols/ViewModelProtocol.swift similarity index 100% rename from LeadKit/Sources/Protocols/ViewModelProtocol.swift rename to Sources/Protocols/ViewModelProtocol.swift diff --git a/LeadKit/Sources/Protocols/XibNameProtocol.swift b/Sources/Protocols/XibNameProtocol.swift similarity index 100% rename from LeadKit/Sources/Protocols/XibNameProtocol.swift rename to Sources/Protocols/XibNameProtocol.swift diff --git a/LeadKit/Sources/Structures/Api/ApiRequestParameters.swift b/Sources/Structures/Api/ApiRequestParameters.swift similarity index 100% rename from LeadKit/Sources/Structures/Api/ApiRequestParameters.swift rename to Sources/Structures/Api/ApiRequestParameters.swift diff --git a/LeadKit/Sources/Structures/DrawingOperations/BorderDrawingOperation.swift b/Sources/Structures/DrawingOperations/BorderDrawingOperation.swift similarity index 100% rename from LeadKit/Sources/Structures/DrawingOperations/BorderDrawingOperation.swift rename to Sources/Structures/DrawingOperations/BorderDrawingOperation.swift diff --git a/LeadKit/Sources/Structures/DrawingOperations/CALayerDrawingOperation.swift b/Sources/Structures/DrawingOperations/CALayerDrawingOperation.swift similarity index 100% rename from LeadKit/Sources/Structures/DrawingOperations/CALayerDrawingOperation.swift rename to Sources/Structures/DrawingOperations/CALayerDrawingOperation.swift diff --git a/LeadKit/Sources/Structures/DrawingOperations/ImageDrawingOperation.swift b/Sources/Structures/DrawingOperations/ImageDrawingOperation.swift similarity index 100% rename from LeadKit/Sources/Structures/DrawingOperations/ImageDrawingOperation.swift rename to Sources/Structures/DrawingOperations/ImageDrawingOperation.swift diff --git a/LeadKit/Sources/Structures/DrawingOperations/PaddingDrawingOperation.swift b/Sources/Structures/DrawingOperations/PaddingDrawingOperation.swift similarity index 100% rename from LeadKit/Sources/Structures/DrawingOperations/PaddingDrawingOperation.swift rename to Sources/Structures/DrawingOperations/PaddingDrawingOperation.swift diff --git a/LeadKit/Sources/Structures/DrawingOperations/ResizeDrawingOperation.swift b/Sources/Structures/DrawingOperations/ResizeDrawingOperation.swift similarity index 100% rename from LeadKit/Sources/Structures/DrawingOperations/ResizeDrawingOperation.swift rename to Sources/Structures/DrawingOperations/ResizeDrawingOperation.swift diff --git a/LeadKit/Sources/Structures/DrawingOperations/RoundDrawingOperation.swift b/Sources/Structures/DrawingOperations/RoundDrawingOperation.swift similarity index 100% rename from LeadKit/Sources/Structures/DrawingOperations/RoundDrawingOperation.swift rename to Sources/Structures/DrawingOperations/RoundDrawingOperation.swift diff --git a/LeadKit/Sources/Structures/DrawingOperations/SolidFillDrawingOperation.swift b/Sources/Structures/DrawingOperations/SolidFillDrawingOperation.swift similarity index 100% rename from LeadKit/Sources/Structures/DrawingOperations/SolidFillDrawingOperation.swift rename to Sources/Structures/DrawingOperations/SolidFillDrawingOperation.swift diff --git a/LeadKit/Sources/Structures/DrawingOperations/TemplateDrawingOperation.swift b/Sources/Structures/DrawingOperations/TemplateDrawingOperation.swift similarity index 100% rename from LeadKit/Sources/Structures/DrawingOperations/TemplateDrawingOperation.swift rename to Sources/Structures/DrawingOperations/TemplateDrawingOperation.swift diff --git a/LeadKit/Sources/Structures/Views/AnyLoadingIndicator.swift b/Sources/Structures/Views/AnyLoadingIndicator.swift similarity index 100% rename from LeadKit/Sources/Structures/Views/AnyLoadingIndicator.swift rename to Sources/Structures/Views/AnyLoadingIndicator.swift diff --git a/LeadKit/Tests/CursorTests.swift b/Tests/CursorTests.swift similarity index 100% rename from LeadKit/Tests/CursorTests.swift rename to Tests/CursorTests.swift diff --git a/LeadKit/Tests/Cursors/StubCursor.swift b/Tests/Cursors/StubCursor.swift similarity index 100% rename from LeadKit/Tests/Cursors/StubCursor.swift rename to Tests/Cursors/StubCursor.swift diff --git a/LeadKit/Tests/Info-iOS-Extensions.plist b/Tests/Info-iOS-Extensions.plist similarity index 100% rename from LeadKit/Tests/Info-iOS-Extensions.plist rename to Tests/Info-iOS-Extensions.plist diff --git a/LeadKit/Tests/Info-iOS.plist b/Tests/Info-iOS.plist similarity index 100% rename from LeadKit/Tests/Info-iOS.plist rename to Tests/Info-iOS.plist diff --git a/LeadKit/Tests/Info-tvOS.plist b/Tests/Info-tvOS.plist similarity index 100% rename from LeadKit/Tests/Info-tvOS.plist rename to Tests/Info-tvOS.plist diff --git a/LeadKit/Tests/LoadFromNibTests.swift b/Tests/LoadFromNibTests.swift similarity index 94% rename from LeadKit/Tests/LoadFromNibTests.swift rename to Tests/LoadFromNibTests.swift index 5634ad16..026645f0 100644 --- a/LeadKit/Tests/LoadFromNibTests.swift +++ b/Tests/LoadFromNibTests.swift @@ -38,7 +38,7 @@ class LoadFromNibTests: XCTestCase { /// Note: bundle is required in tests, but not in regular use func testLoadFromNib() { - let testView: TestView = TestView.loadFromNib(bundle: LoadFromNibTests.bundle) + let testView = TestView.loadFromNib(bundle: LoadFromNibTests.bundle) as TestView testView.text = LoadFromNibTests.testText diff --git a/LeadKit/Tests/MappableUserDefaultsTests.swift b/Tests/MappableUserDefaultsTests.swift similarity index 100% rename from LeadKit/Tests/MappableUserDefaultsTests.swift rename to Tests/MappableUserDefaultsTests.swift diff --git a/LeadKit/Tests/Models/Post.swift b/Tests/Models/Post.swift similarity index 100% rename from LeadKit/Tests/Models/Post.swift rename to Tests/Models/Post.swift diff --git a/LeadKit/Tests/PaginationViewModelTests.swift b/Tests/PaginationViewModelTests.swift similarity index 93% rename from LeadKit/Tests/PaginationViewModelTests.swift rename to Tests/PaginationViewModelTests.swift index 23949ef9..cf5edb80 100644 --- a/LeadKit/Tests/PaginationViewModelTests.swift +++ b/Tests/PaginationViewModelTests.swift @@ -23,6 +23,7 @@ import XCTest import LeadKit import RxSwift +import CocoaLumberjack class PaginationViewModelTests: XCTestCase { @@ -45,9 +46,9 @@ class PaginationViewModelTests: XCTestCase { viewModel.state.drive(onNext: { state in switch state { case .initial, .loadingMore, .loading: - print("PageViewModel state changed to \(state)") + DDLogDebug("PageViewModel state changed to \(state)") case .results(let newItems, _, _): - print(newItems.count) + XCTAssertEqual(newItems.count, 4) paginationExpectation.fulfill() default: XCTFail("Unexpected state: \(state)") diff --git a/LeadKit/Tests/Views/TestView.swift b/Tests/Views/TestView.swift similarity index 100% rename from LeadKit/Tests/Views/TestView.swift rename to Tests/Views/TestView.swift diff --git a/LeadKit/Tests/Views/TestView.xib b/Tests/Views/TestView.xib similarity index 100% rename from LeadKit/Tests/Views/TestView.xib rename to Tests/Views/TestView.xib diff --git a/code-quality b/code-quality new file mode 160000 index 00000000..6c4341ec --- /dev/null +++ b/code-quality @@ -0,0 +1 @@ +Subproject commit 6c4341ecc2c9ef071370d621afa210ce819934d4 diff --git a/cpd_script.php b/cpd_script.php new file mode 120000 index 00000000..120866ca --- /dev/null +++ b/cpd_script.php @@ -0,0 +1 @@ +code-quality/cpd_script.php \ No newline at end of file diff --git a/LeadKit/iOS.playground/Contents.swift b/iOS.playground/Contents.swift similarity index 100% rename from LeadKit/iOS.playground/Contents.swift rename to iOS.playground/Contents.swift diff --git a/LeadKit/iOS.playground/contents.xcplayground b/iOS.playground/contents.xcplayground similarity index 100% rename from LeadKit/iOS.playground/contents.xcplayground rename to iOS.playground/contents.xcplayground