fixing mac pod

rafiki270 · rafiki270 · commit 4756f2c1fdd8 · 2018-06-01T00:43:18.000+01:00
diff --git a/Classes/Extensions/GridSrollView+Subviews.swift b/Classes/Extensions/GridSrollView+Subviews.swift
@@ -6,13 +6,10 @@
 //  Copyright © 2018 LiveUI. All rights reserved.
 //
 
+#if os(iOS) || os(tvOS)
 @_exported import Foundation
 @_exported import SnapKit
-#if os(iOS) || os(tvOS)
 @_exported import UIKit
-#elseif os(OSX)
-@_exported import Cocoa
-#endif
 
 
 extension GridScrollView {
@@ -48,3 +45,5 @@ extension GridScrollView {
     }
     
 }
+
+#endif
diff --git a/Classes/Extensions/GridView+Drawing.swift b/Classes/Extensions/GridView+Drawing.swift
@@ -6,12 +6,9 @@
 //  Copyright © 2018 LiveUI. All rights reserved.
 //
 
-@_exported import Foundation
 #if os(iOS) || os(tvOS)
+@_exported import Foundation
 @_exported import UIKit
-#elseif os(OSX)
-@_exported import Cocoa
-#endif
 
 
 extension GridView {
@@ -81,3 +78,5 @@ extension GridView {
     }
     
 }
+
+#endif
diff --git a/Classes/Extensions/UIColor+Tools.swift b/Classes/Extensions/UIColor+Tools.swift
@@ -6,12 +6,9 @@
 //  Copyright © 2018 LiveUI. All rights reserved.
 //
 
-@_exported import Foundation
 #if os(iOS) || os(tvOS)
+@_exported import Foundation
 @_exported import UIKit
-#elseif os(OSX)
-@_exported import Cocoa
-#endif
 
 
 extension UIColor {
@@ -33,3 +30,5 @@ extension UIColor {
     }
     
 }
+
+#endif
diff --git a/Classes/New Group/ScrollViewForwarder.swift b/Classes/New Group/ScrollViewForwarder.swift
@@ -6,12 +6,9 @@
 //  Copyright © 2018 LiveUI. All rights reserved.
 //
 
-@_exported import Foundation
 #if os(iOS) || os(tvOS)
+@_exported import Foundation
 @_exported import UIKit
-#elseif os(OSX)
-@_exported import Cocoa
-#endif
 
 
 public protocol ScrollViewForwarder {
@@ -278,3 +275,5 @@ extension GridScrollView {
     }
     
 }
+
+#endif
diff --git a/Classes/View controllers/GridScrollViewController.swift b/Classes/View controllers/GridScrollViewController.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2018 LiveUI. All rights reserved.
 //
 
+#if os(iOS) || os(tvOS)
 @_exported import Foundation
 
 
@@ -60,3 +61,5 @@ open class GridScrollViewController: UIViewController {
     }
     
 }
+
+#endif
diff --git a/Classes/View controllers/GridViewController.swift b/Classes/View controllers/GridViewController.swift
@@ -6,12 +6,9 @@
 //  Copyright © 2018 LiveUI. All rights reserved.
 //
 
-@_exported import Foundation
 #if os(iOS) || os(tvOS)
+@_exported import Foundation
 @_exported import UIKit
-#elseif os(OSX)
-@_exported import Cocoa
-#endif
 
 
 /// Grid view view controller
@@ -41,3 +38,5 @@ open class GridViewController: UIViewController {
     }
     
 }
+
+#endif
diff --git a/Classes/Views/GridScrollView.swift b/Classes/Views/GridScrollView.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2018 LiveUI. All rights reserved.
 //
 
+#if os(iOS) || os(tvOS)
 @_exported import Foundation
 @_exported import SnapKit
 
@@ -85,3 +86,5 @@ open class GridScrollView: ViewAlias, GridViewInterface, ScrollViewForwarder {
     }
     
 }
+
+#endif
diff --git a/Hagrid.xcodeproj/project.pbxproj b/Hagrid.xcodeproj/project.pbxproj
@@ -45,6 +45,13 @@
 		15020ADD20C0AF7000BBADBD /* Cartfile in Resources */ = {isa = PBXBuildFile; fileRef = 15020ADC20C0AF6F00BBADBD /* Cartfile */; };
 		15020ADE20C0AF7000BBADBD /* Cartfile in Resources */ = {isa = PBXBuildFile; fileRef = 15020ADC20C0AF6F00BBADBD /* Cartfile */; };
 		15020ADF20C0AF7000BBADBD /* Cartfile in Resources */ = {isa = PBXBuildFile; fileRef = 15020ADC20C0AF6F00BBADBD /* Cartfile */; };
+		15020AE020C0BF6700BBADBD /* GridView+Drawing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15D00E7B20BDBE8A0051A8CF /* GridView+Drawing.swift */; };
+		15020AE120C0BF6B00BBADBD /* UIColor+Tools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15D00E7920BDB8C20051A8CF /* UIColor+Tools.swift */; };
+		15020AE220C0BF9A00BBADBD /* ScrollViewForwarder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 153F9D8D20C03A6C0051D0D3 /* ScrollViewForwarder.swift */; };
+		15020AE320C0BFAC00BBADBD /* GridScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 153F9D8420C027B70051D0D3 /* GridScrollView.swift */; };
+		15020AE420C0BFB800BBADBD /* GridScrollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 153F9D8220C023610051D0D3 /* GridScrollViewController.swift */; };
+		15020AE520C0BFEA00BBADBD /* GridViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 153F9D7420BE02D70051D0D3 /* GridViewController.swift */; };
+		15020AE620C0BFEA00BBADBD /* GridSrollView+Subviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 153F9D8920C02B440051D0D3 /* GridSrollView+Subviews.swift */; };
 		151640FB20BD7A8C0062FA33 /* TheGrid.h in Headers */ = {isa = PBXBuildFile; fileRef = 151640ED20BD7A8C0062FA33 /* TheGrid.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1516411020BD7B740062FA33 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1516410F20BD7B740062FA33 /* AppDelegate.swift */; };
 		1516411220BD7B740062FA33 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1516411120BD7B740062FA33 /* ViewController.swift */; };
@@ -746,8 +753,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				15020ADB20C0ACAD00BBADBD /* GridViewInterface.swift in Sources */,
+				15020AE020C0BF6700BBADBD /* GridView+Drawing.swift in Sources */,
 				15020ACD20C0A9F800BBADBD /* Properties.swift in Sources */,
+				15020AE320C0BFAC00BBADBD /* GridScrollView.swift in Sources */,
 				15020ACE20C0A9F800BBADBD /* Subview.swift in Sources */,
+				15020AE520C0BFEA00BBADBD /* GridViewController.swift in Sources */,
 				15020AD920C0AC8D00BBADBD /* GridView+Layout.swift in Sources */,
 				15020ADA20C0AC9F00BBADBD /* GridView.swift in Sources */,
 				15020AD220C0AA8100BBADBD /* Compatibility.swift in Sources */,
@@ -756,6 +766,10 @@
 				15020AD620C0AC8D00BBADBD /* GridView+Calculations.swift in Sources */,
 				15020AD720C0AC8D00BBADBD /* GridView+Subviews.swift in Sources */,
 				15020AD520C0AB7500BBADBD /* Padding.swift in Sources */,
+				15020AE420C0BFB800BBADBD /* GridScrollViewController.swift in Sources */,
+				15020AE620C0BFEA00BBADBD /* GridSrollView+Subviews.swift in Sources */,
+				15020AE220C0BF9A00BBADBD /* ScrollViewForwarder.swift in Sources */,
+				15020AE120C0BF6B00BBADBD /* UIColor+Tools.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![Cocoapods Compatible](https://img.shields.io/cocoapods/v/Hagrid.svg)](https://cocoapods.org/pods/Hagrid)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 
-<center>Brings a proper grid layout to the Apple platforms!</center>
+Brings a proper grid layout to the Apple platforms!
 
 <table>
 	<tr>

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`// Copyright © 2018 LiveUI. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
	`9`	`+#if os(iOS) \|\| os(tvOS)`
`9`	`10`	`@_exported import Foundation`
`10`	`11`
`11`	`12`
`@@ -60,3 +61,5 @@ open class GridScrollViewController: UIViewController {`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`}`
	`64`	`+`
	`65`	`+#endif`