Updates for Xcode 12 (swift-tools-version:5.3)

freshOS · Sep 21, 2020 · e1e8dc4 · e1e8dc4
1 parent e3663c5
commit e1e8dc4
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 14 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.3
 
 import PackageDescription
 

diff --git a/Tests/SteviaTests/BaselineTests.swift b/Tests/SteviaTests/BaselineTests.swift
@@ -16,8 +16,6 @@ class BaselineTests: XCTestCase {
     var label1 = UILabel()
     var label2 = UILabel()
 
-
-
     override func setUp() {
         win = UIWindow(frame: UIScreen.main.bounds)
         ctrler =  UIViewController()

diff --git a/Tests/SteviaTests/CenterTests.swift b/Tests/SteviaTests/CenterTests.swift
@@ -22,7 +22,7 @@ class CenterTests: XCTestCase {
         ctrler =  UIViewController()
         win.rootViewController = ctrler
         v = UIView()
-        ctrler.view.subviews { v }
+        ctrler.view.subviews { v! }
 
         // verify view h as default values
         XCTAssertEqual(v.frame.origin.y, 0, accuracy: CGFloat(Float.ulpOfOne))

diff --git a/Tests/SteviaTests/FlexibleMarginTests.swift b/Tests/SteviaTests/FlexibleMarginTests.swift
@@ -21,7 +21,7 @@ class FlexibleMarginTests: XCTestCase {
         ctrler =  UIViewController()
         win.rootViewController = ctrler
         v = UIView()
-        ctrler.view.subviews { v }
+        ctrler.view.subviews { v! }
         v.size(100.0)
     }
 

diff --git a/Tests/SteviaTests/FullLayoutTests.swift b/Tests/SteviaTests/FullLayoutTests.swift
@@ -84,7 +84,7 @@ class FullLayoutTests: XCTestCase {
         v.layoutIfNeeded()
 
         // Email
-        XCTAssertEqual(v.email.frame.origin.y, 100.5, accuracy: CGFloat(Float.ulpOfOne))
+        XCTAssertEqual(v.email.frame.origin.y, 100.5, accuracy: 0.5)
         XCTAssertEqual(v.email.frame.origin.x, 8, accuracy: CGFloat(Float.ulpOfOne))
         XCTAssertEqual(v.email.frame.width, win.frame.width - 8 - 22,
                                    accuracy: CGFloat(Float.ulpOfOne))
@@ -120,7 +120,7 @@ class FullLayoutTests: XCTestCase {
         v.layoutIfNeeded()
 
         // Email
-        XCTAssertEqual(v.email.frame.origin.y, 100.5, accuracy: CGFloat(Float.ulpOfOne))
+        XCTAssertEqual(v.email.frame.origin.y, 100.5, accuracy: 0.5)
         XCTAssertEqual(v.email.frame.origin.x, 22, accuracy: CGFloat(Float.ulpOfOne))
         XCTAssertEqual(v.email.frame.width, win.frame.width - 8 - 22,
                                    accuracy: CGFloat(Float.ulpOfOne))

diff --git a/Tests/SteviaTests/GetConstraintsTests.swift b/Tests/SteviaTests/GetConstraintsTests.swift
@@ -17,7 +17,7 @@ class GetConstraintsTests: XCTestCase {
     override func setUp() {
         spv = UIView()
         v = UIView()
-        spv.subviews { v }
+        spv.subviews { v! }
     }
 
     func testCanGetLeftConstraint() {

diff --git a/Tests/SteviaTests/LayoutTests.swift b/Tests/SteviaTests/LayoutTests.swift
@@ -21,7 +21,7 @@ class LayoutTests: XCTestCase {
         ctrler =  UIViewController()
         win.rootViewController = ctrler
         v = UIView()
-        ctrler.view.subviews { v }
+        ctrler.view.subviews { v! }
         verifyViewHasDefaultValues()
     }
 

diff --git a/Tests/SteviaTests/PositionTests.swift b/Tests/SteviaTests/PositionTests.swift
@@ -21,7 +21,7 @@ class PositionTests: XCTestCase {
         ctrler =  UIViewController()
         win.rootViewController = ctrler
         v = UIView()
-        ctrler.view.subviews {v }
+        ctrler.view.subviews { v! }
         v.size(100.0)
     }
 

diff --git a/Tests/SteviaTests/SizeTests.swift b/Tests/SteviaTests/SizeTests.swift
@@ -22,7 +22,7 @@ class SizeTests: XCTestCase {
         win.rootViewController = ctrler
         v = UIView()
         ctrler.view.subviews {
-            v
+            v!
         }
     }
 
@@ -207,7 +207,7 @@ class SizeTests: XCTestCase {
         v.removeFromSuperview()
         v.height(80)
         v.width(80)
-        ctrler.view?.subviews { v }
+        ctrler.view?.subviews { v! }
 
         let view: UIView = ctrler.view
         view.layout {

diff --git a/Tests/SteviaTests/StyleTests.swift b/Tests/SteviaTests/StyleTests.swift
@@ -37,6 +37,4 @@ class StyleTests: XCTestCase {
         }
         XCTAssertEqual(label.textColor, UIColor.blue)
     }
-
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,4 @@ class StyleTests: XCTestCase { @@
             }
             XCTAssertEqual(label.textColor, UIColor.blue)
         }
     }