Merge pull request #37 from Karumi/appkit-support

Appkit support
Karumi · Apr 4, 2016 · 7422cd9 · 7422cd9
2 parents 2052d2f + 4a036c5
commit 7422cd9
Show file tree

Hide file tree

Showing 36 changed files with 1,939 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.1
+osx_image: xcode7.2
 
 env:
   - SCHEME="BothamUIProject"
@@ -9,10 +9,8 @@ before_install:
   - brew install swiftlint
   - gem install xcpretty
   - gem install cocoapods
-
-install:
-  - pod install
+  - gem install xcpretty-travis-formatter
 
 script:
   - swiftlint
-  - set -o pipefail && xcodebuild -workspace BothamUI.xcworkspace -scheme "$SCHEME" -destination 'platform=iOS Simulator,name=iPhone 6s Plus' build test CODE_SIGN_IDENTITY=- | xcpretty -c
+  - set -o pipefail && xcodebuild -workspace BothamUI.xcworkspace -scheme "$SCHEME" -destination 'platform=iOS Simulator,name=iPhone 6s Plus' build test CODE_SIGN_IDENTITY=- | xcpretty -f `xcpretty-travis-formatter`
diff --git a/BothamUI.xcodeproj/project.pbxproj b/BothamUI.xcodeproj/project.pbxproj
diff --git a/BothamUI.xcodeproj/xcshareddata/xcschemes/BothamUICocoa.xcscheme b/BothamUI.xcodeproj/xcshareddata/xcschemes/BothamUICocoa.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0720"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6B2902521C6DE3300072E04D"
+               BuildableName = "BothamUICocoa.framework"
+               BlueprintName = "BothamUICocoa"
+               ReferencedContainer = "container:BothamUI.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6B29025B1C6DE3300072E04D"
+               BuildableName = "BothamUICocoaTests.xctest"
+               BlueprintName = "BothamUICocoaTests"
+               ReferencedContainer = "container:BothamUI.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6B2902521C6DE3300072E04D"
+            BuildableName = "BothamUICocoa.framework"
+            BlueprintName = "BothamUICocoa"
+            ReferencedContainer = "container:BothamUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6B2902521C6DE3300072E04D"
+            BuildableName = "BothamUICocoa.framework"
+            BlueprintName = "BothamUICocoa"
+            ReferencedContainer = "container:BothamUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6B2902521C6DE3300072E04D"
+            BuildableName = "BothamUICocoa.framework"
+            BlueprintName = "BothamUICocoa"
+            ReferencedContainer = "container:BothamUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/BothamUI.xcworkspace/contents.xcworkspacedata b/BothamUI.xcworkspace/contents.xcworkspacedata
diff --git a/BothamUICocoa/BothamUICocoa.h b/BothamUICocoa/BothamUICocoa.h
@@ -0,0 +1,19 @@
+//
+//  BothamUICocoa.h
+//  BothamUICocoa
+//
+//  Created by Davide Mendolia on 12/02/16.
+//  Copyright © 2016 GoKarumi S.L. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+//! Project version number for BothamUICocoa.
+FOUNDATION_EXPORT double BothamUICocoaVersionNumber;
+
+//! Project version string for BothamUICocoa.
+FOUNDATION_EXPORT const unsigned char BothamUICocoaVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <BothamUICocoa/PublicHeader.h>
+
+
diff --git a/BothamUICocoa/Info.plist b/BothamUICocoa/Info.plist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 GoKarumi S.L. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/BothamUICocoaTests/Info.plist b/BothamUICocoaTests/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Example/Example/CharacterTableViewCell.swift b/Example/Example/CharacterTableViewCell.swift
@@ -29,8 +29,8 @@ class CharacterTableViewCell: UITableViewCell, BothamViewCell {
         let gradient: CAGradientLayer = CAGradientLayer(layer: thumbnailImage.layer)
         gradient.frame = thumbnailImage.bounds
         gradient.colors = [UIColor.gradientStartColor.CGColor, UIColor.gradientEndColor.CGColor]
-        gradient.startPoint = CGPointMake(0.0, 0.6)
-        gradient.endPoint = CGPointMake(0.0, 1.0)
+        gradient.startPoint = CGPoint(x: 0.0, y: 0.6)
+        gradient.endPoint = CGPoint(x: 0.0, y: 1.0)
         thumbnailImage.layer.insertSublayer(gradient, atIndex: 0)
     }
 

diff --git a/Example/Example/CharactersViewController.swift b/Example/Example/CharactersViewController.swift
@@ -11,7 +11,7 @@ import UIKit
 import BothamUI
 
 class CharactersViewController: ExampleViewController, BothamTableViewController, CharactersUI {
-    
+
     @IBOutlet var tableView: UITableView!
     var dataSource: BothamTableViewDataSource<Character, CharacterTableViewCell>!
     var delegate: UITableViewDelegate!
@@ -24,4 +24,4 @@ class CharactersViewController: ExampleViewController, BothamTableViewController
         pullToRefreshHandler.addTo(tableView)
         super.viewDidLoad()
     }
-}
+}
diff --git a/Example/Example/SeriesDetailPresenter.swift b/Example/Example/SeriesDetailPresenter.swift
@@ -9,7 +9,7 @@
 import Foundation
 import BothamUI
 
-class SeriesDetailPresenter : BothamPresenter {
+class SeriesDetailPresenter: BothamPresenter {
 
     private let seriesName: String
     private weak var ui: SeriesDetailUI?

diff --git a/Example/Example/SeriesDetailUI.swift b/Example/Example/SeriesDetailUI.swift
@@ -12,8 +12,8 @@ import BothamUI
 protocol SeriesDetailUI: BothamUI, BothamLoadingUI {
 
     var title: String? { get set }
-    
+
     func configureHeader(series: Series)
     func showItems(items: [Comic])
 
-}
+}
diff --git a/Example/Example/SeriesDetailViewController.swift b/Example/Example/SeriesDetailViewController.swift
@@ -16,7 +16,7 @@ private struct Config {
     static let footerHeight = 20
     static let cellMargin = 20
 }
-class SeriesDetailViewController : ExampleViewController, BothamCollectionViewController, SeriesDetailUI {
+class SeriesDetailViewController: ExampleViewController, BothamCollectionViewController, SeriesDetailUI {
 
     var dataSource: SeriesDetailCollectionViewDataSource!
 

diff --git a/Example/Example/SeriesPresenter.swift b/Example/Example/SeriesPresenter.swift
@@ -10,7 +10,7 @@ import Foundation
 import BothamUI
 
 class SeriesPresenter: BothamPresenter, BothamNavigationPresenter {
-    
+
     private weak var ui: SeriesUI?
     private let wireframe: SeriesWireframe
 
@@ -49,4 +49,4 @@ class SeriesPresenter: BothamPresenter, BothamNavigationPresenter {
     func itemWasTapped(item: Series) {
         wireframe.presentSeriesDetailViewController(item.name)
     }
-}
+}
diff --git a/Example/Example/ServiceLocator.swift b/Example/Example/ServiceLocator.swift
@@ -83,6 +83,6 @@ class ServiceLocator {
     }
 
     func provideSeriesDetailPresenter(ui: SeriesDetailUI, seriesName: String) -> SeriesDetailPresenter {
-        return SeriesDetailPresenter(ui: ui,seriesName: seriesName)
+        return SeriesDetailPresenter(ui: ui, seriesName: seriesName)
     }
 }
diff --git a/Example/Example/UIColor.swift b/Example/Example/UIColor.swift
@@ -12,9 +12,9 @@ import UIKit
 extension UIColor {
 
     convenience init(rgba: String) {
-        var red:   CGFloat = 0.0
+        var red: CGFloat = 0.0
         var green: CGFloat = 0.0
-        var blue:  CGFloat = 0.0
+        var blue: CGFloat = 0.0
         var alpha: CGFloat = 1.0
 
         if rgba.hasPrefix("#") {

diff --git a/Example/ExampleAcceptanceTests/KIFTestActor.swift b/Example/ExampleAcceptanceTests/KIFTestActor.swift
@@ -10,11 +10,11 @@ import Foundation
 import KIF
 
 extension KIFTestActor {
-    func tester(file : String = __FILE__, line : Int = __LINE__) -> KIFUITestActor {
+    func tester(file: String = __FILE__, line: Int = __LINE__) -> KIFUITestActor {
         return KIFUITestActor(inFile: file, atLine: line, delegate: self)
     }
 
-    func system(file : String = __FILE__, line : Int = __LINE__) -> KIFSystemTestActor {
+    func system(file: String = __FILE__, line: Int = __LINE__) -> KIFSystemTestActor {
         return KIFSystemTestActor(inFile: file, atLine: line, delegate: self)
     }
 }
diff --git a/Example/ExampleAcceptanceTests/XCTestCase.swift b/Example/ExampleAcceptanceTests/XCTestCase.swift
@@ -10,11 +10,11 @@ import Foundation
 import KIF
 
 extension XCTestCase {
-    func tester(file : String = __FILE__, line : Int = __LINE__) -> KIFUITestActor {
+    func tester(file: String = __FILE__, line: Int = __LINE__) -> KIFUITestActor {
         return KIFUITestActor(inFile: file, atLine: line, delegate: self)
     }
 
-    func system(file : String = __FILE__, line : Int = __LINE__) -> KIFSystemTestActor {
+    func system(file: String = __FILE__, line: Int = __LINE__) -> KIFSystemTestActor {
         return KIFSystemTestActor(inFile: file, atLine: line, delegate: self)
     }
 }
diff --git a/Example/ExampleTests/ExampleTests.swift b/Example/ExampleTests/ExampleTests.swift
@@ -12,7 +12,7 @@ import BothamUI
 @testable import Example
 
 class ExampleTests: XCTestCase {
-    
+
     func testShowListOfSeries() {
         let expectation = expectationWithDescription("Covers will be shown")
         let fakeSeriesUI = FakeSeriesUI(expectation: expectation)
@@ -46,4 +46,4 @@ class ExampleTests: XCTestCase {
 
         expect(fakeSeriesWireframe.seriesDetailViewControllerWasPresented).to(beTrue())
     }
-}
+}
diff --git a/Example/ExampleTests/FakeCharactersUI.swift b/Example/ExampleTests/FakeCharactersUI.swift
@@ -11,7 +11,7 @@ import Foundation
 import BothamUI
 
 class FakeCharactersUI: CharactersUI, FakeBothamPullToResfreshUI {
-    var itemsShowed:[Example.Character] = []
+    var itemsShowed: [Example.Character] = []
     var didRefresh = false
 
     func showItems(items: [Example.Character]) {

diff --git a/Example/ExampleTests/FakeSeriesUI.swift b/Example/ExampleTests/FakeSeriesUI.swift
@@ -13,7 +13,7 @@ import XCTest
 class FakeSeriesUI: SeriesUI, FakeBothamLoadingUI {
     var loaderWasShowed = false
     var loaderWasHided = false
-    var itemsShowed:[Series] = []
+    var itemsShowed: [Series] = []
 
     var expectation: XCTestExpectation?