Merge pull request #178 from layoutBox/update_pod

Update pod specification

Author: lucdion

.travis.yml

@@ -1,6 +1,9 @@
 language: objective-c
 osx_image: xcode9.4
-cache: bundler
+
+cache:
+  - bundler
+  - cocoapods
 
 install:
   - bundle install # --deployment # to cache vendor/bundle

Example/PinLayoutSample.xcodeproj/project.pbxproj

@@ -617,7 +617,7 @@
 			inputPaths = (
 				"${SRCROOT}/../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
-				"${PODS_ROOT}/Reveal-SDK/RevealServer-18/iOS/RevealServer.framework",
+				"${PODS_ROOT}/Reveal-SDK/RevealServer-17/iOS/RevealServer.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (

PinLayout.podspec

@@ -16,7 +16,6 @@ Pod::Spec.new do |spec|
   spec.author        = { "Luc Dion" => "[email protected]" }
   spec.source        = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
   spec.source_files  = "Sources/**/*.swift"
-  spec.swift_version = '4.1'
 
   spec.ios.deployment_target  = '8.0'
   spec.ios.frameworks         = 'Foundation', 'CoreGraphics', 'UIKit'

PinLayout.xcodeproj/project.pbxproj

@@ -1312,7 +1312,7 @@
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 4Q596JWQC5;
@@ -1379,6 +1379,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.PinLayout-macOS";
 				PRODUCT_NAME = PinLayout;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = macosx;
@@ -1411,6 +1412,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.PinLayout-macOS";
 				PRODUCT_NAME = PinLayout;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = macosx;

Podfile.lock

@@ -1,8 +1,8 @@
 PODS:
   - Nimble (7.0.3)
-  - PinLayout (1.8.4)
+  - PinLayout (1.8.5)
   - Quick (1.2.0)
-  - Reveal-SDK (18)
+  - Reveal-SDK (17)
   - SwiftLint (0.27.0)
 
 DEPENDENCIES:
@@ -25,9 +25,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
-  PinLayout: 143506c26a2292428e86df058aae15c7c040e9f0
+  PinLayout: a4b78dd50eb2e85c31b4418013461fa667764783
   Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
-  Reveal-SDK: cce79388da3fd0bbb6ae19d769b906cfc3a33a89
+  Reveal-SDK: a6df49f47319bd19a110c960c498af32df72c0af
   SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
 
 PODFILE CHECKSUM: 62618887f8155abc1ed3348d9b676cf6915137e2

Sources/Impl/Coordinates.swift

@@ -23,22 +23,14 @@ import UIKit
 import AppKit
 #endif
 
-#if os(iOS) || os(tvOS)
-internal var displayScale: CGFloat = UIScreen.main.scale
-#elseif os(OSX)
-internal var displayScale: CGFloat = NSScreen.main?.backingScaleFactor ?? 2.0
-#endif
+internal var displayScale: CGFloat = getDisplayScale()
 internal var onePixelLength: CGFloat = 1 / displayScale
 
 public func _pinlayoutSetUnitTest(scale: CGFloat?) {
     if let scale = scale {
         displayScale = scale
     } else {
-        #if os(iOS) || os(tvOS)
-        displayScale = UIScreen.main.scale
-        #elseif os(OSX)
-        displayScale = NSScreen.main?.backingScaleFactor ?? 2.0
-        #endif
+        displayScale = getDisplayScale()
     }
 }
 
@@ -113,3 +105,15 @@ final class Coordinates<View: Layoutable> {
         return CGFloat(ceilf(Float(pointValue * displayScale))) / displayScale
     }
 }
+
+private func getDisplayScale() -> CGFloat {
+    #if os(iOS) || os(tvOS)
+        return UIScreen.main.scale
+    #elseif os(OSX)
+        #if swift(>=4.1)
+        return NSScreen.main?.backingScaleFactor ?? 2.0
+        #else
+        return NSScreen.main()?.backingScaleFactor ?? 2.0
+        #endif
+    #endif
+}

Sources/SupportingFiles/PinLayoutMacOS.h

@@ -18,7 +18,6 @@
 //  THE SOFTWARE.
 
 #import <Foundation/Foundation.h>
-//#import <Cocoa/Cocoa.h>
 
 //! Project version number for PinLayoutMacOS.
 FOUNDATION_EXPORT double PinLayoutMacOSVersionNumber;

TestProjects/cocoapods/macos/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - PinLayout (1.8.3)
+  - PinLayout (1.8.5)
 
 DEPENDENCIES:
   - PinLayout (from `../../..`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../../.."
 
 SPEC CHECKSUMS:
-  PinLayout: 1330ea0c6324556e7bdb9b36af32a262a97d2ff2
+  PinLayout: a4b78dd50eb2e85c31b4418013461fa667764783
 
 PODFILE CHECKSUM: e4d7a00501eec9097d00e6c5397befb6e16ccaec
 

TestProjects/cocoapods/tvos/PinLayout-tvOS.xcodeproj/project.pbxproj

@@ -310,7 +310,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-tvOS/PinLayout-tvOS-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -325,7 +325,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.project.PinLayout-tvOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-tvOS/PinLayout-tvOS-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

Tests/Common/AdjustSizeSpec.swift

@@ -74,6 +74,10 @@ class AdjustSizeSpec: QuickSpec {
             bViewChild.frame = CGRect(x: 40, y: 10, width: 60, height: 20)
         }
 
+        afterEach {
+            _pinlayoutSetUnitTest(scale: nil)
+        }
+
         describe("the result of the width(...) methods") {
             it("should adjust the width of aView") {
                 aView.pin.width(35)
@@ -858,16 +862,22 @@ class AdjustSizeSpec: QuickSpec {
             }
 
             it("should produce the same size as the built-in sizeToFit() method") {
+                _pinlayoutSetUnitTest(scale: nil)
+                
                 let label = PLabel(frame: CGRect.zero)
                 label.text = "Lorem ipsum dolor sit amet"
                 label.pin.sizeToFit()
                 let size = label.bounds.size
+
                 label.bounds.size = CGSize.zero
                 label.sizeToFit()
+
                 expect(size).to(equal(label.bounds.size))
             }
 
             it("should produce the same size as the built-in sizeToFit() method when there is a transform applied") {
+                _pinlayoutSetUnitTest(scale: nil)
+
                 let label = PLabel(frame: CGRect.zero)
                 label.text = "Lorem ipsum dolor sit amet"
                 label.transform = CGAffineTransform(scaleX: 0.5, y: 0.5)