Merge pull request #182 from layoutBox/update_travis_brew_addon

Update to Xcode 10.1

Author: lucdion

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10
+osx_image: xcode10.1
 
 cache:
   - bundler

Example/PinLayoutSample.xcodeproj/project.pbxproj

@@ -617,9 +617,9 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample-frameworks.sh",
+				"${PODS_ROOT}/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-20/iOS/RevealServer.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -628,7 +628,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		DDE1EE639E8C959FEBC41FDC /* [CP] Check Pods Manifest.lock */ = {

Example/PinLayoutSample.xcodeproj/xcshareddata/xcschemes/PinLayoutSample.xcscheme

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

PinLayout.xcodeproj/project.pbxproj

@@ -763,7 +763,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-PinLayoutTests-tvOS/Pods-PinLayoutTests-tvOS-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-PinLayoutTests-tvOS/Pods-PinLayoutTests-tvOS-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Nimble-tvOS/Nimble.framework",
 				"${BUILT_PRODUCTS_DIR}/Quick-tvOS/Quick.framework",
 			);
@@ -774,7 +774,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PinLayoutTests-tvOS/Pods-PinLayoutTests-tvOS-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PinLayoutTests-tvOS/Pods-PinLayoutTests-tvOS-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		41F720B3B7874CC3847A48CC /* [CP] Check Pods Manifest.lock */ = {
@@ -801,7 +801,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-PinLayoutTests-iOS/Pods-PinLayoutTests-iOS-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-PinLayoutTests-iOS/Pods-PinLayoutTests-iOS-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Nimble-iOS/Nimble.framework",
 				"${BUILT_PRODUCTS_DIR}/Quick-iOS/Quick.framework",
 			);
@@ -812,7 +812,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PinLayoutTests-iOS/Pods-PinLayoutTests-iOS-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PinLayoutTests-iOS/Pods-PinLayoutTests-iOS-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		A143968F873D85D48BABCDBF /* [CP] Embed Pods Frameworks */ = {
@@ -821,7 +821,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-PinLayoutTests-macOS/Pods-PinLayoutTests-macOS-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-PinLayoutTests-macOS/Pods-PinLayoutTests-macOS-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Nimble-macOS/Nimble.framework",
 				"${BUILT_PRODUCTS_DIR}/Quick-macOS/Quick.framework",
 			);
@@ -832,7 +832,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PinLayoutTests-macOS/Pods-PinLayoutTests-macOS-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PinLayoutTests-macOS/Pods-PinLayoutTests-macOS-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		C13A14974C1425B4B67ECF64 /* [CP] Check Pods Manifest.lock */ = {
@@ -1274,7 +1274,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C8BDEE8FC7F6D6F36D69AE89 /* Pods-PinLayoutTests-iOS.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				DEVELOPMENT_TEAM = 4Q596JWQC5;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Tests/Common/Info.plist;
@@ -1289,7 +1289,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = A02D58138C6BA063EB3E8E66 /* Pods-PinLayoutTests-iOS.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				DEVELOPMENT_TEAM = 4Q596JWQC5;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Tests/Common/Info.plist;

PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-iOS.xcscheme

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

PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-macOS.xcscheme

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

PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-tvOS.xcscheme

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

Podfile.lock

@@ -2,8 +2,8 @@ PODS:
   - Nimble (7.3.1)
   - PinLayout (1.8.6)
   - Quick (1.3.2)
-  - Reveal-SDK (18)
-  - SwiftLint (0.27.0)
+  - Reveal-SDK (20)
+  - SwiftLint (0.29.1)
 
 DEPENDENCIES:
   - Nimble
@@ -25,11 +25,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
-  PinLayout: c943d39ac8391850c10720646373a253b7e3b226
+  PinLayout: fe2a2432d6982588e208572005c941aeeae417ab
   Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
-  Reveal-SDK: cce79388da3fd0bbb6ae19d769b906cfc3a33a89
-  SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
+  Reveal-SDK: 43206a57f575632fd304e85385cc259b5d359e32
+  SwiftLint: 6772320e40b52049053a518c17db9b0634a0b45a
 
 PODFILE CHECKSUM: 62618887f8155abc1ed3348d9b676cf6915137e2
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.0.beta.2

README.md

@@ -34,8 +34,8 @@ Extremely Fast views layouting without auto layout. No magic, pure code, full co
 
 ### Requirements
 * iOS 8.0+ / tvOS 9.0+ / macOS 10.9+
-* Swift 4.* / Swift 3.* / Objective-C
-* Xcode 10 / Xcode 9.* / Xcode 8.* 
+* Swift 4.x / Swift 3.x / Objective-C
+* Xcode 10.x / Xcode 9.x / Xcode 8.x 
 
 ### Recent changes/features
 * :star: Add methods to position a view between two other views. See [Layout between other views](#layout_between).

build-ci.sh

@@ -8,16 +8,16 @@ echo "===============================" &&
 echo "PinLayout-iOS"                   &&
 echo "===============================" &&
 time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-iOS \
-   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
+   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.1 \
    -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3'  \
    | xcpretty &&
 
 echo "===============================" &&
 echo "PinLayout-tvOS"                  &&
 echo "===============================" &&
 time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-tvOS \
-   -derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.0 \
-   -destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=12.0' \
+   -derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.1 \
+   -destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=12.1' \
    | xcpretty &&
 
 echo "===============================" &&
@@ -31,7 +31,7 @@ echo "===============================" &&
 echo "PinLayoutSample"                 &&
 echo "===============================" &&
 time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayoutSample \
-   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
+   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.1 \
    -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3'  \
    | xcpretty &&
 
@@ -40,36 +40,36 @@ echo "===============================" &&
 echo "iOS unit test"                   &&
 echo "===============================" &&
 time  xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
-   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
+   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.1 \
    -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3'  \
    | xcpretty &&
 
 time  xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
-   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
+   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.1 \
    -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' \
    | xcpretty &&
 
 time  xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
-   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
+   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.1 \
    -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.4' \
    | xcpretty &&
 
 time  xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
-   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
-   -destination 'platform=iOS Simulator,name=iPhone XS,OS=12.0' \
+   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.1 \
+   -destination 'platform=iOS Simulator,name=iPhone XS,OS=12.1' \
    | xcpretty &&
 
 echo "===============================" &&
 echo "tvOS unit test"                   &&
 echo "===============================" &&
 time  xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS \
-   -derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.0 \
+   -derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.1 \
    -destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=11.4' \
    | xcpretty &&
 
 time  xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS \
-   -derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.0 \
-   -destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=12.0' \
+   -derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.1 \
+   -destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=12.1' \
    | xcpretty &&
 
 echo "===============================" &&
@@ -87,8 +87,8 @@ cd TestProjects/cocoapods/ios &&
 rm -rf $DERIVED_DATA &&
 pod install &&
 time xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS \
-    -sdk iphonesimulator12.0  -derivedDataPath $DERIVED_DATA \
-    -destination 'platform=iOS Simulator,name=iPhone 8,OS=12.0' \
+    -sdk iphonesimulator12.1  -derivedDataPath $DERIVED_DATA \
+    -destination 'platform=iOS Simulator,name=iPhone 8,OS=12.1' \
     | xcpretty &&
 cd ../../.. &&
 
@@ -112,8 +112,8 @@ cd TestProjects/cocoapods/tvos &&
 rm -rf $DERIVED_DATA &&
 pod install &&
 time xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS \
-    -sdk appletvsimulator12.0 -derivedDataPath $DERIVED_DATA \
-    -destination 'platform=tvOS Simulator,name=Apple TV,OS=12.0' \
+    -sdk appletvsimulator12.1 -derivedDataPath $DERIVED_DATA \
+    -destination 'platform=tvOS Simulator,name=Apple TV,OS=12.1' \
     | xcpretty &&
 cd ../../.. &&
 
@@ -127,9 +127,9 @@ rm Cartfile &&
 echo "git \"$TRAVIS_BUILD_DIR\" \"$TRAVIS_BRANCH\"" > Cartfile &&
 carthage update --use-ssh --platform iOS &&
 time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj \
-    -scheme PinLayout-Carthage-iOS -sdk iphonesimulator12.0  \
+    -scheme PinLayout-Carthage-iOS -sdk iphonesimulator12.1  \
     -derivedDataPath $DERIVED_DATA \
-    -destination 'platform=iOS Simulator,name=iPhone 7,OS=12.0' \
+    -destination 'platform=iOS Simulator,name=iPhone 7,OS=12.1' \
     | xcpretty &&
 cd ../../.. 
 
@@ -146,8 +146,8 @@ time bundle exec pod lib lint --allow-warnings
 # rm -rf .build && 
 # rm Package.pins
 # swift package show-dependencies --format json && 
-# time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator12.0  -derivedDataPath $DERIVED_DATA \
-#     -destination 'platform=iOS Simulator,name=iPhone 7,OS=12.0' \
+# time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator12.1  -derivedDataPath $DERIVED_DATA \
+#     -destination 'platform=iOS Simulator,name=iPhone 7,OS=12.1' \
 #     | xcpretty &&
 # cd ../../.. 
 #