Merge branch 'master' into master

SwifterSwift · Jul 7, 2021 · 32e8717 · 32e8717
2 parents f83cbcb + 71e59e5
commit 32e8717
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ The changelog for **SwifterSwift**. Also see the [releases](https://github.com/S
   - Remove `last(where:)` and move `last(where:equals:)` to `BidirectionalCollection`, since it only makes semantic sense for ordered sequences. [#912](https://github.com/SwifterSwift/SwifterSwift/pull/912) by [guykogus](https://github.com/guykogus)
 - **UIView**
   - Rename `shadowColor`, `shadowOffset`, `shadowOpacity` and `shadowRadius` to `layerShadowColor`, `layerShadowOffset`, `layerShadowOpacity` and `layerShadowRadius` to avoid naming collisions with subclasses properties defined in other modules e.g. UIKit. [#897](https://github.com/SwifterSwift/SwifterSwift/pull/897) by [LucianoPAlmeida](https://github.com/LucianoPAlmeida)
+  - Rename `borderColor`, `borderWidth` and `cornerRadius` to `layerBorderColor`, `layerBorderWidth`, and `layerCornerRadius` to avoid naming collisions with subclasses properties defined in other modules e.g. UIKit. [#972](https://github.com/SwifterSwift/SwifterSwift/pull/972) by [Jayxiang](https://github.com/Jayxiang)
 
 ### Added
 - **SCN3Vector**

diff --git a/Sources/SwifterSwift/Foundation/DateExtensions.swift b/Sources/SwifterSwift/Foundation/DateExtensions.swift
@@ -536,7 +536,7 @@ public extension Date {
     /// SwifterSwift: Date by changing value of calendar component.
     ///
     ///     let date = Date() // "Jan 12, 2017, 7:07 PM"
-    ///     let date2 = date.changing(.minute, value: 10) // "Jan 12, 2017, 6:10 PM"
+    ///     let date2 = date.changing(.minute, value: 10) // "Jan 12, 2017, 7:10 PM"
     ///     let date3 = date.changing(.day, value: 4) // "Jan 4, 2017, 7:07 PM"
     ///     let date4 = date.changing(.month, value: 2) // "Feb 12, 2017, 7:07 PM"
     ///     let date5 = date.changing(.year, value: 2000) // "Jan 12, 2000, 7:07 PM"

diff --git a/Sources/SwifterSwift/UIKit/UIViewExtensions.swift b/Sources/SwifterSwift/UIKit/UIViewExtensions.swift
@@ -55,7 +55,7 @@ public extension UIView {
 
 public extension UIView {
     /// SwifterSwift: Border color of view; also inspectable from Storyboard.
-    @IBInspectable var borderColor: UIColor? {
+    @IBInspectable var layerBorderColor: UIColor? {
         get {
             guard let color = layer.borderColor else { return nil }
             return UIColor(cgColor: color)
@@ -72,7 +72,7 @@ public extension UIView {
     }
 
     /// SwifterSwift: Border width of view; also inspectable from Storyboard.
-    @IBInspectable var borderWidth: CGFloat {
+    @IBInspectable var layerBorderWidth: CGFloat {
         get {
             return layer.borderWidth
         }
@@ -82,7 +82,7 @@ public extension UIView {
     }
 
     /// SwifterSwift: Corner radius of view; also inspectable from Storyboard.
-    @IBInspectable var cornerRadius: CGFloat {
+    @IBInspectable var layerCornerRadius: CGFloat {
         get {
             return layer.cornerRadius
         }

diff --git a/Tests/UIKitTests/UIViewExtensionsTests.swift b/Tests/UIKitTests/UIViewExtensionsTests.swift
@@ -11,31 +11,31 @@ final class UIViewExtensionsTests: XCTestCase {
     func testBorderColor() {
         let frame = CGRect(x: 0, y: 0, width: 100, height: 100)
         let view = UIView(frame: frame)
-        view.borderColor = nil
-        XCTAssertNil(view.borderColor)
-        view.borderColor = UIColor.red
+        view.layerBorderColor = nil
+        XCTAssertNil(view.layerBorderColor)
+        view.layerBorderColor = UIColor.red
         XCTAssertNotNil(view.layer.borderColor)
-        XCTAssertEqual(view.borderColor!, UIColor.red)
+        XCTAssertEqual(view.layerBorderColor!, UIColor.red)
         XCTAssertEqual(view.layer.borderColor!.uiColor, UIColor.red)
     }
 
     func testBorderWidth() {
         let frame = CGRect(x: 0, y: 0, width: 100, height: 100)
         let view = UIView(frame: frame)
-        view.borderWidth = 0
+        view.layerBorderWidth = 0
         XCTAssertEqual(view.layer.borderWidth, 0)
 
-        view.borderWidth = 5
-        XCTAssertEqual(view.borderWidth, 5)
+        view.layerBorderWidth = 5
+        XCTAssertEqual(view.layerBorderWidth, 5)
     }
 
     func testCornerRadius() {
         let frame = CGRect(x: 0, y: 0, width: 100, height: 100)
         let view = UIView(frame: frame)
         XCTAssertEqual(view.layer.cornerRadius, 0)
 
-        view.cornerRadius = 50
-        XCTAssertEqual(view.cornerRadius, 50)
+        view.layerCornerRadius = 50
+        XCTAssertEqual(view.layerCornerRadius, 50)
     }
 
     func testFirstResponder() {