Reverted single argument methods, added variadic instead

simoneconnola · Jun 15, 2018 · e3eee41 · e3eee41
1 parent cfd2f20
commit e3eee41
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/Constrainable.xcodeproj/project.pbxproj b/Constrainable.xcodeproj/project.pbxproj
@@ -97,7 +97,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = SimoneConnola;
 				TargetAttributes = {
 					1D0F27BE2032F1610081802A = {
@@ -161,13 +161,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -221,13 +223,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

diff --git a/Constrainable.xcodeproj/xcshareddata/xcschemes/Constrainable.xcscheme b/Constrainable.xcodeproj/xcshareddata/xcschemes/Constrainable.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Constrainable/Constrainable.swift b/Constrainable/Constrainable.swift
@@ -34,11 +34,11 @@ public extension Constrainable {
         NSLayoutConstraint.activate(constraints)
         return constraints
     }
-
-    @discardableResult func activate(_ constraintDescription: Constraint) -> NSLayoutConstraint {
-        let constraint = bind(constraintDescription)
-        NSLayoutConstraint.activate([constraint])
-        return constraint
+    
+    @discardableResult func activate(_ constraintDescriptions: Constraint...) -> [NSLayoutConstraint] {
+        let constraints = bind(constraintDescriptions)
+        NSLayoutConstraint.activate(constraints)
+        return constraints
     }
 
     @discardableResult func bind(_ constraintDescriptions: [Constraint]) -> [NSLayoutConstraint] {
@@ -48,13 +48,13 @@ public extension Constrainable {
         let constraints = constraintDescriptions.map { $0(self) }
         return constraints
     }
-
-    @discardableResult func bind(_ constraintDescription: Constraint) -> NSLayoutConstraint {
+    
+    @discardableResult func bind(_ constraintDescriptions: Constraint...) -> [NSLayoutConstraint] {
         if let view = self as? UIView {
             view.translatesAutoresizingMaskIntoConstraints = false
         }
-        let constraint = constraintDescription(self)
-        return constraint
+        let constraints = constraintDescriptions.map { $0(self) }
+        return constraints
     }
 }
 

diff --git a/Constrainable/Info.plist b/Constrainable/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.6</string>
+	<string>0.1.7</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>