Merge branch 'main' into tests

Tinder · Dec 13, 2023 · 3515590 · 3515590
2 parents c1b9ed0 + b35c649
commit 3515590
Show file tree

Hide file tree

Showing 24 changed files with 48 additions and 32 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -0,0 +1 @@
+7.0.0
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
@@ -17,4 +17,4 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@v3
     - name: Build
-      run: bazelisk build --apple_platform_type=ios --cpu=ios_x86_64 //:Layout
+      run: bazelisk build --noenable_bzlmod //:all
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,8 +1,16 @@
+load("@build_bazel_rules_apple//apple:ios.bzl", "ios_build_test")
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
+ios_build_test(
+    name = "Layout-iOS",
+    minimum_os_version = "13.0",
+    targets = [":Layout"],
+)
+
 swift_library(
     name = "Layout",
-    module_name = "Layout",
-    srcs = glob(["Sources/Layout/**/*.swift"], allow_empty = False),
+    srcs = glob(["Sources/Layout/**/*.swift"]),
+    copts = ["-strict-concurrency=complete"],
     visibility = ["//visibility:public"],
+    tags = ["manual"],
 )
diff --git a/Sources/Layout/Layout.swift b/Sources/Layout/Layout.swift
@@ -235,7 +235,7 @@ public final class Layout { // swiftlint:disable:this type_body_length
     public func constrain(
         _ view1: UIView,
         to view2: UIView,
-        insets: CanonicalInsets = .zero
+        insets: CanonicalInsets
     ) -> Layout {
         self
             .constrain(view1.left, to: view2.left, constant: insets.left)
@@ -248,7 +248,7 @@ public final class Layout { // swiftlint:disable:this type_body_length
     public func constrain(
         _ view1: UIView,
         to view2: UIView,
-        inset: CGFloat
+        inset: CGFloat = 0
     ) -> Layout {
         constrain(view1,
                   to: view2,
@@ -407,12 +407,6 @@ public final class Layout { // swiftlint:disable:this type_body_length
         return self
     }
 
-    @discardableResult
-    public func withPriority(_ priority: UILayoutPriority) -> Layout {
-        constraints.prioritize(priority)
-        return self
-    }
-
     @discardableResult
     public func activate() -> Layout {
         constraints.activate()
@@ -425,6 +419,19 @@ public final class Layout { // swiftlint:disable:this type_body_length
         return self
     }
 
+    public func require() -> Layout {
+        withPriority(.required)
+    }
+
+    public func withPriority(_ priority: UILayoutPriority) -> Layout {
+        constraints.prioritize(priority)
+        return self
+    }
+
+    public func prioritize(_ priority: UILayoutPriority) {
+        constraints.forEach { $0.prioritize(priority) }
+    }
+
     public func update() {
         view?.setNeedsUpdateConstraints()
         view?.updateConstraintsIfNeeded()

diff --git a/Tests/LayoutTests/Attributes/CanonicalEdgeTests.swift b/Tests/LayoutTests/Attributes/CanonicalEdgeTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/Attributes/DirectionalEdgeTests.swift b/Tests/LayoutTests/Attributes/DirectionalEdgeTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/Builders/ConstraintsBuilderTests.swift b/Tests/LayoutTests/Builders/ConstraintsBuilderTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/Builders/LayoutBuilderTests.swift b/Tests/LayoutTests/Builders/LayoutBuilderTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/LayoutItem/LayoutItems/UIView+LayoutItemTests.swift b/Tests/LayoutTests/LayoutItem/LayoutItems/UIView+LayoutItemTests.swift
@@ -8,7 +8,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/LayoutItemTests.swift b/Tests/LayoutTests/LayoutItemTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/Swift/ArrayTests.swift b/Tests/LayoutTests/Swift/ArrayTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/UIKit/NSLayoutConstraintTests.swift b/Tests/LayoutTests/UIKit/NSLayoutConstraintTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/UIKit/NSLayoutDimensionTests.swift b/Tests/LayoutTests/UIKit/NSLayoutDimensionTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/UIKit/NSLayoutXAxisAnchorTests.swift b/Tests/LayoutTests/UIKit/NSLayoutXAxisAnchorTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/UIKit/NSLayoutYAxisAnchorTests.swift b/Tests/LayoutTests/UIKit/NSLayoutYAxisAnchorTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/UIKit/UILayoutGuideTests.swift b/Tests/LayoutTests/UIKit/UILayoutGuideTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/UIKit/UILayoutPriorityTests.swift b/Tests/LayoutTests/UIKit/UILayoutPriorityTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/UIKit/UILayoutSupportTests.swift b/Tests/LayoutTests/UIKit/UILayoutSupportTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/UIKit/UIView+AutoLayoutTests.swift b/Tests/LayoutTests/UIKit/UIView+AutoLayoutTests.swift
@@ -8,7 +8,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import UIKit
 import XCTest

diff --git a/Tests/LayoutTests/UIKit/UIView+FramesTests.swift b/Tests/LayoutTests/UIKit/UIView+FramesTests.swift
@@ -8,7 +8,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/UIKit/UIView+LayoutTests.swift b/Tests/LayoutTests/UIKit/UIView+LayoutTests.swift
@@ -8,7 +8,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import UIKit
 import XCTest

diff --git a/Tests/LayoutTests/UIKit/UIView-AutoresizingMaskTests.swift b/Tests/LayoutTests/UIKit/UIView-AutoresizingMaskTests.swift
@@ -10,7 +10,7 @@
 
 import Foundation
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/Tests/LayoutTests/UIKit/UIViewControllerTests.swift b/Tests/LayoutTests/UIKit/UIViewControllerTests.swift
@@ -7,7 +7,7 @@
 //  See https://github.com/Tinder/Layout/blob/main/LICENSE for license information.
 //
 
-@testable import Layout
+import Layout
 import Nimble
 import XCTest
 

diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -2,8 +2,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "8ac4c7997d863f3c4347ba996e831b5ec8f7af885ee8d4fe36f1c3c8f0092b2c",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/2.5.0/rules_apple.2.5.0.tar.gz",
+    sha256 = "34c41bfb59cdaea29ac2df5a2fa79e5add609c71bb303b2ebb10985f93fa20e7",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/3.1.1/rules_apple.3.1.1.tar.gz",
 )
 
 load(