Merge pull request #45 from RougeWare/develop

KyNorthstar · web-flow · commit bd3fbcf9c327 · 2020-02-17T17:43:35.000-07:00
Sync develop into master
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -14,3 +14,8 @@ jobs:
       run: swift build -v
     - name: Run tests
       run: swift test -v
+    - name: Generate iOS xcodeproj
+      run: swift package generate-xcodeproj
+    - name: Run iOS tests
+      run: xcodebuild build test -destination 'name=iPhone 11' -scheme 'RectangleTools-Package'
+
diff --git a/Package.resolved b/Package.resolved
diff --git a/Sources/RectangleTools/Basic Protocols/DualTwoDimensional.swift b/Sources/RectangleTools/Basic Protocols/DualTwoDimensional.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import CoreGraphics
 
 
 
diff --git a/Sources/RectangleTools/Basic Protocols/InitializableFromInteger.swift b/Sources/RectangleTools/Basic Protocols/InitializableFromInteger.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import CoreGraphics
 
 
 
@@ -34,5 +35,7 @@ extension UInt64: InitializableFromInteger {}
 
 extension Float32: InitializableFromInteger {}
 extension Float64: InitializableFromInteger {}
+#if (arch(i386) || arch(x86_64)) && !os(Windows)
 extension Float80: InitializableFromInteger {}
+#endif
 extension CGFloat: InitializableFromInteger {}
diff --git a/Sources/RectangleTools/Default Conformances/CGPoint + Point2D.swift b/Sources/RectangleTools/Default Conformances/CGPoint + Point2D.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import CoreGraphics
 
 
 
diff --git a/Sources/RectangleTools/Default Conformances/CGRect + Rectangle.swift b/Sources/RectangleTools/Default Conformances/CGRect + Rectangle.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import CoreGraphics
 
 
 
diff --git a/Sources/RectangleTools/Default Conformances/CGSize + Size2D.swift b/Sources/RectangleTools/Default Conformances/CGSize + Size2D.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import CoreGraphics
 
 
 
diff --git a/Sources/RectangleTools/Synthesized Conveniences/TwoDimensional Extensions.swift b/Sources/RectangleTools/Synthesized Conveniences/TwoDimensional Extensions.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import CoreGraphics
 import MultiplicativeArithmetic
 
 
diff --git a/Tests/RectangleToolsTests/Test Constants.swift b/Tests/RectangleToolsTests/Test Constants.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import CoreGraphics
 import RectangleTools
 
 

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`//`
`8`	`8`
`9`	`9`	`import Foundation`
	`10`	`+import CoreGraphics`
`10`	`11`
`11`	`12`
`12`	`13`