Fully NS/UILayoutGuide and SwiftPM support

.github/workflows/main.yml

@@ -0,0 +1,22 @@
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+jobs:
+  build:
+    runs-on: macOS-latest
+    steps:
+    - name: Test
+      uses: actions/checkout@v2
+    - name: Build for iOS
+      run: xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry' -configuration Debug -sdk iphonesimulator clean build ARCHS=x86_64 VALID_ARCHS=x86_64 ONLY_ACTIVE_ARCH=NO
+    - name: Build for macOS
+      run: xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry' -configuration Debug -sdk macosx clean build
+    - name: Build and Test
+      run: xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry iOS Tests' -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 8' clean test ARCHS=x86_64 VALID_ARCHS=x86_64 ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES
+    - name: Upload coverage to Codecov
+      uses: codecov/[email protected]

.travis.yml

@@ -1,16 +1,17 @@
 ---
 language: objective-c
-osx_image: xcode9
+osx_image: xcode12.5
 before_install:
-  - sudo easy_install cpp-coveralls
+  - curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py | sudo python
+  - sudo pip install cpp-coveralls
   - gem install xcpretty -N
   - export LANG=en_US.UTF-8
 
 script:
   - set -o pipefail
-  - xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry iOS Tests' -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.0' clean test ARCHS=i386 VALID_ARCHS=i386 ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
-  - xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry iOS' -configuration Debug -sdk iphonesimulator clean build ARCHS=i386 VALID_ARCHS=i386 ONLY_ACTIVE_ARCH=NO | xcpretty -c
-  - xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry OSX' -configuration Debug clean build | xcpretty -c
+  - xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry iOS Tests' -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 8' clean test ARCHS=x86_64 VALID_ARCHS=x86_64 ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
+  - xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry' -configuration Debug -sdk iphonesimulator clean build ARCHS=x86_64 VALID_ARCHS=x86_64 ONLY_ACTIVE_ARCH=NO | xcpretty -c
+  - xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry' -configuration Debug -sdk macosx clean build | xcpretty -c
 
 after_success:
   - ./script/coveralls.sh

Examples/Masonry iOS Examples.xcodeproj/project.pbxproj

@@ -229,8 +229,6 @@
 				DD52F223179CAD57005CD195 /* Sources */,
 				DD52F224179CAD57005CD195 /* Frameworks */,
 				DD52F225179CAD57005CD195 /* Resources */,
-				5C6517785DFF4287BCDF458D /* [CP] Copy Pods Resources */,
-				9A6DE33A61510E8F9549C5EE /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -282,21 +280,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		5C6517785DFF4287BCDF458D /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		621F6A1FCAEF44F880874959 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -315,21 +298,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9A6DE33A61510E8F9549C5EE /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

Examples/Masonry iOS Examples.xcodeproj/xcshareddata/xcschemes/Masonry iOS Examples.xcscheme

@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "3AED05B61AD59FD40053CC65"
                BuildableName = "Masonry.framework"
-               BlueprintName = "Masonry iOS"
+               BlueprintName = "Masonry"
                ReferencedContainer = "container:../Masonry.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -40,10 +40,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -53,14 +50,13 @@
             ReferencedContainer = "container:Masonry iOS Examples.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -77,8 +73,6 @@
             ReferencedContainer = "container:Masonry iOS Examples.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Examples/Masonry iOS Examples/MASExampleAnimatedView.m

@@ -18,63 +18,62 @@ @interface MASExampleAnimatedView ()
 
 @implementation MASExampleAnimatedView
 
-- (id)init {
-    self = [super init];
-    if (!self) return nil;
-
-    UIView *greenView = UIView.new;
-    greenView.backgroundColor = UIColor.greenColor;
-    greenView.layer.borderColor = UIColor.blackColor.CGColor;
-    greenView.layer.borderWidth = 2;
-    [self addSubview:greenView];
-
-    UIView *redView = UIView.new;
-    redView.backgroundColor = UIColor.redColor;
-    redView.layer.borderColor = UIColor.blackColor.CGColor;
-    redView.layer.borderWidth = 2;
-    [self addSubview:redView];
-
-    UIView *blueView = UIView.new;
-    blueView.backgroundColor = UIColor.blueColor;
-    blueView.layer.borderColor = UIColor.blackColor.CGColor;
-    blueView.layer.borderWidth = 2;
-    [self addSubview:blueView];
-
-    UIView *superview = self;
-    int padding = self.padding = 10;
-    UIEdgeInsets paddingInsets = UIEdgeInsetsMake(self.padding, self.padding, self.padding, self.padding);
-
-    self.animatableConstraints = NSMutableArray.new;
-
-    [greenView mas_makeConstraints:^(MASConstraintMaker *make) {
-        [self.animatableConstraints addObjectsFromArray:@[
-            make.edges.equalTo(superview).insets(paddingInsets).priorityLow(),
-            make.bottom.equalTo(blueView.mas_top).offset(-padding),
-        ]];
-
-        make.size.equalTo(redView);
-        make.height.equalTo(blueView.mas_height);
-    }];
-
-    [redView mas_makeConstraints:^(MASConstraintMaker *make) {
-        [self.animatableConstraints addObjectsFromArray:@[
-            make.edges.equalTo(superview).insets(paddingInsets).priorityLow(),
-            make.left.equalTo(greenView.mas_right).offset(padding),
-            make.bottom.equalTo(blueView.mas_top).offset(-padding),
-        ]];
-
-        make.size.equalTo(greenView);
-        make.height.equalTo(blueView.mas_height);
-    }];
-
-    [blueView mas_makeConstraints:^(MASConstraintMaker *make) {
-        [self.animatableConstraints addObjectsFromArray:@[
-            make.edges.equalTo(superview).insets(paddingInsets).priorityLow(),
-        ]];
-
-        make.height.equalTo(greenView.mas_height);
-        make.height.equalTo(redView.mas_height);
-    }];
+- (instancetype)init {
+    if (self = [super init]) {
+        UIView *greenView = UIView.new;
+        greenView.backgroundColor = UIColor.greenColor;
+        greenView.layer.borderColor = UIColor.blackColor.CGColor;
+        greenView.layer.borderWidth = 2;
+        [self addSubview:greenView];
+
+        UIView *redView = UIView.new;
+        redView.backgroundColor = UIColor.redColor;
+        redView.layer.borderColor = UIColor.blackColor.CGColor;
+        redView.layer.borderWidth = 2;
+        [self addSubview:redView];
+
+        UIView *blueView = UIView.new;
+        blueView.backgroundColor = UIColor.blueColor;
+        blueView.layer.borderColor = UIColor.blackColor.CGColor;
+        blueView.layer.borderWidth = 2;
+        [self addSubview:blueView];
+
+        UIView *superview = self;
+        int padding = self.padding = 10;
+        UIEdgeInsets paddingInsets = UIEdgeInsetsMake(self.padding, self.padding, self.padding, self.padding);
+
+        self.animatableConstraints = NSMutableArray.new;
+
+        [greenView mas_makeConstraints:^(MASConstraintMaker *make) {
+            [self.animatableConstraints addObjectsFromArray:@[
+                make.edges.equalTo(superview).insets(paddingInsets).priorityLow(),
+                make.bottom.equalTo(blueView.mas_top).offset(-padding),
+            ]];
+
+            make.size.equalTo(redView);
+            make.height.equalTo(blueView.mas_height);
+        }];
+
+        [redView mas_makeConstraints:^(MASConstraintMaker *make) {
+            [self.animatableConstraints addObjectsFromArray:@[
+                make.edges.equalTo(superview).insets(paddingInsets).priorityLow(),
+                make.left.equalTo(greenView.mas_right).offset(padding),
+                make.bottom.equalTo(blueView.mas_top).offset(-padding),
+            ]];
+
+            make.size.equalTo(greenView);
+            make.height.equalTo(blueView.mas_height);
+        }];
+
+        [blueView mas_makeConstraints:^(MASConstraintMaker *make) {
+            [self.animatableConstraints addObjectsFromArray:@[
+                make.edges.equalTo(superview).insets(paddingInsets).priorityLow(),
+            ]];
+
+            make.height.equalTo(greenView.mas_height);
+            make.height.equalTo(redView.mas_height);
+        }];
+    }
 
     return self;
 }

Examples/Masonry iOS Examples/MASExampleArrayView.m

@@ -19,38 +19,37 @@ @interface MASExampleArrayView ()
 
 @implementation MASExampleArrayView
 
-- (id)init {
-    self = [super init];
-    if (!self) return nil;
-
-    UIButton *raiseButton = [UIButton buttonWithType:UIButtonTypeSystem];
-    [raiseButton setTitle:@"Raise" forState:UIControlStateNormal];
-    [raiseButton addTarget:self action:@selector(raiseAction) forControlEvents:UIControlEventTouchUpInside];
-    [self addSubview:raiseButton];
-
-    UIButton *centerButton = [UIButton buttonWithType:UIButtonTypeSystem];
-    [centerButton setTitle:@"Center" forState:UIControlStateNormal];
-    [centerButton addTarget:self action:@selector(centerAction) forControlEvents:UIControlEventTouchUpInside];
-    [self addSubview:centerButton];
-
-    UIButton *lowerButton = [UIButton buttonWithType:UIButtonTypeSystem];
-    [lowerButton setTitle:@"Lower" forState:UIControlStateNormal];
-    [lowerButton addTarget:self action:@selector(lowerAction) forControlEvents:UIControlEventTouchUpInside];
-    [self addSubview:lowerButton];
-
-    [lowerButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self).with.offset(10.0);
-    }];
-
-    [centerButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerX.equalTo(self);
-    }];
-
-    [raiseButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.equalTo(self).with.offset(-10);
-    }];
-
-    self.buttonViews = @[ raiseButton, lowerButton, centerButton ];
+- (instancetype)init {
+    if (self = [super init]) {
+        UIButton *raiseButton = [UIButton buttonWithType:UIButtonTypeSystem];
+        [raiseButton setTitle:@"Raise" forState:UIControlStateNormal];
+        [raiseButton addTarget:self action:@selector(raiseAction) forControlEvents:UIControlEventTouchUpInside];
+        [self addSubview:raiseButton];
+
+        UIButton *centerButton = [UIButton buttonWithType:UIButtonTypeSystem];
+        [centerButton setTitle:@"Center" forState:UIControlStateNormal];
+        [centerButton addTarget:self action:@selector(centerAction) forControlEvents:UIControlEventTouchUpInside];
+        [self addSubview:centerButton];
+
+        UIButton *lowerButton = [UIButton buttonWithType:UIButtonTypeSystem];
+        [lowerButton setTitle:@"Lower" forState:UIControlStateNormal];
+        [lowerButton addTarget:self action:@selector(lowerAction) forControlEvents:UIControlEventTouchUpInside];
+        [self addSubview:lowerButton];
+
+        [lowerButton mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(self).with.offset(10.0);
+        }];
+
+        [centerButton mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.centerX.equalTo(self);
+        }];
+
+        [raiseButton mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.right.equalTo(self).with.offset(-10);
+        }];
+
+        self.buttonViews = @[ raiseButton, lowerButton, centerButton ];
+    }
 
     return self;
 }