Merge pull request mamaral#6 from remaerd/Carthage

Carthage Support / OSX Support merge

Author: mamaral

Demo/Neon/Neon/AppDelegate.swift Demo/AppDelegate.swift

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9052" systemVersion="15B22c" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9040"/>
     </dependencies>
     <scenes>
         <!--View Controller-->

Demo/Neon/Neon/Assets.xcassets/AppIcon.appiconset/Contents.json Demo/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -7,6 +7,8 @@
 //
 
 import UIKit
+import Neon
+
 
 class TwitterProfileExampleViewController: UIViewController {
     let searchBar : UIImageView = UIImageView()

Demo/Neon/Neon/Assets.xcassets/Contents.json Demo/Assets.xcassets/Contents.json

@@ -7,6 +7,8 @@
 //
 
 import UIKit
+import Neon
+
 
 class IconButton: UIView {
     let imageView : UIImageView = UIImageView()

Demo/Neon/Neon/Assets.xcassets/about.imageset/Contents.json Demo/Assets.xcassets/about.imageset/Contents.json

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Neon
 
 class ImageContainerView: UIView {
     let imageView : UIImageView = UIImageView()

Demo/Neon/Neon/Assets.xcassets/about.imageset/about-1.png Demo/Assets.xcassets/about.imageset/about-1.png

@@ -36,14 +36,14 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>