Merge pull request #131 from mirego/add_osx_support

PinLayout now support macOS

Author: lucdion

.gitignore

@@ -8,4 +8,7 @@ data/
 
 Pods/
 
-docs/1.2
+docs/1.2
+fastlane/README.md
+fastlane/report.xml
+fastlane/test_output

.travis.yml

@@ -1,38 +1,13 @@
 language: objective-c
 osx_image: xcode9.2 
+cache: bundler
 
-#env:
-  #matrix:
-    #- SCHEME=PinLayout       SDK=iphonesimulator11.2
-    #- SCHEME=PinLayout       SDK=iphonesimulator10.3
-    #- SCHEME=PinLayoutSample SDK=iphonesimulator11.2
-    #- SCHEME=PinLayoutTVOS   SDK=appletvsimulator11.0 
-
-before_install:
-#  - brew outdated xctool || brew upgrade xctool;
-  - gem install xcpretty-travis-formatter;
-  - gem install cocoapods --no-document --quiet;
-#  - pod repo update --silent;
+install:
+  - bundle install # --deployment # to cache vendor/bundle
   - pod install --repo-update;
 
 script:
-  - set -o pipefail && bundle exec fastlane travis
-  #- |
-    #if [[ $SCHEME = "PinLayout" ]]; then
-      #set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' -enableCodeCoverage YES build test | xcpretty -f `xcpretty-travis-formatter`
-  #    bundle exec fastlane travis
-    #fi
-
-    #if [[ $SCHEME = "PinLayoutSample" ]]; then
-    #  set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' build | xcpretty -f `xcpretty-travis-formatter`
-    #fi
-
-    #if [[ $SCHEME = "PinLayoutTVOS" ]]; then
-    #  set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=tvOS Simulator,name=Apple TV 1080p' build | xcpretty -f `xcpretty-travis-formatter`
-    #fi
+  - set -o pipefail && bundle exec fastlane ios travis && bundle exec fastlane mac travis
 
 after_success:
- # - |
- #   if [[ $SCHEME = "PinLayout" ]]; then
   bash <(curl -s https://codecov.io/bash) -J 'PinLayout' -J 'PinLayoutTests'
- #   fi

Example/PinLayoutSample.xcodeproj/project.pbxproj

@@ -195,8 +195,8 @@
 			isa = PBXGroup;
 			children = (
 				2439CC241E665858003326FB /* PinLayout.framework */,
-				2439CC261E665858003326FB /* PinLayoutTests.xctest */,
 				24DA374F1EF7F90700D1AB2F /* PinLayoutTVOS.framework */,
+				2439CC261E665858003326FB /* PinLayoutTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -433,7 +433,6 @@
 				249EFE3D1E64FAFE00165E39 /* Resources */,
 				2460ACCE1E64FD9D000BCAC5 /* Embed Frameworks */,
 				5D3C4568AFC08267110D9971 /* [CP] Embed Pods Frameworks */,
-				CCCCC7EE5AE16BA960D7DB4F /* [CP] Copy Pods Resources */,
 				24E6547E1E68F88D00A72A8B /* Run Swiftlint */,
 				2468130D1F8D013600462E53 /* Embed App Extensions */,
 			);
@@ -558,21 +557,6 @@
 			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		CCCCC7EE5AE16BA960D7DB4F /* [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-PinLayoutSample/Pods-PinLayoutSample-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		DDE1EE639E8C959FEBC41FDC /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -780,7 +764,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "PinLayoutSample/UI/Examples/PinLayoutSample-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -797,7 +781,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.mirego.PinLayoutSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "PinLayoutSample/UI/Examples/PinLayoutSample-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

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

@@ -26,16 +26,15 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "249EFE821E64FB4C00165E39"
-               BuildableName = "PinLayoutTests.xctest"
-               BlueprintName = "PinLayoutTests"
+               BuildableName = "PinLayoutTests-iOS.xctest"
+               BlueprintName = "PinLayoutTests-iOS"
                ReferencedContainer = "container:../PinLayout.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 gem 'synx'
-gem 'cocoapods'
+gem 'cocoapods', '~> 1.5.0'
 gem 'jazzy', '0.9'
 gem 'fastlane'
+gem 'xcpretty-travis-formatter'

Gemfile.lock

@@ -1,42 +1,43 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.5)
+    CFPropertyList (3.0.0)
     activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    atomos (0.1.2)
     babosa (1.0.2)
     claide (1.0.2)
     clamp (0.6.5)
-    cocoapods (1.3.1)
+    cocoapods (1.5.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.3.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.3, < 2.0)
+      cocoapods-core (= 1.5.0)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.2.0, < 2.0)
+      cocoapods-trunk (>= 1.3.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.7)
+      molinillo (~> 0.6.5)
       nap (~> 1.0)
       ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.1, < 2.0)
-    cocoapods-core (1.3.1)
+      xcodeproj (>= 1.5.7, < 2.0)
+    cocoapods-core (1.5.0)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.3)
+    cocoapods-deintegrate (1.0.2)
+    cocoapods-downloader (1.2.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -48,38 +49,40 @@ GEM
     colored (1.2)
     colored2 (3.1.2)
     colorize (0.8.1)
-    commander-fastlane (4.4.5)
+    commander-fastlane (4.4.6)
       highline (~> 1.7.2)
     concurrent-ruby (1.0.5)
     declarative (0.0.10)
     declarative-option (0.1.0)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.2.1)
+    dotenv (2.2.2)
+    emoji_regex (0.1.1)
     escape (0.0.4)
-    excon (0.59.0)
-    faraday (0.13.1)
+    excon (0.62.0)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.0)
-    fastlane (2.65.0)
-      CFPropertyList (>= 2.3, < 3.0.0)
+    fastimage (2.1.1)
+    fastlane (2.91.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
       bundler (>= 1.12.0, < 2.0.0)
       colored
-      commander-fastlane (>= 4.4.5, < 5.0.0)
+      commander-fastlane (>= 4.4.6, < 5.0.0)
       dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (~> 0.1)
       excon (>= 0.45.0, < 1.0.0)
       faraday (~> 0.9)
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 0.9)
       fastimage (>= 2.1.0, < 3.0.0)
-      gh_inspector (>= 1.0.1, < 2.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
       google-api-client (>= 0.13.1, < 0.14.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
@@ -91,18 +94,20 @@ GEM
       public_suffix (~> 2.0.0)
       rubyzip (>= 1.1.0, < 2.0.0)
       security (= 0.1.3)
-      slack-notifier (>= 1.3, < 2.0.0)
+      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
       terminal-notifier (>= 1.6.2, < 2.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
-      tty-screen (~> 0.5.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.5.2, < 2.0.0)
+      xcodeproj (>= 1.5.7, < 2.0.0)
       xcpretty (>= 0.2.4, < 1.0.0)
       xcpretty-travis-formatter (>= 0.0.3)
     ffi (1.9.18)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.3)
+    gh_inspector (1.1.3)
     google-api-client (0.13.6)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.5)
@@ -118,11 +123,11 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    highline (1.7.8)
+    highline (1.7.10)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (0.9.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jazzy (0.9.0)
       cocoapods (~> 1.0)
@@ -145,18 +150,19 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_magick (4.5.1)
-    minitest (5.10.3)
-    molinillo (0.5.7)
-    multi_json (1.12.2)
+    minitest (5.11.3)
+    molinillo (0.6.5)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     mustache (0.99.8)
-    nanaimo (0.2.3)
+    nanaimo (0.2.5)
     nap (1.1.0)
+    naturally (2.1.0)
     netrc (0.11.0)
     open4 (1.3.4)
     os (0.9.6)
-    plist (3.3.0)
+    plist (3.4.0)
     public_suffix (2.0.5)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
@@ -181,7 +187,10 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    slack-notifier (1.5.1)
+    simctl (1.6.4)
+      CFPropertyList
+      naturally
+    slack-notifier (2.3.2)
     sqlite3 (1.3.13)
     synx (0.2.1)
       clamp (~> 0.6)
@@ -191,22 +200,26 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tty-screen (0.5.1)
-    tzinfo (1.2.4)
+    tty-cursor (0.5.0)
+    tty-screen (0.6.4)
+    tty-spinner (0.8.0)
+      tty-cursor (>= 0.5.0)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.5)
     unicode-display_width (1.3.0)
     word_wrap (1.0.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.5.3)
-      CFPropertyList (~> 2.3.3)
+    xcodeproj (1.5.7)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.2)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
+      nanaimo (~> 0.2.4)
     xcpretty (0.2.6)
       rouge (~> 1.8)
     xcpretty-travis-formatter (1.0.0)
@@ -216,10 +229,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods
+  cocoapods (~> 1.5.0)
   fastlane
   jazzy (= 0.9)
   synx
+  xcpretty-travis-formatter
 
 BUNDLED WITH
-   1.13.6
+   1.16.1