Merge branch 'release/1.1.0'

Example/SimpleLayout.xcodeproj/project.pbxproj

@@ -213,7 +213,7 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0720;
- LastUpgradeCheck = 0830;
+ LastUpgradeCheck = 1010;
  ORGANIZATIONNAME = CocoaPods;
  TargetAttributes = {
  607FACCF1AFB9204008FA782 = {
@@ -223,7 +223,7 @@
  };
  607FACE41AFB9204008FA782 = {
  CreatedOnToolsVersion = 6.3.1;
- LastSwiftMigration = 0820;
+ LastSwiftMigration = 1010;
  TestTargetID = 607FACCF1AFB9204008FA782;
  };
  };
@@ -382,14 +382,22 @@
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
  CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
  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_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;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
  CLANG_WARN_SUSPICIOUS_MOVE = YES;
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -418,7 +426,7 @@
  ONLY_ACTIVE_ARCH = YES;
  SDKROOT = iphoneos;
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  };
  name = Debug;
  };
@@ -430,14 +438,22 @@
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
  CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
  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_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;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
  CLANG_WARN_SUSPICIOUS_MOVE = YES;
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -458,7 +474,7 @@
  MTL_ENABLE_DEBUG_INFO = NO;
  SDKROOT = iphoneos;
  SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  VALIDATE_PRODUCT = YES;
  };
  name = Release;
@@ -475,7 +491,7 @@
  MODULE_NAME = ExampleApp;
  PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  };
  name = Debug;
  };
@@ -491,7 +507,7 @@
  MODULE_NAME = ExampleApp;
  PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  };
  name = Release;
  };
@@ -511,7 +527,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  };
  name = Debug;
  };
@@ -527,7 +543,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  };
  name = Release;
  };

Example/SimpleLayout.xcodeproj/xcshareddata/xcschemes/SimpleLayout-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0830"
+ LastUpgradeVersion = "1010"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

Example/SimpleLayout.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEDidComputeMac32BitWarning</key>
+ <true/>
+</dict>
+</plist>

Example/SimpleLayout.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

Example/SimpleLayout/AppDelegate.swift

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  var window: UIWindow?
 
 
- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
  // Override point for customization after application launch.
  return true
  }

README.md

@@ -2,6 +2,7 @@
 
 SimpleLayout helps you to using auto layout very easily
 
+![Swift](https://img.shields.io/badge/Swift-4.2-orange.svg)
 [![CI Status](http://img.shields.io/travis/pisces/SimpleLayout.svg?style=flat)](https://travis-ci.org/pisces/SimpleLayout)
 [![Version](https://img.shields.io/cocoapods/v/SimpleLayout-Swift.svg?style=flat)](http://cocoapods.org/pods/SimpleLayout-Swift)
 [![License](https://img.shields.io/cocoapods/l/SimpleLayout-Swift.svg?style=flat)](http://cocoapods.org/pods/SimpleLayout-Swift)
@@ -172,7 +173,7 @@ $ brew install carthage
 To integrate SimpleLayout into your Xcode project using Carthage, specify it in your `Cartfile`:
 
 ```ogdl
-github "pisces/SimpleLayout" ~> 1.0.3
+github "pisces/SimpleLayout" ~> 1.1.0
 ```
 
 Run `carthage update` to build the framework and drag the built `SimpleLayout.framework` into your Xcode project.

SimpleLayout-Swift.podspec

@@ -8,11 +8,9 @@
 
 Pod::Spec.new do |s|
  s.name = 'SimpleLayout-Swift'
- s.version = '1.0.3'
- s.summary = 'SimpleLayout helps you to using auto layout very easily'
- s.description = <<-DESC
-TODO: Add long description of the pod here.
- DESC
+ s.version = '1.1.0'
+ s.summary = 'SimpleLayout helps you to using auto layout very easily.'
+ s.description = 'SimpleLayout helps you to using auto layout very easily.'
  s.homepage = 'https://github.com/pisces/SimpleLayout'
  s.license = { :type => 'MIT', :file => 'LICENSE' }
  s.author = { 'Steve Kim' => 'hh963103@@gmail.com' }

SimpleLayout/Classes/SimpleLayoutObject.swift

@@ -39,7 +39,7 @@ public class SimpleLayoutObject: NSObject {
  }
 
  @discardableResult
- public func bottom(by target: Any? = nil, priority: UILayoutPriority = .required, attribute: NSLayoutAttribute = .bottom, multiplier: CGFloat = 1.0, _ constant: CGFloat = 0) -> SimpleLayoutObject {
+ public func bottom(by target: Any? = nil, priority: UILayoutPriority = .required, attribute: NSLayoutConstraint.Attribute = .bottom, multiplier: CGFloat = 1.0, _ constant: CGFloat = 0) -> SimpleLayoutObject {
  let item = toItem(with: target)
  let new = NSLayoutConstraint(item: view, attribute: .bottom, relatedBy: .equal, toItem: item, attribute: attribute, multiplier: multiplier, constant: constant)
 
@@ -85,7 +85,7 @@ public class SimpleLayoutObject: NSObject {
  return self
  }
  @discardableResult
- public func trailing(by target: Any? = nil, priority: UILayoutPriority = .required, attribute: NSLayoutAttribute = .trailing, relation: NSLayoutRelation = .equal, multiplier: CGFloat = 1.0, _ constant: CGFloat = 0) -> SimpleLayoutObject {
+ public func trailing(by target: Any? = nil, priority: UILayoutPriority = .required, attribute: NSLayoutConstraint.Attribute = .trailing, relation: NSLayoutConstraint.Relation = .equal, multiplier: CGFloat = 1.0, _ constant: CGFloat = 0) -> SimpleLayoutObject {
  let item = toItem(with: target)
  let new = NSLayoutConstraint(item: view, attribute: .trailing, relatedBy: relation, toItem: item, attribute: attribute, multiplier: multiplier, constant: constant)
 
@@ -115,7 +115,7 @@ public class SimpleLayoutObject: NSObject {
  return self
  }
  @discardableResult
- public func height(by target: Any? = nil, priority: UILayoutPriority = .required, fixed: CGFloat = -1, relation: NSLayoutRelation = .equal, attribute: NSLayoutAttribute = .height, multiplier: CGFloat = 1.0, _ constant: CGFloat = 0) -> SimpleLayoutObject {
+ public func height(by target: Any? = nil, priority: UILayoutPriority = .required, fixed: CGFloat = -1, relation: NSLayoutConstraint.Relation = .equal, attribute: NSLayoutConstraint.Attribute = .height, multiplier: CGFloat = 1.0, _ constant: CGFloat = 0) -> SimpleLayoutObject {
  if let height = constraints.height {
  view.removeConstraint(height)
  view.superview?.removeConstraint(height)
@@ -131,7 +131,7 @@ public class SimpleLayoutObject: NSObject {
  return self
  }
  @discardableResult
- public func leading(by target: Any? = nil, priority: UILayoutPriority = .required, attribute: NSLayoutAttribute = .leading, relation: NSLayoutRelation = .equal, multiplier: CGFloat = 1.0, _ constant: CGFloat = 0) -> SimpleLayoutObject {
+ public func leading(by target: Any? = nil, priority: UILayoutPriority = .required, attribute: NSLayoutConstraint.Attribute = .leading, relation: NSLayoutConstraint.Relation = .equal, multiplier: CGFloat = 1.0, _ constant: CGFloat = 0) -> SimpleLayoutObject {
  let item = toItem(with: target)
  let new = NSLayoutConstraint(item: view, attribute: .leading, relatedBy: relation, toItem: item, attribute: attribute, multiplier: multiplier, constant: constant)
 
@@ -143,7 +143,7 @@ public class SimpleLayoutObject: NSObject {
  return self
  }
  @discardableResult
- public func top(by target: Any? = nil, priority: UILayoutPriority = .required, attribute: NSLayoutAttribute = .top, multiplier: CGFloat = 1.0, _ constant: CGFloat = 0) -> SimpleLayoutObject {
+ public func top(by target: Any? = nil, priority: UILayoutPriority = .required, attribute: NSLayoutConstraint.Attribute = .top, multiplier: CGFloat = 1.0, _ constant: CGFloat = 0) -> SimpleLayoutObject {
  let item = toItem(with: target)
  let new = NSLayoutConstraint(item: view, attribute: .top, relatedBy: .equal, toItem: item, attribute: attribute, multiplier: multiplier, constant: constant)
 
@@ -155,7 +155,7 @@ public class SimpleLayoutObject: NSObject {
  return self
  }
  @discardableResult
- public func width(by target: Any? = nil, priority: UILayoutPriority = .required, fixed: CGFloat = -1, relation: NSLayoutRelation = .equal, attribute: NSLayoutAttribute = .width, multiplier: CGFloat = 1.0, _ constant: CGFloat = 0) -> SimpleLayoutObject {
+ public func width(by target: Any? = nil, priority: UILayoutPriority = .required, fixed: CGFloat = -1, relation: NSLayoutConstraint.Relation = .equal, attribute: NSLayoutConstraint.Attribute = .width, multiplier: CGFloat = 1.0, _ constant: CGFloat = 0) -> SimpleLayoutObject {
  if let width = constraints.width {
  view.removeConstraint(width)
  view.superview?.removeConstraint(width)